[Traverso-commit] traverso/src/sheetcanvas MarkerView.cpp SheetVi...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       08/01/29 13:13:13

Modified files:
        src/sheetcanvas: MarkerView.cpp SheetView.cpp TimeLineView.cpp 

Log message:
        * init set SheetView::timeref_scalefactor earlier, it's needed by 
certain Views before the TrackViews and childs are created

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/MarkerView.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/SheetView.cpp?cvsroot=traverso&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.1&r2=1.2

Patches:
Index: MarkerView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/MarkerView.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MarkerView.cpp      21 Jan 2008 16:17:29 -0000      1.1
+++ MarkerView.cpp      29 Jan 2008 13:13:12 -0000      1.2
@@ -34,10 +34,13 @@
 #include <Utils.h>
 #include <QDebug>
 
+#include "Debugger.h"
+
 MarkerView::MarkerView(Marker* marker, SheetView* sv, ViewItem* parentView)
        : ViewItem(parentView, marker)
        , m_dragging(false)
 {
+       PENTERCONS2;
        m_sv = sv;
        m_marker = marker;
        m_line = new LineView(this);

Index: SheetView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/SheetView.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SheetView.cpp       29 Jan 2008 10:23:11 -0000      1.3
+++ SheetView.cpp       29 Jan 2008 13:13:13 -0000      1.4
@@ -114,6 +114,10 @@
        m_tlvp->setSceneRect(0, -TIMELINE_HEIGHT, MAX_CANVAS_WIDTH, 0);
        m_tpvp->setSceneRect(-200, 0, 0, MAX_CANVAS_HEIGHT);
        
+       // Set up the viewports scale factor, and our timeref_scalefactor / 
m_peakCacheZoomFactor
+       // Needed for our childs TrackView, AudioClipView, TimeLines 
MarkerViews etc which are created below.
+       scale_factor_changed();
+       
        sheet_mode_changed();
        
        connect(m_sheet, SIGNAL(hzoomChanged()), this, 
SLOT(scale_factor_changed()));
@@ -693,10 +697,6 @@
        // sense to populate the view with tracks.
        static int wasCalledBefore;
        if (!wasCalledBefore) {
-               // Set up the viewports scale factor, and our 
timeref_scalefactor / m_peakCacheZoomFactor
-               // Needed for our childs TrackView, AudioClipView etc which are 
created below.
-               scale_factor_changed();
-               
                // fill the view with trackviews, add_new_trackview()
                // doesn't yet layout the new tracks.
                foreach(Track* track, m_sheet->get_tracks()) {

Index: TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/TimeLineView.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TimeLineView.cpp    21 Jan 2008 16:17:30 -0000      1.1
+++ TimeLineView.cpp    29 Jan 2008 13:13:13 -0000      1.2
@@ -300,9 +300,6 @@
        MarkerView* view = new MarkerView(marker, m_sv, this);
        view->set_active(false);
        m_markerViews.append(view);
-#if QT_VERSION < 0x040300
-       m_sv->scene()->addItem(view);
-#endif
        view->update();
 }