Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_plot_spectrocurve.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_spectrocurve.cpp (modified) (14 diffs)

trunk/BNC/qwt/qwt_plot_spectrocurve.cpp

@@ -42 +42 @@
 */
 QwtPlotSpectroCurve::QwtPlotSpectroCurve( const QwtText &title ):
-    QwtPlotSeriesItem<QwtPoint3D>( title )
+    QwtPlotSeriesItem( title )
 {
     init();
@@ -52 +52 @@
 */
 QwtPlotSpectroCurve::QwtPlotSpectroCurve( const QString &title ):
-    QwtPlotSeriesItem<QwtPoint3D>( QwtText( title ) )
+    QwtPlotSeriesItem( QwtText( title ) )
 {
     init();
@@ -72 +72 @@
 
     d_data = new PrivateData;
-    d_series = new QwtPoint3DSeriesData();
+    setData( new QwtPoint3DSeriesData() );
 
     setZ( 20.0 );
@@ -99 +99 @@
 
 /*!
-    \brief Return the current paint attributes
+    \return True, when attribute is enabled
     \sa PaintAttribute, setPaintAttribute()
 */
@@ -113 +113 @@
 void QwtPlotSpectroCurve::setSamples( const QVector<QwtPoint3D> &samples )
 {
-    delete d_series;
-    d_series = new QwtPoint3DSeriesData( samples );
-    itemChanged();
-}
+    setData( new QwtPoint3DSeriesData( samples ) );
+}
+
+/*!
+  Assign a series of samples
+    
+  setSamples() is just a wrapper for setData() without any additional
+  value - beside that it is easier to find for the developer.
+    
+  \param data Data
+  \warning The item takes ownership of the data object, deleting
+           it when its not used anymore. 
+*/
+void QwtPlotSpectroCurve::setSamples(
+    QwtSeriesData<QwtPoint3D> *data )
+{
+    setData( data );
+}  
 
 /*!
@@ -137 +151 @@
     }
 
+    legendChanged();
     itemChanged();
 }
@@ -162 +177 @@
     {
         d_data->colorRange = interval;
+
+        legendChanged();
         itemChanged();
     }
@@ -189 +206 @@
     {
         d_data->penWidth = penWidth;
+
+        legendChanged();
         itemChanged();
     }
@@ -208 +227 @@
   \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
   \param from Index of the first sample to be painted
   \param to Index of the last sample to be painted. If to < 0 the
@@ -228 +247 @@
         from = 0;
 
-    if ( from >= to )
+    if ( from > to )
         return;
 
@@ -240 +259 @@
   \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
   \param from Index of the first sample to be painted
   \param to Index of the last sample to be painted. If to < 0 the
@@ -260 +279 @@
         d_data->colorTable = d_data->colorMap->colorTable( d_data->colorRange );
 
+    const QwtSeriesData<QwtPoint3D> *series = data();
+
     for ( int i = from; i <= to; i++ )
     {
-        const QwtPoint3D sample = d_series->sample( i );
+        const QwtPoint3D sample = series->sample( i );
 
         double xi = xMap.transform( sample.x() );
@@ -283 +304 @@
                 d_data->colorRange, sample.z() );
 
-            painter->setPen( QPen( QColor( rgb ), d_data->penWidth ) );
+            painter->setPen( QPen( QColor::fromRgba( rgb ), d_data->penWidth ) );
         }
         else
@@ -290 +311 @@
                 d_data->colorRange, sample.z() );
 
-            painter->setPen( QPen( QColor( d_data->colorTable[index] ), 
+            painter->setPen( QPen( QColor::fromRgba( d_data->colorTable[index] ), 
                 d_data->penWidth ) );
         }