Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_matrix_raster_data.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_matrix_raster_data.cpp (modified) (10 diffs)

trunk/BNC/qwt/qwt_matrix_raster_data.cpp

@@ -21 +21 @@
     }
 
-    inline double value(size_t row, size_t col) const
+    inline double value(int row, int col) const
     {
         return values.data()[ row * numColumns + col ];
@@ -29 +29 @@
 
     QVector<double> values;
-    size_t numColumns;
-    size_t numRows;
+    int numColumns;
+    int numRows;
 
     double dx;
@@ -55 +55 @@
    \sa resampleMode(), value()
 */
-void QwtMatrixRasterData::setResampleMode(ResampleMode mode)
+void QwtMatrixRasterData::setResampleMode( ResampleMode mode )
 {
     d_data->resampleMode = mode;
@@ -106 +106 @@
 */
 void QwtMatrixRasterData::setValueMatrix( 
-    const QVector<double> &values, size_t numColumns )
+    const QVector<double> &values, int numColumns )
 {
     d_data->values = values;
-    d_data->numColumns = numColumns;
+    d_data->numColumns = qMax( numColumns, 0 );
     update();
 }
@@ -123 +123 @@
 
 /*!
+  \brief Change a single value in the matrix
+
+  \param row Row index
+  \param col Column index
+  \param value New value
+
+  \sa value(), setValueMatrix()
+*/
+void QwtMatrixRasterData::setValue( int row, int col, double value )
+{
+    if ( row >= 0 && row < d_data->numRows &&
+        col >= 0 && col < d_data->numColumns )
+    {
+        const int index = row * d_data->numColumns + col;
+        d_data->values.data()[ index ] = value;
+    }
+}
+
+/*!
    \return Number of columns of the value matrix
    \sa valueMatrix(), numRows(), setValueMatrix()
 */
-size_t QwtMatrixRasterData::numColumns() const
+int QwtMatrixRasterData::numColumns() const
 {
     return d_data->numColumns;
@@ -135 +154 @@
    \sa valueMatrix(), numColumns(), setValueMatrix()
 */
-size_t QwtMatrixRasterData::numRows() const
+int QwtMatrixRasterData::numRows() const
 {
     return d_data->numRows;
@@ -141 +160 @@
 
 /*!
-   \brief Pixel hint
+   \brief Calculate the pixel hint
+
+   pixelHint() returns the geometry of a pixel, that can be used 
+   to calculate the resolution and alignment of the plot item, that is
+   representing the data. 
 
    - NearestNeighbour\n
@@ -151 +174 @@
      to render in target device ( f.e. screen ) resolution. 
 
+   \param area Requested area, ignored
+   \return Calculated hint
+
    \sa ResampleMode, setMatrix(), setInterval()
 */
-QRectF QwtMatrixRasterData::pixelHint( const QRectF & ) const
-{
+QRectF QwtMatrixRasterData::pixelHint( const QRectF &area ) const
+{
+    Q_UNUSED( area )
+
     QRectF rect;
     if ( d_data->resampleMode == NearestNeighbour )
@@ -199 +227 @@
             if ( col1 < 0 )
                 col1 = col2;
-            else if ( col2 >= (int)d_data->numColumns )
+            else if ( col2 >= static_cast<int>( d_data->numColumns ) )
                 col2 = col1;
 
             if ( row1 < 0 )
                 row1 = row2;
-            else if ( row2 >= (int)d_data->numRows )
+            else if ( row2 >= static_cast<int>( d_data->numRows ) )
                 row2 = row1;
 
@@ -230 +258 @@
         default:
         {
-            uint row = uint( (y - yInterval.minValue() ) / d_data->dy );
-            uint col = uint( (x - xInterval.minValue() ) / d_data->dx );
+            int row = int( (y - yInterval.minValue() ) / d_data->dy );
+            int col = int( (x - xInterval.minValue() ) / d_data->dx );
 
             // In case of intervals, where the maximum is included