tempo-plotter Changeset - b0f39d2ff111 · protofusion repositories

Changeset - b0f39d2ff111

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-20 06:58:52
hy@ozderya.net

fix, single click breaks scale (vertical&horizontal) zoom

1 file changed with 1 insertions and 1 deletions:

scalepicker.cpp

0 comments (0 inline, 0 general)

scalepicker.cpp

➞

Show inline comments

@@ @@ -79,101 +79,101 @@ ScalePicker::ScalePicker(QwtScaleWidget* @@
     QObject(scaleWidget)
+{
     _scaleWidget = scaleWidget;
     _canvas = canvas;
     scaleWidget->installEventFilter(this);
     scaleWidget->setMouseTracking(true);
     pickerOverlay = new PlotOverlay(canvas, this);
     scaleOverlay = new ScaleOverlay(scaleWidget, this);
     started = false;
     pressed = false;
+}
 bool ScalePicker::eventFilter(QObject* object, QEvent* event)
+{
     if (event->type() == QEvent::MouseButtonPress ||
         event->type() == QEvent::MouseButtonRelease ||
         event->type() == QEvent::MouseMove)
+    {
         QMouseEvent* mouseEvent = (QMouseEvent*) event;
         double pos = this->position(mouseEvent);
         double posPx = this->positionPx(mouseEvent);
         currentPosPx = posPx;
         if (event->type() == QEvent::MouseButtonPress &&
             mouseEvent->button() == Qt::LeftButton)
+        {
             pressed = true; // not yet started
             firstPos = pos;
             firstPosPx = posPx;
+        }
         else if (event->type() == QEvent::MouseMove)
+        {
             // make sure pick size is big enough, so that just
             // clicking won't trigger pick
             if (!started && pressed && (fabs(posPx-firstPosPx) > MIN_PICK_SIZE))
+            {
                 started = true;
                 emit pickStarted(pos);
+            }
             else if (started)
+            {
                 pickerOverlay->updateOverlay();
                 emit picking(firstPos, pos);
+            }
             scaleOverlay->updateOverlay();
+        }
         else // event->type() == QEvent::MouseButtonRelease
+        {
             pressed = false;
             if (started)
+            {
                 // finalize
                 started = false;
                 pressed = false;
                 emit picked(firstPos, pos);
+            }
+        }
         return true;
+    }
     else if (event->type() == QEvent::Leave)
+    {
         scaleOverlay->updateOverlay();
         return true;
+    }
     else
+    {
         return QObject::eventFilter(object, event);
+    }
+}
 void ScalePicker::drawPlotOverlay(QPainter* painter)
+{
     if (started)
+    {
         painter->save();
         painter->setPen(_pen);
         QRect rect;
         if (_scaleWidget->alignment() == QwtScaleDraw::BottomScale ||
             _scaleWidget->alignment() == QwtScaleDraw::TopScale)
+        {
             int height = painter->device()->height();
             rect = QRect(posCanvasPx(firstPosPx), 0, currentPosPx-firstPosPx, height);
+        }
         else // vertical
+        {
             int width = painter->device()->width();
             rect = QRect(0, posCanvasPx(firstPosPx), width, currentPosPx-firstPosPx);
+        }
         painter->drawRect(rect);
         painter->restore();
+    }
+}
 void ScalePicker::drawScaleOverlay(QPainter* painter)
+{
     painter->save();
     painter->setPen(_pen);
     if (1)
+    {
         if (_scaleWidget->alignment() == QwtScaleDraw::BottomScale ||

0 comments (0 inline, 0 general)