Ignore:
Timestamp:
Mar 19, 2021, 9:15:03 AM (3 years ago)
Author:
stoecker
Message:

update to qwt verion 6.1.1 to fix build with newer Qt5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/qwt/qwt_matrix_raster_data.cpp

    r8127 r9383  
    8282   \param axis X, Y or Z axis
    8383   \param interval Interval
    84    
     84
    8585   \sa QwtRasterData::interval(), setValueMatrix()
    8686*/
    87 void QwtMatrixRasterData::setInterval( 
     87void QwtMatrixRasterData::setInterval(
    8888    Qt::Axis axis, const QwtInterval &interval )
    8989{
     
    9797   The positions of the values are calculated by dividing
    9898   the bounding rectangle of the X/Y intervals into equidistant
    99    rectangles ( pixels ). Each value corresponds to the center of 
     99   rectangles ( pixels ). Each value corresponds to the center of
    100100   a pixel.
    101101
     
    105105   \sa valueMatrix(), numColumns(), numRows(), setInterval()()
    106106*/
    107 void QwtMatrixRasterData::setValueMatrix( 
     107void QwtMatrixRasterData::setValueMatrix(
    108108    const QVector<double> &values, int numColumns )
    109109{
     
    162162   \brief Calculate the pixel hint
    163163
    164    pixelHint() returns the geometry of a pixel, that can be used 
     164   pixelHint() returns the geometry of a pixel, that can be used
    165165   to calculate the resolution and alignment of the plot item, that is
    166    representing the data. 
     166   representing the data.
    167167
    168168   - NearestNeighbour\n
    169      pixelHint() returns the surrounding pixel of the top left value 
     169     pixelHint() returns the surrounding pixel of the top left value
    170170     in the matrix.
    171171
    172172   - BilinearInterpolation\n
    173173     Returns an empty rectangle recommending
    174      to render in target device ( f.e. screen ) resolution. 
     174     to render in target device ( f.e. screen ) resolution.
    175175
    176176   \param area Requested area, ignored
     
    240240            const double v22 = d_data->value( row2, col2 );
    241241
    242             const double x2 = xInterval.minValue() + 
     242            const double x2 = xInterval.minValue() +
    243243                ( col2 + 0.5 ) * d_data->dx;
    244             const double y2 = yInterval.minValue() + 
     244            const double y2 = yInterval.minValue() +
    245245                ( row2 + 0.5 ) * d_data->dy;
    246                
     246
    247247            const double rx = ( x2 - x ) / d_data->dx;
    248248            const double ry = ( y2 - y ) / d_data->dy;
Note: See TracChangeset for help on using the changeset viewer.