Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_plot_seriesitem.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_seriesitem.cpp (modified) (8 diffs)

trunk/BNC/qwt/qwt_plot_seriesitem.cpp

@@ -10 +10 @@
 #include "qwt_plot_seriesitem.h"
 
-class QwtPlotAbstractSeriesItem::PrivateData
+class QwtPlotSeriesItem::PrivateData
 {
 public:
@@ -25 +25 @@
   \param title Title of the curve
 */
-QwtPlotAbstractSeriesItem::QwtPlotAbstractSeriesItem( const QwtText &title ):
+QwtPlotSeriesItem::QwtPlotSeriesItem( const QwtText &title ):
     QwtPlotItem( title )
 {
     d_data = new PrivateData();
+    setItemInterest( QwtPlotItem::ScaleInterest, true );
 }
 
@@ -35 +36 @@
   \param title Title of the curve
 */
-QwtPlotAbstractSeriesItem::QwtPlotAbstractSeriesItem( const QString &title ):
+QwtPlotSeriesItem::QwtPlotSeriesItem( const QString &title ):
     QwtPlotItem( QwtText( title ) )
 {
@@ -42 +43 @@
 
 //! Destructor
-QwtPlotAbstractSeriesItem::~QwtPlotAbstractSeriesItem()
+QwtPlotSeriesItem::~QwtPlotSeriesItem()
 {
     delete d_data;
@@ -56 +57 @@
   \sa orientation()
 */
-void QwtPlotAbstractSeriesItem::setOrientation( Qt::Orientation orientation )
+void QwtPlotSeriesItem::setOrientation( Qt::Orientation orientation )
 {
     if ( d_data->orientation != orientation )
     {
         d_data->orientation = orientation;
+
+        legendChanged();
         itemChanged();
     }
@@ -69 +72 @@
   \sa setOrientation()
 */
-Qt::Orientation QwtPlotAbstractSeriesItem::orientation() const
+Qt::Orientation QwtPlotSeriesItem::orientation() const
 {
     return d_data->orientation;
@@ -80 +83 @@
   \param xMap Maps x-values into pixel coordinates.
   \param yMap Maps y-values into pixel coordinates.
-  \param canvasRect Contents rect of the canvas
+  \param canvasRect Contents rectangle of the canvas
 */
-void QwtPlotAbstractSeriesItem::draw( QPainter *painter,
+void QwtPlotSeriesItem::draw( QPainter *painter,
         const QwtScaleMap &xMap, const QwtScaleMap &yMap,
         const QRectF &canvasRect ) const
@@ -89 +92 @@
 }
 
+QRectF QwtPlotSeriesItem::boundingRect() const
+{
+    return dataRect();
+}
+
+void QwtPlotSeriesItem::updateScaleDiv(
+    const QwtScaleDiv &xScaleDiv, const QwtScaleDiv &yScaleDiv )
+{   
+    const QRectF rect = QRectF(
+        xScaleDiv.lowerBound(), yScaleDiv.lowerBound(),
+        xScaleDiv.range(), yScaleDiv.range() );
+        
+    setRectOfInterest( rect );
+}   
+
+void QwtPlotSeriesItem::dataChanged()
+{
+    itemChanged();
+}