tempo-plotter Changeset - c218878cb24d · protofusion repositories

Changeset - c218878cb24d

Parent rev.

Child rev.

[Not reviewed]

scalezoomer

0 2 0

Hasan Yavuz ÖZDERYA - 10 years ago 2015-09-13 09:11:29
hy@ozderya.net

renamed ScalePickerOverlay to PlotOverlay

2 files changed with 10 insertions and 11 deletions:

scalepicker.cpp

scalepicker.h

0 comments (0 inline, 0 general)

scalepicker.cpp

➞

Show inline comments

@@ @@ -26,34 +26,33 @@ @@
 #include "scalepicker.h"
 // minimum size for pick (in pixels)
 #define MIN_PICK_SIZE (2)
 // TODO: rename to PlotOverlay
 class ScalePickerOverlay : public QwtWidgetOverlay
 class PlotOverlay : public QwtWidgetOverlay
+{
 public:
-    ScalePickerOverlay(QWidget* widget, ScalePicker* picker);
+    PlotOverlay(QWidget* widget, ScalePicker* picker);
 protected:
     virtual void drawOverlay(QPainter*) const;
 private:
     ScalePicker* _picker;
 };
-ScalePickerOverlay::ScalePickerOverlay(QWidget* widget, ScalePicker* picker) :
+PlotOverlay::PlotOverlay(QWidget* widget, ScalePicker* picker) :
     QwtWidgetOverlay(widget)
+{
     _picker = picker;
+}
-void ScalePickerOverlay::drawOverlay(QPainter* painter) const
+void PlotOverlay::drawOverlay(QPainter* painter) const
+{
-    _picker->drawOverlay(painter);
+    _picker->drawPlotOverlay(painter);
+}
 class ScaleOverlay : public QwtWidgetOverlay
+{
 public:
     ScaleOverlay(QWidget* widget, ScalePicker* picker);
@@ @@ -80,13 +79,13 @@ ScalePicker::ScalePicker(QwtScaleWidget* @@
     QObject(scaleWidget)
+{
     _scaleWidget = scaleWidget;
     _canvas = canvas;
     scaleWidget->installEventFilter(this);
     scaleWidget->setMouseTracking(true);
-    pickerOverlay = new ScalePickerOverlay(canvas, this);
+    pickerOverlay = new PlotOverlay(canvas, this);
     scaleOverlay = new ScaleOverlay(scaleWidget, this);
     started = false;
     pressed = false;
+}
 bool ScalePicker::eventFilter(QObject* object, QEvent* event)
@@ @@ -139,13 +138,13 @@ bool ScalePicker::eventFilter(QObject* o @@
     else
+    {
         return QObject::eventFilter(object, event);
+    }
+}
-void ScalePicker::drawOverlay(QPainter* painter)
+void ScalePicker::drawPlotOverlay(QPainter* painter)
+{
     if (started)
+    {
         painter->save();
         painter->setPen(_pen);

scalepicker.h

➞

Show inline comments

@@ @@ -32,26 +32,26 @@ class ScalePicker : public QObject @@
     Q_OBJECT
 public:
     ScalePicker(QwtScaleWidget* scaleWidget, QWidget* canvas);
     virtual bool eventFilter(QObject*, QEvent*);
-    void drawOverlay(QPainter*); // called from ScalePickerOverlay
+    void drawPlotOverlay(QPainter*); // called from ScalePickerOverlay
     void drawScaleOverlay(QPainter*); // called from ScaleOverlay
     void setPen(QPen pen);
 signals:
     void pickStarted(double pos);
     void picking(double firstPos, double lastPos);
     void picked(double firstPos, double lastPos);
 private:
     QwtScaleWidget* _scaleWidget;
     QWidget* _canvas;
     QwtWidgetOverlay* pickerOverlay; // ScalePickerOverlay
     QwtWidgetOverlay* scaleOverlay;
     QwtWidgetOverlay* pickerOverlay; // will be PlotOverlay
     QwtWidgetOverlay* scaleOverlay;  // will be ScaleOverlay
     QPen _pen;
     bool pressed;
     bool started;
     double firstPos; // converted to plot coordinates
     double firstPosPx; // pixel coordinates

0 comments (0 inline, 0 general)