[Traverso-commit] traverso resources/keymap.xml src/commands/Crop...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       09/03/11 20:21:24

Modified files:
        resources      : keymap.xml 
        src/commands   : Crop.cpp Crop.h 

Log message:
        * Added [ XC ] + < mouse scroll wheel > to fine adjust the selection to 
be cut.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/resources/keymap.xml?cvsroot=traverso&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Crop.cpp?cvsroot=traverso&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/traverso/src/commands/Crop.h?cvsroot=traverso&r1=1.3&r2=1.4

Patches:
Index: resources/keymap.xml
===================================================================
RCS file: /sources/traverso/traverso/resources/keymap.xml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- resources/keymap.xml        9 Mar 2009 19:45:31 -0000       1.114
+++ resources/keymap.xml        11 Mar 2009 20:21:17 -0000      1.115
@@ -246,6 +246,7 @@
                                <Object objectname="SheetPanelGain" 
slotsignature="gain_increment" modes="All" sortorder="1" />
                                <Object objectname="Zoom" 
slotsignature="vzoom_out" modes="All" />
                                <Object objectname="TrackPan" 
slotsignature="pan_right" modes="All" sortorder="2" />
+                                <Object objectname="Crop" 
slotsignature="adjust_left" modes="All" />
                        </Objects>
                </keyfact>
                <keyfact type="FKEY" key1="MouseScrollVerticalDown" >
@@ -258,6 +259,7 @@
                                <Object objectname="SheetPanelGain" 
slotsignature="gain_decrement" modes="All" sortorder="2" />
                                <Object objectname="Zoom" 
slotsignature="vzoom_in" modes="All" />
                                <Object objectname="TrackPan" 
slotsignature="pan_left" modes="All" sortorder="1" />
+                                <Object objectname="Crop" 
slotsignature="adjust_right" modes="All" />
                        </Objects>
                </keyfact>
                <keyfact type="FKEY" key1="F" >

Index: src/commands/Crop.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Crop.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/commands/Crop.cpp       9 Mar 2009 21:30:44 -0000       1.2
+++ src/commands/Crop.cpp       11 Mar 2009 20:21:21 -0000      1.3
@@ -32,6 +32,7 @@
 #include "ProjectManager.h"
 #include "Sheet.h"
 #include "Track.h"
+#include "InputEngine.h"
 
  #include <QGraphicsRectItem>
 
@@ -56,6 +57,7 @@
 
         m_selection = new QGraphicsRectItem(m_cv);
         m_selection->setBrush(QColor(0, 0, 255, 100));
+        m_selection->setPen(QPen(Qt::NoPen));
         // Set the selection Z value to something sufficiently high
         // to be _always_ on top of all the child views of m_cv
         m_selection->setZValue(m_cv->zValue() + 20);
@@ -166,3 +168,46 @@
         return 1;
 }
 
+void Crop::adjust_left(bool autorepeat)
+{
+        ie().bypass_jog_until_mouse_movements_exceeded_manhattenlength();
+
+        int x = (int) m_selection->mapFromScene(cpointer().scene_x(), 
cpointer().y()).x();
+
+        if (x < (m_selection->boundingRect().width() / 2)) {
+                x1 -= 1;
+                if (x1 < 0) x1 = 0;
+        } else {
+                if (x2 > x1) {
+                        x2 -= 1;
+                }
+        }
+
+        QRectF rect(0, 0, x2 - x1, m_cv->boundingRect().height());
+        m_selection->setRect(rect);
+        m_selection->setPos(x1, 0);
+}
+
+void Crop::adjust_right(bool autorepeat)
+{
+        ie().bypass_jog_until_mouse_movements_exceeded_manhattenlength();
+
+        int x = (int) m_selection->mapFromScene(cpointer().scene_x(), 
cpointer().y()).x();
+
+        if (x < (m_selection->boundingRect().width() / 2)) {
+                if (x2 > x1) {
+                        x1 += 1;
+                }
+        } else {
+                x2 += 1;
+                if (x2 > m_cv->boundingRect().width()) {
+                        x2 = (int)m_cv->boundingRect().width();
+                }
+        }
+
+        QRectF rect(0, 0, x2 - x1, m_cv->boundingRect().height());
+        m_selection->setRect(rect);
+        m_selection->setPos(x1, 0);
+
+}
+

Index: src/commands/Crop.h
===================================================================
RCS file: /sources/traverso/traverso/src/commands/Crop.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/commands/Crop.h 9 Mar 2009 19:45:32 -0000       1.3
+++ src/commands/Crop.h 11 Mar 2009 20:21:23 -0000      1.4
@@ -55,6 +55,10 @@
         QGraphicsRectItem* m_selection;
         int x1;
         int x2;
+
+public slots:
+        void adjust_left(bool autorepeat);
+        void adjust_right(bool autorepeat);
 };
 
 #endif