Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_plot_picker.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_picker.cpp (modified) (12 diffs)

trunk/BNC/qwt/qwt_plot_picker.cpp

@@ -28 +28 @@
 */
 
-QwtPlotPicker::QwtPlotPicker( QwtPlotCanvas *canvas ):
+QwtPlotPicker::QwtPlotPicker( QWidget *canvas ):
     QwtPicker( canvas ),
     d_xAxis( -1 ),
@@ -66 +66 @@
   \sa QwtPlot::autoReplot(), QwtPlot::replot(), scaleRect()
 */
-QwtPlotPicker::QwtPlotPicker( int xAxis, int yAxis, QwtPlotCanvas *canvas ):
+QwtPlotPicker::QwtPlotPicker( int xAxis, int yAxis, QWidget *canvas ):
     QwtPicker( canvas ),
     d_xAxis( xAxis ),
@@ -78 +78 @@
   \param xAxis X axis of the picker
   \param yAxis Y axis of the picker
-  \param rubberBand Rubberband style
+  \param rubberBand Rubber band style
   \param trackerMode Tracker mode
   \param canvas Plot canvas to observe, also the parent object
@@ -89 +89 @@
 QwtPlotPicker::QwtPlotPicker( int xAxis, int yAxis,
         RubberBand rubberBand, DisplayMode trackerMode,
-        QwtPlotCanvas *canvas ):
+        QWidget *canvas ):
     QwtPicker( rubberBand, trackerMode, canvas ),
     d_xAxis( xAxis ),
@@ -101 +101 @@
 }
 
-//! Return observed plot canvas
-QwtPlotCanvas *QwtPlotPicker::canvas()
-{
-    return qobject_cast<QwtPlotCanvas *>( parentWidget() );
-}
-
-//! Return Observed plot canvas
-const QwtPlotCanvas *QwtPlotPicker::canvas() const
-{
-    return qobject_cast<const QwtPlotCanvas *>( parentWidget() );
-}
-
-//! Return plot widget, containing the observed plot canvas
+//! \return Observed plot canvas
+QWidget *QwtPlotPicker::canvas()
+{
+    return parentWidget();
+}
+
+//! \return Observed plot canvas
+const QWidget *QwtPlotPicker::canvas() const
+{
+    return parentWidget();
+}
+
+//! \return Plot widget, containing the observed plot canvas
 QwtPlot *QwtPlotPicker::plot()
 {
-    QwtPlotCanvas *w = canvas();
+    QWidget *w = canvas();
     if ( w )
-        return w->plot();
-
-    return NULL;
-}
-
-//! Return plot widget, containing the observed plot canvas
+        w = w->parentWidget();
+
+    return qobject_cast<QwtPlot *>( w );
+}
+
+//! \return Plot widget, containing the observed plot canvas
 const QwtPlot *QwtPlotPicker::plot() const
 {
-    const QwtPlotCanvas *w = canvas();
+    const QWidget *w = canvas();
     if ( w )
-        return w->plot();
-
-    return NULL;
-}
-
-/*!
-  Return normalized bounding rect of the axes
-
+        w = w->parentWidget();
+
+    return qobject_cast<const QwtPlot *>( w );
+}
+
+/*!
+  \return Normalized bounding rectangle of the axes
   \sa QwtPlot::autoReplot(), QwtPlot::replot().
 */
@@ -144 +143 @@
     if ( plot() )
     {
-        const QwtScaleDiv *xs = plot()->axisScaleDiv( xAxis() );
-        const QwtScaleDiv *ys = plot()->axisScaleDiv( yAxis() );
-
-        if ( xs && ys )
-        {
-            rect = QRectF( xs->lowerBound(), ys->lowerBound(),
-                xs->range(), ys->range() );
-            rect = rect.normalized();
-        }
+        const QwtScaleDiv &xs = plot()->axisScaleDiv( xAxis() );
+        const QwtScaleDiv &ys = plot()->axisScaleDiv( yAxis() );
+
+        rect = QRectF( xs.lowerBound(), ys.lowerBound(),
+            xs.range(), ys.range() );
+        rect = rect.normalized();
     }
 
@@ -231 +227 @@
 
 /*!
-  Append a point to the selection and update rubberband and tracker.
+  Append a point to the selection and update rubber band and tracker.
 
   \param pos Additional point
@@ -265 +261 @@
   \param ok If true, complete the selection and emit selected signals
             otherwise discard the selection.
-  \return true if the selection is accepted, false otherwise
+  \return True if the selection has been accepted, false otherwise
 */
 
@@ -278 +274 @@
         return false;
 
-    const QPolygon pa = selection();
-    if ( pa.count() == 0 )
+    const QPolygon points = selection();
+    if ( points.count() == 0 )
         return false;
 
@@ -292 +288 @@
         case QwtPickerMachine::PointSelection:
         {
-            const QPointF pos = invTransform( pa[0] );
+            const QPointF pos = invTransform( points.first() );
             Q_EMIT selected( pos );
             break;
@@ -298 +294 @@
         case QwtPickerMachine::RectSelection:
         {
-            if ( pa.count() >= 2 )
+            if ( points.count() >= 2 )
             {
-                const QPoint p1 = pa[0];
-                const QPoint p2 = pa[int( pa.count() - 1 )];
+                const QPoint p1 = points.first();
+                const QPoint p2 = points.last();
 
                 const QRect rect = QRect( p1, p2 ).normalized();
@@ -310 +306 @@
         case QwtPickerMachine::PolygonSelection:
         {
-            QVector<QPointF> dpa( pa.count() );
-            for ( int i = 0; i < int( pa.count() ); i++ )
-                dpa[i] = invTransform( pa[i] );
+            QVector<QPointF> dpa( points.count() );
+            for ( int i = 0; i < points.count(); i++ )
+                dpa[i] = invTransform( points[i] );
 
             Q_EMIT selected( dpa );