Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_plot_magnifier.cpp

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/qwt/qwt_plot_magnifier.cpp (modified) (8 diffs)

trunk/BNC/qwt/qwt_plot_magnifier.cpp

@@ -9 +9 @@
 
 #include "qwt_plot.h"
-#include "qwt_plot_canvas.h"
 #include "qwt_scale_div.h"
 #include "qwt_plot_magnifier.h"
@@ -30 +29 @@
    \param canvas Plot canvas to be magnified
 */
-QwtPlotMagnifier::QwtPlotMagnifier( QwtPlotCanvas *canvas ):
+QwtPlotMagnifier::QwtPlotMagnifier( QWidget *canvas ):
     QwtMagnifier( canvas )
 {
@@ -76 +75 @@
 
 //! Return observed plot canvas
-QwtPlotCanvas *QwtPlotMagnifier::canvas()
+QWidget *QwtPlotMagnifier::canvas()
 {
-    return qobject_cast<QwtPlotCanvas *>( parent() );
+    return parentWidget();
 }
 
 //! Return Observed plot canvas
-const QwtPlotCanvas *QwtPlotMagnifier::canvas() const
+const QWidget *QwtPlotMagnifier::canvas() const
 {
-    return qobject_cast<const QwtPlotCanvas *>( parent() );
+    return parentWidget();
 }
 
@@ -90 +89 @@
 QwtPlot *QwtPlotMagnifier::plot()
 {
-    QwtPlotCanvas *w = canvas();
+    QWidget *w = canvas();
     if ( w )
-        return w->plot();
+        w = w->parentWidget();
 
-    return NULL;
+    return qobject_cast<QwtPlot *>( w );
 }
 
@@ -100 +99 @@
 const QwtPlot *QwtPlotMagnifier::plot() const
 {
-    const QwtPlotCanvas *w = canvas();
+    const QWidget *w = canvas();
     if ( w )
-        return w->plot();
+        w = w->parentWidget();
 
-    return NULL;
+    return qobject_cast<const QwtPlot *>( w );
 }
 
@@ -113 +112 @@
 void QwtPlotMagnifier::rescale( double factor )
 {
+    QwtPlot* plt = plot();
+    if ( plt == NULL )
+        return;
+
     factor = qAbs( factor );
     if ( factor == 1.0 || factor == 0.0 )
@@ -118 +121 @@
 
     bool doReplot = false;
-    QwtPlot* plt = plot();
 
     const bool autoReplot = plt->autoReplot();
@@ -125 +127 @@
     for ( int axisId = 0; axisId < QwtPlot::axisCnt; axisId++ )
     {
-        const QwtScaleDiv *scaleDiv = plt->axisScaleDiv( axisId );
-        if ( isAxisEnabled( axisId ) && scaleDiv->isValid() )
+        if ( isAxisEnabled( axisId ) )
         {
-            const double center =
-                scaleDiv->lowerBound() + scaleDiv->range() / 2;
-            const double width_2 = scaleDiv->range() / 2 * factor;
+            const QwtScaleMap scaleMap = plt->canvasMap( axisId );
 
-            plt->setAxisScale( axisId, center - width_2, center + width_2 );
+            double v1 = scaleMap.s1();
+            double v2 = scaleMap.s2();
+
+            if ( scaleMap.transformation() )
+            {
+                // the coordinate system of the paint device is always linear
+
+                v1 = scaleMap.transform( v1 ); // scaleMap.p1()
+                v2 = scaleMap.transform( v2 ); // scaleMap.p2()
+            }
+
+            const double center = 0.5 * ( v1 + v2 );
+            const double width_2 = 0.5 * ( v2 - v1 ) * factor;
+
+            v1 = center - width_2;
+            v2 = center + width_2;
+
+            if ( scaleMap.transformation() )
+            {
+                v1 = scaleMap.invTransform( v1 );
+                v2 = scaleMap.invTransform( v2 );
+            }
+
+            plt->setAxisScale( axisId, v1, v2 );
             doReplot = true;
         }