Upgraded Qwt to 6.2 (branch: qwt-multiaxes) (#4427)

This commit is based on https://github.com/GoldenCheetah/GoldenCheetah/pull/3956
with the following additions / changes:
* Upgraded to the latest version of the multiaxes-branch, thus eliminating crashes of GoldenCheetah on startup
* Disabled the emitting of Layout Requests on geometry changes of QwtScaleWidget - without this, CPU utilization was up to 100% on one core
* Added the class SplineLookup, reusing small portions of code from Qwt 6.1
* Re-added the splines in WPrime and RideFile (resampling), using the new interface of QwtSpline
* Appveyor: qwt in cache-section now depends on qwt/qwtconfig.prin.in for refresh on version change

qwt/doc/DoxygenLayout.xml

@@ -0,0 +1,194 @@
+<doxygenlayout version="1.0">
+  <!-- Generated by doxygen 1.8.11 -->
+  <!-- Navigation index tabs for HTML output -->
+  <navindex>
+    <tab type="mainpage" visible="yes" title=""/>
+    <tab type="pages" visible="no" title="" intro=""/>
+    <tab type="modules" visible="yes" title="" intro=""/>
+    <tab type="namespaces" visible="yes" title="">
+      <tab type="namespacelist" visible="yes" title="" intro=""/>
+      <tab type="namespacemembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="classes" visible="yes" title="">
+      <tab type="classlist" visible="yes" title="" intro=""/>
+      <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/> 
+      <tab type="hierarchy" visible="yes" title="" intro=""/>
+      <tab type="classmembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="files" visible="yes" title="">
+      <tab type="filelist" visible="yes" title="" intro=""/>
+      <tab type="globals" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="examples" visible="yes" title="" intro=""/>  
+  </navindex>
+
+  <!-- Layout definition for a class page -->
+  <class>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <inheritancegraph visible="$CLASS_GRAPH"/>
+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>
+    <memberdecl>
+      <nestedclasses visible="yes" title=""/>
+      <publictypes title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <publicslots title=""/>
+      <signals title=""/>
+      <publicmethods title=""/>
+      <publicstaticmethods title=""/>
+      <publicattributes title=""/>
+      <publicstaticattributes title=""/>
+      <protectedtypes title=""/>
+      <protectedslots title=""/>
+      <protectedmethods title=""/>
+      <protectedstaticmethods title=""/>
+      <protectedattributes title=""/>
+      <protectedstaticattributes title=""/>
+      <packagetypes title=""/>
+      <packagemethods title=""/>
+      <packagestaticmethods title=""/>
+      <packageattributes title=""/>
+      <packagestaticattributes title=""/>
+      <properties title=""/>
+      <events title=""/>
+      <privatetypes title=""/>
+      <privateslots title=""/>
+      <privatemethods title=""/>
+      <privatestaticmethods title=""/>
+      <privateattributes title=""/>
+      <privatestaticattributes title=""/>
+      <friends title=""/>
+      <related title="" subtitle=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <services title=""/>
+      <interfaces title=""/>
+      <constructors title=""/>
+      <functions title=""/>
+      <related title=""/>
+      <variables title=""/>
+      <properties title=""/>
+      <events title=""/>
+    </memberdef>
+    <allmemberslink visible="yes"/>
+    <usedfiles visible="$SHOW_USED_FILES"/>
+    <authorsection visible="yes"/>
+  </class>
+
+  <!-- Layout definition for a namespace page -->
+  <namespace>
+    <briefdescription visible="yes"/>
+    <memberdecl>
+      <nestednamespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </namespace>
+
+  <!-- Layout definition for a file page -->
+  <file>
+    <briefdescription visible="yes"/>
+    <includes visible="$SHOW_INCLUDE_FILES"/>
+    <includegraph visible="$INCLUDE_GRAPH"/>
+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
+    <sourcelink visible="yes"/>
+    <memberdecl>
+      <classes visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <constantgroups visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <functions title=""/>
+      <variables title=""/>
+    </memberdef>
+    <authorsection/>
+  </file>
+
+  <!-- Layout definition for a group page -->
+  <group>
+    <briefdescription visible="yes"/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
+    <memberdecl>
+      <nestedgroups visible="yes" title=""/>
+      <dirs visible="yes" title=""/>
+      <files visible="yes" title=""/>
+      <namespaces visible="yes" title=""/>
+      <classes visible="yes" title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+      <membergroups visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+    <memberdef>
+      <pagedocs/>
+      <inlineclasses title=""/>
+      <defines title=""/>
+      <typedefs title=""/>
+      <enums title=""/>
+      <enumvalues title=""/>
+      <functions title=""/>
+      <variables title=""/>
+      <signals title=""/>
+      <publicslots title=""/>
+      <protectedslots title=""/>
+      <privateslots title=""/>
+      <events title=""/>
+      <properties title=""/>
+      <friends title=""/>
+    </memberdef>
+    <authorsection visible="yes"/>
+  </group>
+
+  <!-- Layout definition for a directory page -->
+  <directory>
+    <briefdescription visible="yes"/>
+    <directorygraph visible="yes"/>
+    <memberdecl>
+      <dirs visible="yes"/>
+      <files visible="yes"/>
+    </memberdecl>
+    <detaileddescription title=""/>
+  </directory>
+</doxygenlayout>

qwt/doc/articles/TODO

@@ -1,8 +0,0 @@
-1) Installation guides
-2) QwtSeriesData + QAbstractModel
-3) Navigation
-4) Scales
-5) Alive plots + sampling threads
-6) Exporting + printing plots
-7) Plot Items
-8) Raster items

qwt/doc/changes.dox

@@ -1,306 +1,106 @@
 /*!
-\page qwtchangelog What's new in Qwt 6.1
+\page qwtchangelog What's new in Qwt 6.2
 
 \tableofcontents
 
+\section PLATFORM Qt >= 4.8
+
+Support for Qt < Qt 4.8 has been dropped, support for Qt6 has been added.
+
+\section Class Includes
+
+Include files, that match the class names are available now. So
+it is possible to write "#include <QwtPlot>" now instead of "include qwt_plot.h"
+
+\section POLAR QwtPolar has become part of Qwt
+
+The QwtPolar project ( https://qwtpolar.sourceforge.io ) has been integrated
+into Qwt. 
+
+\section MATHML MathML Text Renderer has become its own project
+
+The code can be found at https://github.com/uwerat/qwt-mml-dev now and is intended
+to become a standalone lib.
+
+\section SPLINES Spline
+
+The broken implementation of QwtSpline has been replaced by a bunch of classes
+offering all sort of functionalities around splines.
+
+The most popular spline approximation/interpolation algos have been implemented:
+
+    - Basis
+    - Cardinal
+    - ParabolicBlending
+    - Akima
+    - The one used in a proprietory office package
+    - Cubic
+
+\section OPENGL Better OpenGL support
+
+QwtPlotOpenGLCanvas added to support rendering to a QOpenGLWidget
+
 \section ITEMS New plot items
 
-  - QwtPlotBarChart\n
-    Bar chart, see "examples/distrowatch"
+    - QwtPlotVectorField
+      A new type of plot item for vector fields
 
-  - QwtPlotMultiBarChart\n
-    Chart of grouped bars - stacked or aligned side by side.
-    See "examples/barchart"
+    - QwtPlotGraphicItem
+      An item displaying a QwtGraphic image ( f.e used by QwtPlotSvgItem )
 
-  - QwtPlotTradingCurve\n
-    Candlestick or OHLC charts typically used to describe 
-    price movements over time. See "examples/stockchart"
+\section CURVE QwtPlotCurve
 
-  - QwtPlotShapeItem\n
-    A plot item to display rectangles, circles, polygons and all
-    other type of shapes ( built from intersections or unifications ), 
-    that can be expressed by a QPainterPath.  See "examples/itemeditor"
+	- QwtPlotCurve::FilterPointsAggressive
+      A fast weeding algo for huge datasets with increasing x or y values
 
-  - QwtPlotLegendItem\n
-    A legend on the plot canvas. See "examples/legends"
+	- QwtPlotCurve::closestPoint
+	  Is virtual now
 
-  - QwtPlotZoneItem\n
-    A horizontal or vertical section 
+	- Line Clipping
+	  Includes the painter clip now
 
-  - QwtPlotTextLabel\n
-    In opposite to a QwtPlotMarker the text is not aligned to a plot coordinate 
-    but according to the geometry of the canvas ( f.e top/centered for a title ).
-    See "playground/curvetracker".
+	- QwtValuePointData
+	  A new type of data added, where the x values are the index
 
+	- QwtPlotCurve::setSamples
+	  more type of setters
 
-\section SCALES Scales beyond linear and logarithmic transformations
+\section SPECTROGRAM QwtPlotSpectrogram
 
-QwtScaleTransformation has been replaced by QwtTransform and its derived classes:
+	- QwtPlotSpectrogram::setColorTableSize
+      Using individual RGB tables
 
-  - QwtTransform 
-  - QwtNullTransform
-  - QwtLogTransform
-  - QwtPowerTransform
+	- QwtRasterData::setInterval/interval
+	  API cleanup
 
-Individual transformations ( f.e. different scaling for special sections )
-can be implemented by overloading QwtTransform ( see playground/scaleengine ).
+	- QwtHueColorMap, QwtSaturationValueColorMap
+	  New type of color maps
 
-QwtLinearScaleEngine and QwtLogScaleEngine are not limited to 
-base 10 anymore.
+	- QwtMatrixRasterData::BicubicInterpolation
+	  Implementation of bicubic interpolation added
 
-\subsection DATETIME Datetime scales
+	- Handling of NaN values
+      NaN values are interpreted as gaps, when QwtRasterData::WithoutGaps
+      is not set
 
-A set of a new classes for displaying datetime values:
- 
-  - QwtDate\n
-    A collection of methods to convert between QDateTime and doubles
+\section OTHERS Other changes
 
-  - QwtDateScaleEngine\n 
-    A scale engine that aligns and finds ticks in terms of datetime units.
+    - QwtPlotRenderer
+      Using QPdfWriter instead of QPrinter, where possible
 
-  - QwtDateScaleDraw\n
-    A scale draw mapping values to datetime strings.
+	- Handling of Unknown Paint Engines
+      Not aligning unknown paint engines ( f.e EMF ), QwtNullPaintDevice is not using
+      QPaintEngine::User anymore
 
-Scales for Qt::UTC and Qt::LocalTime are supported.
+	- QwtTransform::LogMin/LogMax
+	  LOG_MIN/LOG_MAX have been reomed ( values differ ! 
 
-\section CONTROLS Redesign of the dial and meter widgets
+	- qwt_compat.h
+	  Removed
 
-Many parts of the class design of the dial and meter widgets were left over 
-from the 90s ( Qwt 0.2, Qt 1.1 ). 
+	- qwtFuzzyGreaterOrEqual/qwtFuzzyLessOrEqual
+	  Removed
 
-The derivation tree is simpler and more logical:
-
-  - QwtAbstractScale is a QWidget 
-  - QwtAbstractSlider is a QwtAbstractScale. 
-    ( for sliders without scales QAbstractSlider should be the base class )
-  - QwtThermo is also a QwtAbstractScale
-  - QwtDial, QwtKnob, QwtSlider are derived from QwtAbstractSlider
-  - QwtCounter is derived from QWidget
-
-QwtDoubleRange has been removed.
-
-All classes use the terminology known from QAbstractSlider - as far as possible.
-The extended \ref SCALES "system for scales" is completely supported.
-
-\section OPENGL Basic support for an OpenGL plot canvas
-
-QwtPlotGLCanvas offers the option to draw plot items using an
-OpenGL paint engine ( QPaintEngine::OpenGL/OpenGL2 ),
-This is not what could be implemented with native OpenGL,
-but it offers hardware acceleration in environments,
-where the raster paint engine is the only option. 
-( f.e Qt4/Windows, or Qt5 on all platforms ). 
-
-QwtPlotGLCanvas is in an experimental state and is not recommended for average 
-use cases. 
-
-\section LEGEND A new system for plot legends
-
-QwtLegend has been decoupled from QwtPlot and can be replaced by
-application specific implementations. Plot items and the legend
-exchange the information using QwtLegendData.
-
-QwtPlotLegendItem is a new plot item that displays a legend on the
-plot canvas.
-
-The following examples demonstrate how to use the new system:
-
-  - examples/legends\n
-    shows how to use the new legend system 
-  - examples/stockchart\n
-    implementats a QTreeView with checkable items as legend
-
-\section GRAPHIC Off-screen paint device for vector graphics
-
-QwtGraphic can be copied like QImage or QPixmap but is scalable like QSvgGenerator.
-It is implemented as a record/replay paint device like QPicture.
-
-\section OVERLAY QwtWidgetOverlay
-
-QwtWidgetOverlay is a base class for implementing widget overlays - primarily
-used for use cases like graphical editors or running cursors for the plot canvas.
-
-The following examples show how to use overlays:
-
-  - examples/itemeditor
-  - examples/curvetracker
-
-QwtPicker ( -> QwtPlotPicker, QwtPlotZoomer ) internally uses 
-QwtWidgetOverlay now, making it easier to implement individual rubber bands.
-
-\section SYMBOL QwtSymbol 
-
-New symbol types have been introduced:
-
- - QwtSymbol::Path 
- - QwtSymbol::Pixmap 
- - QwtSymbol::Graphic 
- - QwtSymbol::SvgDocument
-
-QwtSymbol autodetect the most performant paint strategy for a paint device
-what is in most situations using a QPixmap cache.
-
-QwtSymbol::setPinPoint() allows to align the symbol individually, f.e to the position
-of the peak of an arrow.
-
-\section PLOTCURVE QwtPlotCurve
-
-Some optimizations that got lost with introducing the floating point
-based render code with Qwt 6.0 have been reenabled. Other specific optimizations
-have been added.
-
-New paint attributes:
-
-  - QwtPlotCurve::FilterPoints
-  - QwtPlotCurve::MinimizeMemory
-  - QwtPlotCurve::ImageBuffer 
-
-QwtPlotCurve::CacheSymbols has been removed, as caching is implemented
-in QwtSymbol now.  
-
-QwtPlotCurve::drawLines(), QwtPlotCurve::drawDots(), 
-QwtPlotCurve::drawSteps() and QwtPlotCurve::drawSticks() are virtual now.
-
-\section PLOT QwtPlot 
-
-A footer similar to a title has been added.
-
-QwtPlot::ExternalLegend is obsolete with the 
-new \ref LEGEND "system for legends". The signals
-QwtPlot::legendClicked(), QwtPlot::legendChecked() have been
-removed. Applications need to connect to QwtLegend::clicked()
-and QwtLegend::checked().
-
-To support using an OpenGL canvas QwtPlot::setCanvas has been added.
-This has 2 important implications for the application code:
-
-  - QwtPlot::canvas() returns QWidget and needs to be casted, when
-    using methods of QwtPlotCanvas.
-  - QwtPlotCanvas can be created and assigned in application code,
-    what makes it possible to derive and overload methods. 
-
-The initialization of a plot canvas with Qwt 6.1 will probably look like
-this:
-
-\code
-  QwtPlotCanvas* canvas = new QwtPlotCanvas();
-  canvas->setXY( ... );
-  ...
-
-  plot->setCanvas( canvas );
-\endcode
-
-To have a consistent API QwtPlot::setPlotLayout() has been added,
-
-
-\section OTHER Other
-
-\subsection SCALEDIV QwtScaleDiv
-
-The following methods have been added:
-
-  - QwtScaleDiv::inverted() 
-  - QwtScaleDiv::bounded() 
-  - QwtScaleDiv::isEmpty() 
-  - QwtScaleDiv::isIncreasing() 
-  - QDebug operator
-
-The following methods have been removed:
-
-  - QwtScaleDiv::isValid(), QwtScaleDiv::invalidate()\n
-    The valid state was left over from early Qwt versions indicating
-    a state of the autoscaler.
-
-\subsection SCALEENGINE QwtScaleEngine
-
-The following methods have been added:
-
-  - QwtScaleEngine::setBase() 
-  - QwtScaleEngine::setTransformation() 
-  
-\subsection PLOTLAYOUT QwtPlotLayout
-
-The following flags have been added:
-
-  - QwtPlotLayout::IgnoreTitle
-  - QwtPlotLayout::IgnoreFooter 
-  - QwtPlotLayout::setAlignCanvasToScale()
-
-\subsection PLOTCANVAS QwtPlotCanvas
-
-Rounded borders ( like with style sheets ) can configured
-using QwtPlotCanvas::setBorderRadius();
-
-\subsection OTHERS Other changes
-
-  - QwtWeedingCurveFitter\n
-    QwtWeedingCurveFitter::setChunkSize() has been added, with drastic 
-    performance improvements for huge sets of points.
-
-  - QwtPlotRenderer
-    The frame of the plot canvas can be rendered, what makes the result
-    even closer to WYSWYG.  QwtPlotRenderer::exportTo() has been added.
-
-  - QwtSystemClock
-    For Qt >= 4.9 QwtSystemClock uses QElapsedTimer internally. As it doesn't
-    support a similar feature, QwtSystemClock::precision() has been removed.
-
-  - QwtPlotAbstractSeriesItem\n 
-    QwtPlotAbstractSeriesItem has been split into QwtPlotSeriesItem
-    and QwtPlotAbstractSeriesStore.
-
-  - QwtText\n
-    A metatype declaration has been added, so that QwtText can be used
-    with QVariant.
-    
-  - QwtEventPattern, QwtPanner, QwtMagnifier\n
-    Forgotten Qt3 leftovers have been fixed: int -> Qt::KeyboardModifiers
-
-  - QPen Qt5/Qt4 incompatibility
-    The default pen width for Qt5 is 1, what makes it a non cosmetic.
-    To hide this nasty incompatibility several setPen() methods have been added
-    the build pens with a width 0. See QPen::isCosmetic(),
-
-  - qwtUpperSampleIndex()\n
-    A binary search algorithm for sorted samples
-  
-  - QwtMatrixRasterData 
-    QwtMatrixRasterData::setValue() has been added
-
-  - QwtPicker
-     QwtPicker::rubberBandWidget(), QwtPicker::trackerWidget() have been replaced by
-     QwtPicker::rubberBandOverlay(), QwtPicker::trackerOverlay(). 
-     QwtPicker::rubberBandMask() has been added. QwtPicker::pickRect() has been 
-     replaced by QwtPicker::pickArea()
-
-  - QwtPlotItem
-    QwtPlotItem::ItemInterest has been added. QwtPlotItem::setRenderThreadCount()
-    was shifted from QwtPlotRasterItem.
-
-  - ...
-
-\section CLASSES Summary of the new classes
-
-  - QwtAbstractLegend
-  - QwtDate
-  - QwtDateScaleDraw
-  - QwtDateScaleEngine
-  - QwtGraphic
-  - QwtLegendData
-  - QwtLegendLabel
-  - QwtPainterCommand
-  - QwtPixelMatrix
-  - QwtPlotAbstractBarChart
-  - QwtPlotBarChart
-  - QwtPlotMultiBarChart
-  - QwtPlotGLCanvas
-  - QwtPlotLegendItem
-  - QwtPlotShapeItem
-  - QwtPlotTextLabel
-  - QwtPlotTradingCurve
-  - QwtPlotZoneItem
-  - QwtPointData
-  - QwtPointMapper
-  - QwtTransform, QwtNullTransform, QwtLogTransform, QwtPowerTransform
-  - QwtWidgetOverlay
-*/
+	- qwtGetMin/qwtGetMax
+	  Removed
+ */

qwt/doc/doxyfilter.sh

@@ -0,0 +1,3 @@
+#! /bin/sh 
+
+m4 qwtdoc.m4 $1