Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_scale_engine.h

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_scale_engine.h (modified) (11 diffs)

trunk/BNC/qwt/qwt_scale_engine.h

@@ -15 +15 @@
 #include "qwt_interval.h"
 
-class QwtScaleTransformation;
+class QwtTransform;
 
 /*!
@@ -28 +28 @@
     static double divideEps( double interval, double steps );
 
-    static double ceil125( double x );
-    static double floor125( double x );
+    static double divideInterval( double interval, 
+        int numSteps, uint base );
 };
 
@@ -40 +40 @@
   The layout of the scale can be varied with setAttribute().
 
-  Qwt offers implementations for logarithmic (log10)
-  and linear scales. Contributions for other types of scale engines
-  (date/time, log2 ... ) are welcome.
+  Qwt offers implementations for logarithmic and linear scales. 
 */
 
@@ -81 +79 @@
     typedef QFlags<Attribute> Attributes;
 
-    explicit QwtScaleEngine();
+    explicit QwtScaleEngine( uint base = 10 );
     virtual ~QwtScaleEngine();
+
+    void setBase( uint base );
+    uint base() const;
 
     void setAttribute( Attribute, bool on = true );
@@ -113 +114 @@
       \param x1 First interval limit
       \param x2 Second interval limit
-      \param maxMajSteps Maximum for the number of major steps
-      \param maxMinSteps Maximum number of minor steps
+      \param maxMajorSteps Maximum for the number of major steps
+      \param maxMinorSteps Maximum number of minor steps
       \param stepSize Step size. If stepSize == 0.0, the scaleEngine
                    calculates one.
+
+      \return Calculated scale division
     */
     virtual QwtScaleDiv divideScale( double x1, double x2,
-        int maxMajSteps, int maxMinSteps,
+        int maxMajorSteps, int maxMinorSteps,
         double stepSize = 0.0 ) const = 0;
 
-    //! \return a transformation
-    virtual QwtScaleTransformation *transformation() const = 0;
+    void setTransformation( QwtTransform * );
+    QwtTransform *transformation() const;
 
 protected:
     bool contains( const QwtInterval &, double val ) const;
     QList<double> strip( const QList<double>&, const QwtInterval & ) const;
+
     double divideInterval( double interval, int numSteps ) const;
 
@@ -147 +151 @@
 {
 public:
+    QwtLinearScaleEngine( uint base = 10 );
+    virtual ~QwtLinearScaleEngine();
+
     virtual void autoScale( int maxSteps,
         double &x1, double &x2, double &stepSize ) const;
@@ -154 +161 @@
                                      double stepSize = 0.0 ) const;
 
-    virtual QwtScaleTransformation *transformation() const;
 
 protected:
@@ -166 +172 @@
         const QwtInterval &interval, double stepSize ) const;
 
-    void buildMinorTicks(
-        const QList<double>& majorTicks,
-        int maxMinMark, double step,
-        QList<double> &, QList<double> & ) const;
-};
-
-/*!
-  \brief A scale engine for logarithmic (base 10) scales
+    void buildMinorTicks( const QList<double>& majorTicks,
+        int maxMinorSteps, double stepSize,
+        QList<double> &minorTicks, QList<double> &mediumTicks ) const;
+};
+
+/*!
+  \brief A scale engine for logarithmic scales
 
   The step size is measured in *decades*
@@ -183 +188 @@
 */
 
-class QWT_EXPORT QwtLog10ScaleEngine: public QwtScaleEngine
-{
-public:
+class QWT_EXPORT QwtLogScaleEngine: public QwtScaleEngine
+{
+public:
+    QwtLogScaleEngine( uint base = 10 );
+    virtual ~QwtLogScaleEngine();
+
     virtual void autoScale( int maxSteps,
         double &x1, double &x2, double &stepSize ) const;
@@ -193 +201 @@
         double stepSize = 0.0 ) const;
 
-    virtual QwtScaleTransformation *transformation() const;
-
 protected:
-    QwtInterval log10( const QwtInterval& ) const;
-    QwtInterval pow10( const QwtInterval& ) const;
-
     QwtInterval align( const QwtInterval&, double stepSize ) const;
 
@@ -208 +211 @@
         const QwtInterval &interval, double stepSize ) const;
 
-    QList<double> buildMinorTicks(
-        const QList<double>& majorTicks,
-        int maxMinMark, double step ) const;
+    void buildMinorTicks( const QList<double>& majorTicks,
+        int maxMinorSteps, double stepSize,
+        QList<double> &minorTicks, QList<double> &mediumTicks ) const;
 };