Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_plot_axis.cpp


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_plot_axis.cpp

    r8127 r9383  
    6868        d.scaleEngine = new QwtLinearScaleEngine;
    6969
    70         d.scaleWidget->setTransformation( 
     70        d.scaleWidget->setTransformation(
    7171            d.scaleEngine->transformation() );
    7272
     
    148148        d.scaleEngine = scaleEngine;
    149149
    150         d_axisData[axisId]->scaleWidget->setTransformation( 
     150        d_axisData[axisId]->scaleWidget->setTransformation(
    151151            scaleEngine->transformation() );
    152152
     
    190190    else
    191191        return false;
    192 
    193192}
    194193
     
    289288
    290289/*!
    291   \brief Return the step size parameter that has been set in setAxisScale. 
     290  \brief Return the step size parameter that has been set in setAxisScale.
    292291
    293292  This doesn't need to be the step size of the current scale.
     
    310309
    311310  This is only a convenience function for axisScaleDiv( axisId )->interval();
    312  
     311
    313312  \param axisId Axis index
    314313  \return Scale interval
     
    434433  \brief Disable autoscaling and specify a fixed scale for a selected axis.
    435434
    436   In updateAxes() the scale engine calculates a scale division from the 
    437   specified parameters, that will be assigned to the scale widget. So 
     435  In updateAxes() the scale engine calculates a scale division from the
     436  specified parameters, that will be assigned to the scale widget. So
    438437  updates of the scale widget usually happen delayed with the next replot.
    439438
     
    467466
    468467  The scale division will be stored locally only until the next call
    469   of updateAxes(). So updates of the scale widget usually happen delayed with 
     468  of updateAxes(). So updates of the scale widget usually happen delayed with
    470469  the next replot.
    471470
     
    615614}
    616615
    617 /*! 
     616/*!
    618617  \brief Rebuild the axes scales
    619618
    620   In case of autoscaling the boundaries of a scale are calculated 
    621   from the bounding rectangles of all plot items, having the 
    622   QwtPlotItem::AutoScale flag enabled ( QwtScaleEngine::autoScale() ). 
    623   Then a scale division is calculated ( QwtScaleEngine::didvideScale() ) 
     619  In case of autoscaling the boundaries of a scale are calculated
     620  from the bounding rectangles of all plot items, having the
     621  QwtPlotItem::AutoScale flag enabled ( QwtScaleEngine::autoScale() ).
     622  Then a scale division is calculated ( QwtScaleEngine::didvideScale() )
    624623  and assigned to scale widget.
    625624
    626   When the scale boundaries have been assigned with setAxisScale() a 
     625  When the scale boundaries have been assigned with setAxisScale() a
    627626  scale division is calculated ( QwtScaleEngine::didvideScale() )
    628627  for this interval and assigned to the scale widget.
    629628
    630   When the scale has been set explicitly by setAxisScaleDiv() the 
     629  When the scale has been set explicitly by setAxisScaleDiv() the
    631630  locally stored scale division gets assigned to the scale widget.
    632631
    633   The scale widget indicates modifications by emitting a 
     632  The scale widget indicates modifications by emitting a
    634633  QwtScaleWidget::scaleDivChanged() signal.
    635634
    636   updateAxes() is usually called by replot(). 
     635  updateAxes() is usually called by replot().
    637636
    638637  \sa setAxisAutoScale(), setAxisScale(), setAxisScaleDiv(), replot()
Note: See TracChangeset for help on using the changeset viewer.