]> rtime.felk.cvut.cz Git - vajnamar/orte.git/commitdiff
Fix inverted logic for rotation_mode variable skoda_tutorial
authorMartin Vajnar <Martin.Vajnar@cvut.cz>
Thu, 7 Jun 2018 18:41:05 +0000 (20:41 +0200)
committerMartin Vajnar <Martin.Vajnar@cvut.cz>
Thu, 7 Jun 2018 18:41:05 +0000 (20:41 +0200)
orte/contrib/shape/MyQFrame.cpp

index 23e8d7559c89eb7bb285bb5900498d433431a507..10f98d45743996e232df8c2f56d1f81d46daa073 100644 (file)
@@ -18,7 +18,7 @@ MyQFrame::MyQFrame( QWidget *parent)
     objects[0]=objects[1]=objects[2]=objects[3]=objects[4]=0;
     rotations[0]=rotations[1]=rotations[2]=rotations[3]=rotations[4]=0;
     zooms[0]=zooms[1]=zooms[2]=zooms[3]=zooms[4]=1;
-    rotation_mode=0;
+    rotation_mode=1;
     wheel_delta=0;
     scale_factor=1;
 
@@ -126,17 +126,17 @@ void MyQFrame::mouseReleaseEvent (QMouseEvent *)
 
 void MyQFrame::wheelEvent (QWheelEvent *e)
 {
-    if(!rotation_mode)
-      wheel_delta += e->delta()/120;
+    if(rotation_mode)
+      wheel_delta += e->delta()/12;
     else
-      scale_factor += (double)e->delta()/1200;
+      scale_factor += (double)e->delta()/600;
     e->accept();
 }
 
 void MyQFrame::keyPressEvent (QKeyEvent *e)
 {
     if (e->key() == Qt::Key_Control)
-      rotation_mode=1;
+      rotation_mode=0;
     else
       QFrame::keyPressEvent(e);
 }
@@ -144,7 +144,7 @@ void MyQFrame::keyPressEvent (QKeyEvent *e)
 void MyQFrame::keyReleaseEvent (QKeyEvent *e)
 {
     if (e->key() == Qt::Key_Control)
-      rotation_mode=0;
+      rotation_mode=1;
     else
       QFrame::keyPressEvent(e);
 }