Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_plot.h


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.h

    r8127 r9383  
    4141  can be configured separately for each axis.
    4242
    43   The simpleplot example is a good starting point to see how to set up a 
     43  The simpleplot example is a good starting point to see how to set up a
    4444  plot widget.
    4545
    … …  
    4747
    4848  \par Example
    49   The following example shows (schematically) the most simple
    50   way to use QwtPlot. By default, only the left and bottom axes are
    51   visible and their scales are computed automatically.
    52   \verbatim
    53 #include <qwt_plot.h>
    54 #include <qwt_plot_curve.h>
    55 
    56 QwtPlot *myPlot = new QwtPlot("Two Curves", parent);
    57 
    58 // add curves
    59 QwtPlotCurve *curve1 = new QwtPlotCurve("Curve 1");
    60 QwtPlotCurve *curve2 = new QwtPlotCurve("Curve 2");
    61 
    62 // connect or copy the data to the curves
    63 curve1->setData(...);
    64 curve2->setData(...);
    65 
    66 curve1->attach(myPlot);
    67 curve2->attach(myPlot);
    68 
    69 // finally, refresh the plot
    70 myPlot->replot();
    71 \endverbatim
     49    The following example shows (schematically) the most simple
     50    way to use QwtPlot. By default, only the left and bottom axes are
     51    visible and their scales are computed automatically.
     52    \code
     53      #include <qwt_plot.h>
     54      #include <qwt_plot_curve.h>
     55
     56      QwtPlot *myPlot = new QwtPlot( "Two Curves", parent );
     57
     58      // add curves
     59      QwtPlotCurve *curve1 = new QwtPlotCurve( "Curve 1" );
     60      QwtPlotCurve *curve2 = new QwtPlotCurve( "Curve 2" );
     61
     62      // connect or copy the data to the curves
     63      curve1->setData( ... );
     64      curve2->setData( ... );
     65
     66      curve1->attach( myPlot );
     67      curve2->attach( myPlot );
     68
     69      // finally, refresh the plot
     70      myPlot->replot();
     71    \endcode
     72  \endpar
    7273*/
    7374
    … …  
    7677    Q_OBJECT
    7778
    78     Q_PROPERTY( QBrush canvasBackground 
     79    Q_PROPERTY( QBrush canvasBackground
    7980        READ canvasBackground WRITE setCanvasBackground )
    8081    Q_PROPERTY( bool autoReplot READ autoReplot WRITE setAutoReplot )
    … …  
    122123        RightLegend,
    123124
    124         //! The legend will be below the footer 
     125        //! The legend will be below the footer
    125126        BottomLegend,
    126127
    … …  
    150151
    151152    void setTitle( const QString & );
    152     void setTitle( const QwtText &t );
     153    void setTitle( const QwtText & );
    153154    QwtText title() const;
    154155
    … …  
    159160
    160161    void setFooter( const QString & );
    161     void setFooter( const QwtText &t );
     162    void setFooter( const QwtText & );
    162163    QwtText footer() const;
    163164
    … …  
    192193    bool axisEnabled( int axisId ) const;
    193194
    194     void setAxisFont( int axisId, const QFont &f );
     195    void setAxisFont( int axisId, const QFont & );
    195196    QFont axisFont( int axisId ) const;
    196197
    197     void setAxisScale( int axisId, double min, double max, double step = 0 );
     198    void setAxisScale( int axisId, double min, double max, double stepSize = 0 );
    198199    void setAxisScaleDiv( int axisId, const QwtScaleDiv & );
    199200    void setAxisScaleDraw( int axisId, QwtScaleDraw * );
    … …  
    225226    // Legend
    226227
    227     void insertLegend( QwtAbstractLegend *, 
     228    void insertLegend( QwtAbstractLegend *,
    228229        LegendPosition = QwtPlot::RightLegend, double ratio = -1.0 );
    229230
    … …  
    245246    void updateCanvasMargins();
    246247
    247     virtual void getCanvasMarginsHint( 
     248    virtual void getCanvasMarginsHint(
    248249        const QwtScaleMap maps[], const QRectF &canvasRect,
    249250        double &left, double &top, double &right, double &bottom) const;
    … …  
    268269
    269270    /*!
    270       A signal with the attributes how to update 
     271      A signal with the attributes how to update
    271272      the legend entries for a plot item.
    272273
    … …  
    277278      \sa itemToInfo(), infoToItem(), QwtAbstractLegend::updateLegend()
    278279     */
    279     void legendDataChanged( const QVariant &itemInfo, 
     280    void legendDataChanged( const QVariant &itemInfo,
    280281        const QList<QwtLegendData> &data );
    281282
    … …  
    291292private Q_SLOTS:
    292293    void updateLegendItems( const QVariant &itemInfo,
    293         const QList<QwtLegendData> &data );
     294        const QList<QwtLegendData> &legendData );
    294295
    295296private:
Note: See TracChangeset for help on using the changeset viewer.