Changeset - c218878cb24d
[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:
0 comments (0 inline, 0 general)
scalepicker.cpp
Show inline comments
 
@@ -29,11 +29,10 @@
 
// 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;
 
@@ -42,15 +41,15 @@ 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
 
@@ -83,7 +82,7 @@ ScalePicker::ScalePicker(QwtScaleWidget*
 
    _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;
 
@@ -142,7 +141,7 @@ bool ScalePicker::eventFilter(QObject* o
 
    }
 
}
 

	
 
void ScalePicker::drawOverlay(QPainter* painter)
 
void ScalePicker::drawPlotOverlay(QPainter* painter)
 
{
 
    if (started)
 
    {
scalepicker.h
Show inline comments
 
@@ -35,7 +35,7 @@ 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);
 

	
 
@@ -47,8 +47,8 @@ signals:
 
private:
 
    QwtScaleWidget* _scaleWidget;
 
    QWidget* _canvas;
 
    QwtWidgetOverlay* pickerOverlay; // ScalePickerOverlay
 
    QwtWidgetOverlay* scaleOverlay;
 
    QwtWidgetOverlay* pickerOverlay; // will be PlotOverlay
 
    QwtWidgetOverlay* scaleOverlay;  // will be ScaleOverlay
 
    QPen _pen;
 

	
 
    bool pressed;
0 comments (0 inline, 0 general)