[Traverso-commit] traverso/src commands/MoveClip.cpp commands/Mov...

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     08/11/21 06:41:06

Modified files:
        src/commands   : MoveClip.cpp MoveClip.h 
        src/sheetcanvas: MarkerView.cpp 

Log message:
        Fix fold sheet so that it once again moves the markers.
        Only show the : after the track number if there's a description 
following it.
        Move the track numbers up 2 pixels.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.cpp?cvsroot=traverso&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/MoveClip.h?cvsroot=traverso&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/MarkerView.cpp?cvsroot=traverso&r1=1.4&r2=1.5

Patches:
Index: commands/MoveClip.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- commands/MoveClip.cpp       21 Feb 2008 20:00:47 -0000      1.75
+++ commands/MoveClip.cpp       21 Nov 2008 06:41:05 -0000      1.76
@@ -28,6 +28,7 @@
 #include "SnapList.h"
 #include "Sheet.h"
 #include "Track.h"
+#include "Timeline.h"
 
 #include "ClipsViewPort.h"
 #include "SheetView.h"
@@ -112,6 +113,15 @@
                
                d->pointedTrackIndex = 
d->sv->get_trackview_under(cpointer().scene_pos())->get_track()->get_sort_index();
                
+               if (m_actionType == FOLD_SHEET) {
+                       QList<Marker*> movingMarkers = 
d->sv->get_sheet()->get_timeline()->get_markers();
+                       foreach(Marker* marker, movingMarkers) {
+                               if (marker->get_when() > currentLocation) {
+                                       m_markers.append(marker);
+                               }
+                       }
+               }
+               
                foreach(Track* track, tracks) {
                        QList<AudioClip*> clips = track->get_cliplist();
                        foreach(AudioClip* clip, clips) {
@@ -226,6 +236,12 @@
                move_to_end(false);
        }
        
+       if (m_actionType == FOLD_SHEET) {
+               foreach(Marker* marker, m_markers) {
+                       marker->set_when(marker->get_when() + m_posDiff);
+               }
+       }
+       
        return 1;
 }
 
@@ -240,6 +256,12 @@
                m_group.move_to(m_origTrackIndex, m_trackStartLocation);
        }
 
+       if (m_actionType == FOLD_SHEET) {
+               foreach(Marker* marker, m_markers) {
+                       marker->set_when(marker->get_when() - m_posDiff);
+               }
+       }
+       
        return 1;
 }
 

Index: commands/MoveClip.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/MoveClip.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- commands/MoveClip.h 18 Feb 2008 10:15:49 -0000      1.33
+++ commands/MoveClip.h 21 Nov 2008 06:41:06 -0000      1.34
@@ -27,6 +27,7 @@
 #include <QPoint>
 #include <defines.h>
 #include "AudioClipGroup.h"
+#include "Marker.h"
 
 class AudioClip;
 class Sheet;
@@ -73,6 +74,7 @@
        
        Sheet*          m_sheet;
        AudioClipGroup  m_group;
+       QList<Marker*>  m_markers;
         TimeRef        m_trackStartLocation;
         TimeRef        m_posDiff;
        ActionType      m_actionType;

Index: sheetcanvas/MarkerView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/MarkerView.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- sheetcanvas/MarkerView.cpp  5 Nov 2008 00:42:22 -0000       1.4
+++ sheetcanvas/MarkerView.cpp  21 Nov 2008 06:41:06 -0000      1.5
@@ -88,9 +88,13 @@
 
        painter->drawPolygon(pts, 3);
        if (m_marker->get_type() == Marker::ENDMARKER) {
-               painter->drawText(m_width + 1, m_ascent, 
m_marker->get_description());
+               painter->drawText(m_width + 1, m_ascent-2, 
m_marker->get_description());
        } else {
-               painter->drawText(m_width + 1, m_ascent, QString("%1: 
%2").arg(m_marker->get_index()).arg(m_marker->get_description()));
+               if (m_marker->get_description().length() > 0) {
+                       painter->drawText(m_width + 1, m_ascent-2, QString("%1: 
%2").arg(m_marker->get_index()).arg(m_marker->get_description()));
+               } else {
+                       painter->drawText(m_width + 1, m_ascent-2, 
QString("%1").arg(m_marker->get_index()));
+               }
        }
 
        if (m_dragging) {