[Traverso-commit] traverso/src/commands Gain.cpp TrackPan.cpp Tra...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/12 18:50:21

Modified files:
        src/commands   : Gain.cpp TrackPan.cpp TrackPan.h 

Log message:
        * use viewport hold cursor for TrackPan as well, since it changes a 
value, instead of moving things around!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Gain.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/TrackPan.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/TrackPan.h?cvsroot=traverso&r1=1.5&r2=1.6

Patches:
Index: Gain.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Gain.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Gain.cpp    12 Apr 2007 18:28:39 -0000      1.14
+++ Gain.cpp    12 Apr 2007 18:50:21 -0000      1.15
@@ -17,7 +17,7 @@
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
 
-$Id: Gain.cpp,v 1.14 2007/04/12 18:28:39 benjie Exp $
+$Id: Gain.cpp,v 1.15 2007/04/12 18:50:21 r_sijrier Exp $
 */
 
 #include "Gain.h"
@@ -205,10 +205,6 @@
                
cpointer().get_viewport()->set_holdcursor_text(QByteArray::number(dbFactor, 
'f', 2).append(" dB"));
        }
 
-       // Set the mouse cursor back to the original position, so it doesn't 
leave the 
-       // object we're working on!
-       // This avoids highlighting of other objects !!
-       // Note that due this, we don't have to set the origY variable in this 
funcion!!
        origPos = cpointer().pos();
 
        return result;

Index: TrackPan.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/TrackPan.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- TrackPan.cpp        10 Apr 2007 17:12:19 -0000      1.8
+++ TrackPan.cpp        12 Apr 2007 18:50:21 -0000      1.9
@@ -57,7 +57,7 @@
 int TrackPan::begin_hold()
 {
         origX = cpointer().x();
-        origPan = m_track->get_pan();
+        origPan = newPan = m_track->get_pan();
 
         return 1;
 }
@@ -65,6 +65,7 @@
 
 int TrackPan::finish_hold()
 {
+       QCursor::setPos(mousePos);
        return 1;
 }
 
@@ -82,14 +83,25 @@
         return 1;
 }
 
+void TrackPan::set_cursor_shape(int useX, int useY)
+{
+       Q_UNUSED(useX);
+       Q_UNUSED(useY);
+       
+       mousePos = QCursor::pos();
+       cpointer().get_viewport()->set_holdcursor(":/cursorHoldLr");
+}
 
 int TrackPan::jog()
 {
         float w = 600.0;
         float ofx = (float) origX - cpointer().x();
         float p = -2.0f *  (ofx) / w ;
-        newPan = p + origPan;
+       newPan = p + newPan;
         m_track->set_pan( newPan );
+       
+       origX = cpointer().x();
+       
         return 1;
 }
 

Index: TrackPan.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/TrackPan.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- TrackPan.h  10 Apr 2007 17:12:19 -0000      1.5
+++ TrackPan.h  12 Apr 2007 18:50:21 -0000      1.6
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
  
-    $Id: TrackPan.h,v 1.5 2007/04/10 17:12:19 r_sijrier Exp $
+    $Id: TrackPan.h,v 1.6 2007/04/12 18:50:21 r_sijrier Exp $
 */
 
 #ifndef TRACKPAN_H
@@ -41,7 +41,10 @@
 
         int jog();
 
+       void set_cursor_shape(int useX, int useY);
+       
 private :
+       QPoint  mousePos;
         float origPan;
         float newPan;
         int origX;