[Traverso-commit] traverso/src/sheetcanvas AudioClipView.cpp Trac...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/03/06 11:08:33

Modified files:
        src/sheetcanvas: AudioClipView.cpp TrackView.cpp TrackView.h 

Log message:
        * On hover enter event, bring the audioclip that is pointed upfront, 
this solves the annoyance when clips overlap, and you want to e.g. change the 
fade on the clip that is below another one. Please try this out and let me know 
what you think!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/AudioClipView.cpp?cvsroot=traverso&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/TrackView.cpp?cvsroot=traverso&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/traverso/src/sheetcanvas/TrackView.h?cvsroot=traverso&r1=1.2&r2=1.3

Patches:
Index: AudioClipView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/AudioClipView.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- AudioClipView.cpp   6 Mar 2009 10:06:35 -0000       1.23
+++ AudioClipView.cpp   6 Mar 2009 11:08:32 -0000       1.24
@@ -929,6 +929,7 @@
                return;
        }
        update(m_boundingRect);
+       m_tv->to_front(this);
 }
 
 
@@ -1001,6 +1002,12 @@
                        
                resources_manager()->set_source_for_clip(m_clip, rs);
                
+               
+               // FIXME This is a hack. When a ReadSource didn't have a valid 
file it wasn't added
+               // to DiskIO in AudioClip::set_sheet(). So when resetting the 
audiofile this solves it,
+               // but it's not the proper place to do so!!
+               m_clip->set_sheet(m_sheet);
+               
                info().information(tr("Succesfully set AudioClip file to 
%1").arg(filename));
                
                return ie().succes();

Index: TrackView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/TrackView.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TrackView.cpp       21 Jan 2008 16:17:30 -0000      1.1
+++ TrackView.cpp       6 Mar 2009 11:08:32 -0000       1.2
@@ -215,3 +215,12 @@
        return 0; 
 }
 
+void TrackView::to_front(AudioClipView * view)
+{
+       foreach(AudioClipView* clipview, m_clipViews) {
+               clipview->setZValue(zValue() + 1);
+       }
+       
+       view->setZValue(zValue() + 2);
+}
+

Index: TrackView.h
===================================================================
RCS file: /sources/traverso/traverso/src/sheetcanvas/TrackView.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- TrackView.h 12 Feb 2008 15:09:36 -0000      1.2
+++ TrackView.h 6 Mar 2009 11:08:32 -0000       1.3
@@ -56,6 +56,8 @@
        void calculate_bounding_rect();
        void load_theme_data();
        
+       void to_front(AudioClipView* view);
+       
 private:
        Track*                  m_track;
        QList<AudioClipView* >  m_clipViews;