[Kst] branches/work/kst/portto4/kst/src/libkstapp

[Barth Netterfield]

SVN commit 1322162 by netterfield:

BUG: 306395
Scroll wheel respects tied zoom.


 M  +0 -8      plotitem.cpp  
 M  +8 -8      plotrenderitem.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #1322161:1322162
@@ -3096,10 +3096,6 @@
 
 
 void PlotItem::zoomXRight(bool force) {
-  //if (zoomOnlyMode() == View::ZoomOnlyX) {
-  //  zoomXOut(force);
-  //  return;
-  //}
   if (isInSharedAxisBox() && !force) {
     sharedAxisBox()->zoomXRight(this);
   } else {
@@ -3111,10 +3107,6 @@
 
 
 void PlotItem::zoomXLeft(bool force) {
-  //if (zoomOnlyMode() == View::ZoomOnlyX) {
-  //  zoomXIn(force);
-  //  return;
-  //}
   if (isInSharedAxisBox() && !force) {
     sharedAxisBox()->zoomXLeft(this);
   } else {
--- branches/work/kst/portto4/kst/src/libkstapp/plotrenderitem.cpp #1322161:1322162
@@ -512,17 +512,17 @@
   bool zoom = false;
   if (modifiers & Qt::SHIFT) {
     if (event->delta()>0) {
-      plotItem()->zoomYIn(true);
+      plotItem()->zoomYIn();
     } else {
-      plotItem()->zoomYOut(true);
+      plotItem()->zoomYOut();
     }
     zoom = true;
   }
   if (modifiers & Qt::CTRL){
     if (event->delta()>0) {
-      plotItem()->zoomXIn(true);
+      plotItem()->zoomXIn();
     } else {
-      plotItem()->zoomXOut(true);
+      plotItem()->zoomXOut();
     }
     zoom = true;
   }
@@ -533,15 +533,15 @@
 
   if ((modifiers & Qt::ALT) || zoomOnlyMode() == View::ZoomOnlyY) {
     if (event->delta()>0) {
-      plotItem()->zoomYDown(true);
+      plotItem()->zoomYDown();
     } else {
-      plotItem()->zoomYUp(true);
+      plotItem()->zoomYUp();
     }
   } else {
     if (event->delta()>0) {
-      plotItem()->zoomXLeft(true);
+      plotItem()->zoomXLeft();
     } else {
-      plotItem()->zoomXRight(true);
+      plotItem()->zoomXRight();
     }
   }
 }