tempo-plotter Changeset - c2effc315085 · protofusion repositories

Changeset - c2effc315085

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 9 years ago 2016-08-13 04:23:17
hy@ozderya.net

removed obviously unnecessary if statement

1 file changed with 1 insertions and 3 deletions:

src/scalepicker.cpp

0 comments (0 inline, 0 general)

src/scalepicker.cpp

➞

Show inline comments

@@ @@ -99,181 +99,179 @@ bool ScalePicker::eventFilter(QObject* o @@
+    {
         updateSnapPoints();
         QMouseEvent* mouseEvent = (QMouseEvent*) event;
         double posPx = this->positionPx(mouseEvent);
         // do snapping unless Shift is pressed
         if (! (mouseEvent->modifiers() & Qt::ShiftModifier))
+        {
             for (double sp : snapPoints)
+            {
                 if (fabs(posPx-sp) <= SNAP_DISTANCE)
+                {
                     posPx = sp;
                     break;
+                }
+            }
+        }
         double pos = this->position(posPx);
         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;
                 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 ||
             _scaleWidget->alignment() == QwtScaleDraw::TopScale)
+        {
             int height = painter->device()->height();
             if (started) painter->drawLine(firstPosPx, 0, firstPosPx, height);
             if (started || _scaleWidget->underMouse())
+            {
                 painter->drawLine(currentPosPx, 0, currentPosPx, height);
+            }
+        }
         else // vertical
+        {
             int width = painter->device()->width();
             if (started) painter->drawLine(0, firstPosPx, width, firstPosPx);
             if (started || _scaleWidget->underMouse())
+            {
                 painter->drawLine(0, currentPosPx, width, currentPosPx);
+            }
+        }
+    }
     painter->restore();
+}
 void ScalePicker::setPen(QPen pen)
+{
     _pen = pen;
+}
 // convert the position of the click to the plot coordinates
 double ScalePicker::position(double posPx)
+{
     return _scaleWidget->scaleDraw()->scaleMap().invTransform(posPx);
+}
 double ScalePicker::positionPx(QMouseEvent* mouseEvent)
+{
     double pos;
     if (_scaleWidget->alignment() == QwtScaleDraw::BottomScale ||
         _scaleWidget->alignment() == QwtScaleDraw::TopScale)
+    {
         pos = mouseEvent->pos().x();
+    }
     else // left or right scale
+    {
         pos = mouseEvent->pos().y();
+    }
     return pos;
+}
 /*
  * Scale widget and canvas widget is not always aligned. Especially
  * when zooming scaleWidget moves around. This causes irregularities
  * when drawing the tracker lines. This function maps scale widgets
  * pixel coordinate to canvas' coordinate.
  */
 double ScalePicker::posCanvasPx(double pos)
+{
     // assumption: scale.width < canvas.width && scale.x > canvas.x
     if (_scaleWidget->alignment() == QwtScaleDraw::BottomScale ||
         _scaleWidget->alignment() == QwtScaleDraw::TopScale)
+    {
         return pos + (_scaleWidget->x() - _canvas->x());
+    }
     else // left or right scale
+    {
         return pos + (_scaleWidget->y() - _canvas->y());
+    }
     return pos;
+}
 void ScalePicker::updateSnapPoints()
+{
     auto allTicks = _scaleWidget->scaleDraw()->scaleDiv().ticks(QwtScaleDiv::MajorTick) +
         _scaleWidget->scaleDraw()->scaleDiv().ticks(QwtScaleDiv::MediumTick) +
         _scaleWidget->scaleDraw()->scaleDiv().ticks(QwtScaleDiv::MinorTick);
     snapPoints.clear();
     for(auto t : allTicks)
+    {
         snapPoints << _scaleWidget->scaleDraw()->scaleMap().transform(t);
+    }
+}

0 comments (0 inline, 0 general)