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

appveyor.yml

@@ -63,7 +63,7 @@ cache:
 - C:\R
 - C:\Python -> src\Python\requirements.txt
 - c:\tools\vcpkg\installed\
-- qwt
+- qwt -> qwt/qwtconfig.pri.in
 
 install:
 # Get the libraries

deprecated/LogTimeScaleEngine.cpp

@@ -154,7 +154,7 @@ QwtScaleDiv LogTimeScaleEngine::divideScale(double x1, double x2,
     QwtScaleDiv scaleDiv;
     if ( stepSize != 0.0 )
     {
-        QwtValueList ticks[QwtScaleDiv::NTickTypes];
+        QList<double> ticks[QwtScaleDiv::NTickTypes];
         buildTicks(interval, stepSize, maxMinSteps, ticks);
 
         scaleDiv = QwtScaleDiv(interval, ticks);
@@ -168,7 +168,7 @@ QwtScaleDiv LogTimeScaleEngine::divideScale(double x1, double x2,
 
 void LogTimeScaleEngine::buildTicks(
     const QwtDoubleInterval& interval, double stepSize, int maxMinSteps,
-    QwtValueList ticks[QwtScaleDiv::NTickTypes]) const
+    QList<double> ticks[QwtScaleDiv::NTickTypes]) const
 {
     const QwtDoubleInterval boundingInterval =
         align(interval, stepSize);
@@ -210,12 +210,12 @@ tick_info_t tick_info[] = {
     {      -1.0,    NULL }
 };
 
-QwtValueList LogTimeScaleEngine::buildMajorTicks(
+QList<double> LogTimeScaleEngine::buildMajorTicks(
     const QwtDoubleInterval &interval, double stepSize) const
 {
     (void) interval;
     (void) stepSize;
-    QwtValueList ticks;
+    QList<double> ticks;
     tick_info_t *walker = tick_info;
     while (walker->label) {
         ticks += walker->x;
@@ -224,14 +224,14 @@ QwtValueList LogTimeScaleEngine::buildMajorTicks(
     return ticks;
 }
 
-QwtValueList LogTimeScaleEngine::buildMinorTicks(
+QList<double> LogTimeScaleEngine::buildMinorTicks(
-    const QwtValueList &majorTicks,
+    const QList<double> &majorTicks,
     int maxMinSteps, double stepSize) const
 {
     (void) majorTicks;
     (void) maxMinSteps;
     (void) stepSize;
-    QwtValueList minorTicks;
+    QList<double> minorTicks;
     return minorTicks;
 }
 

deprecated/LogTimeScaleEngine.h

@@ -53,13 +53,13 @@ class LogTimeScaleEngine : public QwtScaleEngine
 
         void buildTicks(
             const QwtDoubleInterval &, double stepSize, int maxMinSteps,
-            QwtValueList ticks[QwtScaleDiv::NTickTypes]) const;
+            QList<double> ticks[QwtScaleDiv::NTickTypes]) const;
 
-        QwtValueList buildMinorTicks(
+        QList<double> buildMinorTicks(
-            const QwtValueList& majorTicks,
+            const QList<double>& majorTicks,
             int maxMinMark, double step) const;
 
-        QwtValueList buildMajorTicks(
+        QList<double> buildMajorTicks(
             const QwtDoubleInterval &interval, double stepSize) const;
 };
 

deprecated/PerfPlot.cpp

@@ -48,26 +48,26 @@ PerfPlot::PerfPlot() : STScurve(NULL), LTScurve(NULL), SBcurve(NULL), DAYcurve(N
 {
     xsd = new PPTimeScaleDraw(QDateTime());
     xsd->setTickLength(QwtScaleDiv::MajorTick, 3);
-    setAxisScaleDraw(QwtPlot::xBottom, xsd);
+    setAxisScaleDraw(QwtAxis::XBottom, xsd);
 
     insertLegend(new QwtLegend(), QwtPlot::BottomLegend);
-    setAxisTitle(yLeft, tr("Exponentially Weighted Average Stress"));
+    setAxisTitle(YLeft, tr("Exponentially Weighted Average Stress"));
-    setAxisTitle(xBottom, tr("Time (days)"));
+    setAxisTitle(XBottom, tr("Time (days)"));
-    setAxisTitle(yRight, tr("Daily Stress"));
+    setAxisTitle(QwtAxis::YRight, tr("Daily Stress"));
-    enableAxis(yRight, true);
+    setAxisVisible(QwtAxis::YRight, true);
     static_cast<QwtPlotCanvas*>(canvas())->setFrameStyle(QFrame::NoFrame);
 
-    setAxisMaxMinor(xBottom, 0);
+    setAxisMaxMinor(XBottom, 0);
-    setAxisMaxMinor(yLeft, 0);
+    setAxisMaxMinor(YLeft, 0);
-    setAxisMaxMinor(yRight, 0);
+    setAxisMaxMinor(QwtAxis::YRight, 0);
 
     QwtScaleDraw *sd = new QwtScaleDraw;
     sd->setTickLength(QwtScaleDiv::MajorTick, 3);
-    setAxisScaleDraw(QwtPlot::yLeft, sd);
+    setAxisScaleDraw(QwtAxis::YLeft, sd);
 
     sd = new QwtScaleDraw;
     sd->setTickLength(QwtScaleDiv::MajorTick, 3);
-    setAxisScaleDraw(QwtPlot::yRight, sd);
+    setAxisScaleDraw(QwtAxis::YRight, sd);
 
     grid = new QwtPlotGrid();
     grid->attach(this);
@@ -99,7 +99,7 @@ void PerfPlot::plot() {
     int  num, tics;
     tics = 42;
 
-    setAxisScale(yLeft, _sc->min(), _sc->max());
+    setAxisScale(YLeft, _sc->min(), _sc->max());
     num = xmax - xmin;
 
     /*
@@ -117,8 +117,8 @@ void PerfPlot::plot() {
     } else if (num < 364) {
 	tics  = 27;
     }
-    setAxisScale(xBottom, xmin, xmax,tics);
+    setAxisScale(XBottom, xmin, xmax,tics);
-    axisWidget(xBottom)->update();
+    axisWidget(XBottom)->update();
 
     // set base
     xsd->setBase(startDate);
@@ -142,7 +142,7 @@ void PerfPlot::plot() {
     //                                     |
     //                                     V
     DAYcurve->setSamples(_sc->getDays()+xmin -1 ,_sc->getDAYvalues()+xmin,num);
-    DAYcurve->setYAxis(yRight);
+    DAYcurve->setYAxis(QwtAxis::YRight);
     DAYcurve->attach(this);
 
     if (STScurve) {
@@ -186,7 +186,7 @@ void PerfPlot::plot() {
     SBcurve->setSamples(_sc->getDays()+xmin,_sc->getSBvalues()+xmin,num);
     SBcurve->attach(this);
 
-    axisWidget(QwtPlot::xBottom)->update();
+    axisWidget(QwtAxis::XBottom)->update();
     replot();
 
 }

deprecated/PerformanceManagerWindow.cpp

@@ -100,7 +100,7 @@ PerformanceManagerWindow::PerformanceManagerWindow(Context *context) :
     vlayout->addLayout(PMPickerLayout);
     setLayout(vlayout);
 
-    PMpicker = new QwtPlotPicker(QwtPlot::xBottom, QwtPlot::yLeft,
+    PMpicker = new QwtPlotPicker(QwtAxis::XBottom, QwtAxis::YLeft,
                                QwtPicker::VLineRubberBand,
                                QwtPicker::AlwaysOff, perfplot->canvas());
     PMpicker->setStateMachine(new QwtPickerDragPointMachine);
@@ -283,7 +283,7 @@ void PerformanceManagerWindow::replot()
 void
 PerformanceManagerWindow::PMpickerMoved(const QPoint &pos)
 {
-    double day = perfplot->invTransform(QwtPlot::xBottom, pos.x());
+    double day = perfplot->invTransform(QwtAxis::XBottom, pos.x());
     QDateTime date;
     double sts, lts, sb;
 

deprecated/WeeklySummaryWindow.cpp

@@ -44,14 +44,14 @@ WeeklySummaryWindow::WeeklySummaryWindow(bool useMetricUnits,
 
     // set up the weekly distance / duration plot:
     weeklyPlot = new QwtPlot();
-    weeklyPlot->enableAxis(QwtPlot::yRight, true);
+    weeklyPlot->setAxisVisible(QwtAxis::YRight, true);
-    weeklyPlot->setAxisMaxMinor(QwtPlot::xBottom,0);
+    weeklyPlot->setAxisMaxMinor(QwtAxis::XBottom,0);
-    weeklyPlot->setAxisScaleDraw(QwtPlot::xBottom, new DaysScaleDraw());
+    weeklyPlot->setAxisScaleDraw(QwtAxis::XBottom, new DaysScaleDraw());
-    QFont weeklyPlotAxisFont = weeklyPlot->axisFont(QwtPlot::yLeft);
+    QFont weeklyPlotAxisFont = weeklyPlot->axisFont(QwtAxis::YLeft);
     weeklyPlotAxisFont.setPointSize(weeklyPlotAxisFont.pointSize() * 0.9f);
-    weeklyPlot->setAxisFont(QwtPlot::xBottom, weeklyPlotAxisFont);
+    weeklyPlot->setAxisFont(QwtAxis::XBottom, weeklyPlotAxisFont);
-    weeklyPlot->setAxisFont(QwtPlot::yLeft, weeklyPlotAxisFont);
+    weeklyPlot->setAxisFont(QwtAxis::YLeft, weeklyPlotAxisFont);
-    weeklyPlot->setAxisFont(QwtPlot::yRight, weeklyPlotAxisFont);
+    weeklyPlot->setAxisFont(QwtAxis::YRight, weeklyPlotAxisFont);
     weeklyPlot->canvas()->setFrameStyle(QFrame::NoFrame);
     weeklyPlot->setCanvasBackground(Qt::white);
 
@@ -70,18 +70,18 @@ WeeklySummaryWindow::WeeklySummaryWindow(bool useMetricUnits,
     weeklyDurationCurve->setBrush(QColor(255,200,0,255));
     weeklyDurationCurve->setRenderHint(QwtPlotItem::RenderAntialiased);
     weeklyDurationCurve->setCurveAttribute(QwtPlotCurve::Inverted, true); // inverted, right-to-left
-    weeklyDurationCurve->setYAxis(QwtPlot::yRight);
+    weeklyDurationCurve->setYAxis(QwtAxis::YRight);
     weeklyDurationCurve->attach(weeklyPlot);
 
     // set up the weekly bike score plot:
     weeklyBSPlot = new QwtPlot();
-    weeklyBSPlot->enableAxis(QwtPlot::yRight, true);
+    weeklyBSPlot->setAxisVisible(QwtAxis::YRight, true);
-    weeklyBSPlot->setAxisMaxMinor(QwtPlot::xBottom,0);
+    weeklyBSPlot->setAxisMaxMinor(QwtAxis::XBottom,0);
-    weeklyBSPlot->setAxisScaleDraw(QwtPlot::xBottom, new DaysScaleDraw());
+    weeklyBSPlot->setAxisScaleDraw(QwtAxis::XBottom, new DaysScaleDraw());
     QwtText textLabel = QwtText();
-    weeklyBSPlot->setAxisFont(QwtPlot::xBottom, weeklyPlotAxisFont);
+    weeklyBSPlot->setAxisFont(QwtAxis::XBottom, weeklyPlotAxisFont);
-    weeklyBSPlot->setAxisFont(QwtPlot::yLeft, weeklyPlotAxisFont);
+    weeklyBSPlot->setAxisFont(QwtAxis::YLeft, weeklyPlotAxisFont);
-    weeklyBSPlot->setAxisFont(QwtPlot::yRight, weeklyPlotAxisFont);
+    weeklyBSPlot->setAxisFont(QwtAxis::YRight, weeklyPlotAxisFont);
     weeklyBSPlot->canvas()->setFrameStyle(QFrame::NoFrame);
     weeklyBSPlot->setCanvasBackground(Qt::white);
 
@@ -99,7 +99,7 @@ WeeklySummaryWindow::WeeklySummaryWindow(bool useMetricUnits,
     weeklyRICurve->setBrush(Qt::green);
     weeklyRICurve->setRenderHint(QwtPlotItem::RenderAntialiased);
     weeklyRICurve->setCurveAttribute(QwtPlotCurve::Inverted, true); // inverted, right-to-left
-    weeklyRICurve->setYAxis(QwtPlot::yRight);
+    weeklyRICurve->setYAxis(QwtAxis::YRight);
     weeklyRICurve->attach(weeklyBSPlot);
 
     // set baseline curves to obscure linewidth variations along baseline
@@ -342,13 +342,13 @@ WeeklySummaryWindow::refresh()
     weeklyPlotAxisTitleFont.setPointSize(10);
     weeklyPlotAxisTitleFont.setBold(true);
     textLabel.setFont(weeklyPlotAxisTitleFont);
-    weeklyPlot->setAxisTitle(QwtPlot::yLeft, textLabel);
+    weeklyPlot->setAxisTitle(QwtAxis::YLeft, textLabel);
     textLabel.setText("Minutes");
-    weeklyPlot->setAxisTitle(QwtPlot::yRight, textLabel);
+    weeklyPlot->setAxisTitle(QwtAxis::YRight, textLabel);
     textLabel.setText(useBikeScore ? "BikeScore" : "kJoules");
-    weeklyBSPlot->setAxisTitle(QwtPlot::yLeft, textLabel);
+    weeklyBSPlot->setAxisTitle(QwtAxis::YLeft, textLabel);
     textLabel.setText(useBikeScore ? "Intensity" : "xPower");
-    weeklyBSPlot->setAxisTitle(QwtPlot::yRight, textLabel);
+    weeklyBSPlot->setAxisTitle(QwtAxis::YRight, textLabel);
 
     // for the daily distance/duration and bikescore plots:
     // first point: establish zero position
@@ -428,18 +428,18 @@ WeeklySummaryWindow::refresh()
 
     // Distance/Duration plot:
     weeklyDistCurve->setData(xdist, ydist, 16);
-    weeklyPlot->setAxisScale(QwtPlot::yLeft, 0, weeklyDistCurve->maxYValue()*1.1, 0);
+    weeklyPlot->setAxisScale(QwtAxis::YLeft, 0, weeklyDistCurve->maxYValue()*1.1, 0);
-    weeklyPlot->setAxisScale(QwtPlot::xBottom, 0.5, 7.5, 0);
+    weeklyPlot->setAxisScale(QwtAxis::XBottom, 0.5, 7.5, 0);
-    weeklyPlot->setAxisTitle(QwtPlot::yLeft, useMetricUnits ? "Kilometers" : "Miles");
+    weeklyPlot->setAxisTitle(QwtAxis::YLeft, useMetricUnits ? "Kilometers" : "Miles");
 
     weeklyDurationCurve->setData(xdur, ydur, 16);
-    weeklyPlot->setAxisScale(QwtPlot::yRight, 0, weeklyDurationCurve->maxYValue()*1.1, 0);
+    weeklyPlot->setAxisScale(QwtAxis::YRight, 0, weeklyDurationCurve->maxYValue()*1.1, 0);
     weeklyPlot->replot();
 
     // BikeScore/Relative Intensity plot
     weeklyBSCurve->setData(xbsorw, ybsorw, 16);
-    weeklyBSPlot->setAxisScale(QwtPlot::yLeft, 0, weeklyBSCurve->maxYValue()*1.1, 0);
+    weeklyBSPlot->setAxisScale(QwtAxis::YLeft, 0, weeklyBSCurve->maxYValue()*1.1, 0);
-    weeklyBSPlot->setAxisScale(QwtPlot::xBottom, 0.5, 7.5, 0);
+    weeklyBSPlot->setAxisScale(QwtAxis::XBottom, 0.5, 7.5, 0);
 
     // set axis minimum for relative intensity
     double RImin = -1;
@@ -454,7 +454,7 @@ WeeklySummaryWindow::refresh()
 	    yriorxp[i] = RImin;
     weeklyRICurve->setBaseline(RImin);
     weeklyRICurve->setData(xriorxp, yriorxp, 16);
-    weeklyBSPlot->setAxisScale(QwtPlot::yRight, RImin, weeklyRICurve->maxYValue()*1.1, 0);
+    weeklyBSPlot->setAxisScale(QwtAxis::YRight, RImin, weeklyRICurve->maxYValue()*1.1, 0);
 
     weeklyBSPlot->replot();
 

qwt/.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

qwt/.idea/misc.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MakefileSettings">
+    <option name="linkedExternalProjectsSettings">
+      <MakefileProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+          </set>
+        </option>
+        <option name="version" value="2" />
+      </MakefileProjectSettings>
+    </option>
+  </component>
+  <component name="MakefileWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
+</project>

qwt/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

qwt/CHANGES-6.2

@@ -0,0 +1,84 @@
+Qwt 6.2.0
+=========
+
+0) Requirement for Qt >= 4.8
+
+1) Class Includes added
+
+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"
+
+2) BSD License for examples
+
+Where possible the code of the examples is available under the 3-clause BSD License 
+
+3) MathML text renderer removed
+
+The code can be found at https://github.com/uwerat/qwt-mml-dev now and is intended
+to become a standalone lib. Anyone who is interested to workon it, please let me know.
+
+4) Spline interpolation
+
+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 MS Excel
+	- Cubic
+
+An implementation of the de Casteljau’s algorithm has been added
+
+	- QwtBezier
+
+5) New plot items
+
+	- QwtPlotVectorField
+      A new type of plot item for vector fields
+
+    - QwtPlotGraphicItem
+      An item displaying a QwtGraphic image ( f.e used by QwtPlotSvgItem )
+
+6) Plot Canvas
+
+	- QwtAbstractPlotCanvas introduced
+	- QwtPlotOpenGLCanvas added to support QOpenGLWidget
+
+7) QwtPlotCurve
+
+	- QwtPlotCurve::FilterPointsAggressive mode added - a fast weeding algo
+      for huge datasets with increasing x or y values
+
+	- QwtPlotCurve::closestPoint is virtual now
+	- QwtPlotCurve: polygon clipping includes the painter clip
+	- QwtPlotCurve::setLegendAttributes added
+	- QwtValuePointData added for curves, where the x values are the index
+	- a couple of new QwtPlotCurve::setSamples alternatives
+
+8) QwtPlotSpectrogram
+
+	- QwtPlotSpectrogram::setColorTableSize added
+	- QwtRasterData::setInterval/interval changed into a pure virtual getter
+	- QwtMatrixRasterData::BicubicInterpolation added
+	- QwtMatrixRasterData::interval: API cleanup
+	- QwtHueColorMap, QwtSaturationValueColorMap added
+
+9) QwtPlotRenderer
+
+	- using QPdfWriter where possible
+
+10)
+	- LOG_MIN/LOG_MAX removed, use QwtTransform::LogMin/LogMax instead ( values differ ! )
+	- qwt_compat.h removed
+	- qwtFuzzyGreaterOrEqual/qwtFuzzyLessOrEqual removed
+	- qwtGetMin/qwtGetMax removed
+
+11)
+    - Not aligning unknown paint engines ( f.e EMF )
+    - QwtNullPaintDevice is using a different type than QPaintEngine::User now
+
+12) Many other changes ...

qwt/TODO

@@ -1,38 +0,0 @@
-Qwt TODO list
-
-Ideas
-------
-- Improve Documention
-- QAbstractModel -> QwtSeriesData
-- Box/Whisker plot item
-- QwtSeriesData + functors
-- QwtSeriesData/QwtPlotCurve + Level of details (Douglas Peucker)
-- Common zoom stack for all navigation objects
-- Watermark Item
-- Contour algorithm for vectors: http://apptree.net/conrec.htm
-- QwtPlotCanvas rendered via FBO, PBO
-- Time/Date scale engine
-- TeX texts
-- Grid of QwtPlots
-- Interval scale labels ( between 2 ticks )
-- More than 4 axes
-- QwtIntervalSymbol + QPainterPath/...
-- QwtPlotScene + breaking composite architecture
-- Using QStaticText for markers ( and scales ? )
-- Scales/Grid item like in QwtPolarGrid
-- Container for a 2D matrix
-- Waterfall plots
-- transform/invTransform for polygons and lines
-- cursor item
-- line marker with a line from the position to the axis
-- quadtree
-- QwtText supporting Qt::TextElideMode
-- Multitouch events
-- QwtKnob/QwtDial fixed contents size mode
-- controls ( f.e QwtWheel ) with a very dark palette
-
-Bugs/Change requests
---------------------
-- Remove QwtScaleTransformation::copy()
-- Reference value for QwtThermo
-- Transparent canvas background + backingstore

qwt/admin/sf2package.sh

@@ -1,8 +1,8 @@
 #! /bin/sh
 # 
-# Generates a Qwt package from sourceforge svn
+# Generates a Qwt package from the sourceforge repository
 #
-# Usage: svn2package.sh [-b|--branch <svn-branch>] [packagename] 
+# Usage: 2package.sh.sh [-b|--branch <branch>] [packagename] 
 # 
 
 ##########################
@@ -10,15 +10,15 @@
 ##########################
 
 function usage() {
-    echo "Usage: $0 [-b|--branch <svn-branch>] [-s|--suffix <suffix>] [-html] [-pdf] [-qch] [packagename]"
+    echo "Usage: $0 [-b|--branch <branch>] [-s|--suffix <suffix>] [-html] [-pdf] [-qch] [packagename]"
     exit 1
 }
 
 ################################
-# checkout 
+# downloadQwt 
 ################################
 
-function checkoutQwt() {
+function downloadQwt() {
 
     if [ -x $2 ]
     then
@@ -29,18 +29,14 @@ function checkoutQwt() {
         fi
     fi
 
-    svn -q co https://svn.code.sf.net/p/qwt/code/$1/$2
+    git clone -b $1 git://git.code.sf.net/p/qwt/git $2
     if [ $? -ne 0 ]
     then
-        echo "Can't access sourceforge SVN"
+        echo "Can't access sourceforge repository"
         exit $?
     fi
 
-    if [ "$3" != "$2" ]
+    rm -rf $2/.git $2/.gitignore
-    then
-        rm -rf $3
-        mv $2 $3
-    fi
 }
 
 ##########################
@@ -55,8 +51,6 @@ function cleanQwt {
         exit $?
     fi
 
-    find . -name .svn -print | xargs rm -r
-
     rm -f TODO
     rm -rf admin
     rm -rf doc/tex
@@ -86,10 +80,10 @@ function cleanQwt {
 
     if [ "$SUFFIX" != "" ]
     then
-        sed -i -e "s/\$\$QWT_VERSION-svn/\$\$QWT_VERSION-$SUFFIX/" qwtconfig.pri 
+        sed -i -e "s/\$\$QWT_VERSION-dev/\$\$QWT_VERSION-$SUFFIX/" qwtconfig.pri 
     	sed -i -e "s/\$(QWTVERSION)/$VERSION-$SUFFIX/" doc/install.dox
     else
-        sed -i -e "s/\$\$QWT_VERSION-svn/\$\$QWT_VERSION/" qwtconfig.pri
+        sed -i -e "s/\$\$QWT_VERSION-dev/\$\$QWT_VERSION/" qwtconfig.pri
     	sed -i -e "s/\$(QWTVERSION)/$VERSION/" doc/install.dox
     fi
 
@@ -234,8 +228,7 @@ function prepare4Unix {
 ##########################
 
 QWTDIR=
-SVNDIR=trunk
+BRANCH=multiaxes
-BRANCH=qwt
 SUFFIX=
 VERSION=
 GENERATE_DOC=0
@@ -248,7 +241,7 @@ while [ $# -gt 0 ] ; do
         -h|--help)
             usage; exit 1 ;;
         -b|--branch)
-            shift; SVNDIR=branches; BRANCH=$1; shift;;
+            shift; BRANCH=$1; shift;;
         -s|--suffix)
             shift; SUFFIX=$1; shift;;
         -html)
@@ -276,8 +269,8 @@ fi
 
 TMPDIR=/tmp/$QWTDIR-tmp
 
-echo -n "checkout to $TMPDIR ... "
+echo -n "downloading to $TMPDIR ... "
-checkoutQwt $SVNDIR $BRANCH $TMPDIR
+downloadQwt $BRANCH $TMPDIR
 cleanQwt $TMPDIR
 echo done
 

qwt/classincludes/QwtAbstractLegend

@@ -0,0 +1 @@
+#include "qwt_abstract_legend.h"

qwt/classincludes/QwtAbstractScale

@@ -0,0 +1 @@
+#include "qwt_abstract_scale.h"

qwt/classincludes/QwtAbstractScaleDraw

@@ -0,0 +1 @@
+#include "qwt_abstract_scale_draw.h"

qwt/classincludes/QwtAbstractSlider

@@ -0,0 +1 @@
+#include "qwt_abstract_slider.h"

qwt/classincludes/QwtAlphaColorMap

@@ -0,0 +1 @@
+#include "qwt_color_map.h"

qwt/classincludes/QwtAnalogClock

@@ -0,0 +1 @@
+#include "qwt_analog_clock.h"

qwt/classincludes/QwtArrowButton

@@ -0,0 +1 @@
+#include "qwt_arrow_button.h"

qwt/classincludes/QwtAxis

@@ -0,0 +1 @@
+#include "qwt_axis.h"

qwt/classincludes/QwtAxisId

@@ -0,0 +1 @@
+#include "qwt_axis_id.h"

qwt/classincludes/QwtBezier

@@ -0,0 +1 @@
+#include "qwt_bezier.h"

qwt/classincludes/QwtCPointerData

@@ -0,0 +1 @@
+#include "qwt_point_data.h"

qwt/classincludes/QwtClipper

@@ -0,0 +1 @@
+#include "qwt_clipper.h"

qwt/classincludes/QwtColorMap

@@ -0,0 +1 @@
+#include "qwt_color_map.h"

qwt/classincludes/QwtColumnRect

@@ -0,0 +1 @@
+#include "qwt_column_symbol.h"

qwt/classincludes/QwtColumnSymbol

@@ -0,0 +1 @@
+#include "qwt_column_symbol.h"

qwt/classincludes/QwtCompass

@@ -0,0 +1 @@
+#include "qwt_compass.h"

qwt/classincludes/QwtCompassMagnetNeedle

@@ -0,0 +1 @@
+#include "qwt_dial_needle.h"

qwt/classincludes/QwtCompassRose

@@ -0,0 +1 @@
+#include "qwt_compass_rose.h"

qwt/classincludes/QwtCompassScaleDraw

@@ -0,0 +1 @@
+#include "qwt_compass.h"

qwt/classincludes/QwtCompassWindArrow

@@ -0,0 +1 @@
+#include "qwt_dial_needle.h"

qwt/classincludes/QwtCounter

@@ -0,0 +1 @@
+#include "qwt_counter.h"

qwt/classincludes/QwtCurveFitter

@@ -0,0 +1 @@
+#include "qwt_curve_fitter.h"

qwt/classincludes/QwtDate

@@ -0,0 +1 @@
+#include "qwt_date.h"

qwt/classincludes/QwtDateScaleDraw

@@ -0,0 +1 @@
+#include "qwt_date_scale_draw.h"

qwt/classincludes/QwtDateScaleEngine

@@ -0,0 +1 @@
+#include "qwt_date_scale_engine.h"

qwt/classincludes/QwtDial

@@ -0,0 +1 @@
+#include "qwt_dial.h"

qwt/classincludes/QwtDialNeedle

@@ -0,0 +1 @@
+#include "qwt_dial_needle.h"

qwt/classincludes/QwtDialSimpleNeedle

@@ -0,0 +1 @@
+#include "qwt_dial_needle.h"

qwt/classincludes/QwtDynGridLayout

@@ -0,0 +1 @@
+#include "qwt_dyngrid_layout.h"

qwt/classincludes/QwtEventPattern

@@ -0,0 +1 @@
+#include "qwt_event_pattern.h"

qwt/classincludes/QwtGlobal

@@ -0,0 +1 @@
+#include "qwt_global.h"

qwt/classincludes/QwtGraphic

@@ -0,0 +1 @@
+#include "qwt_graphic.h"

qwt/classincludes/QwtHueColorMap

@@ -0,0 +1 @@
+#include "qwt_color_map.h"

qwt/classincludes/QwtInterval

@@ -0,0 +1 @@
+#include "qwt_interval.h"

qwt/classincludes/QwtIntervalSample

@@ -0,0 +1 @@
+#include "qwt_samples.h"

qwt/classincludes/QwtIntervalSeriesData

@@ -0,0 +1 @@
+#include "qwt_series_data.h"

qwt/classincludes/QwtIntervalSymbol

@@ -0,0 +1 @@
+#include "qwt_interval_symbol.h"

qwt/classincludes/QwtKnob

@@ -0,0 +1 @@
+#include "qwt_knob.h"

qwt/classincludes/QwtLegend

@@ -0,0 +1 @@
+#include "qwt_legend.h"

qwt/classincludes/QwtLegendData

@@ -0,0 +1 @@
+#include "qwt_legend_data.h"

qwt/classincludes/QwtLegendLabel

@@ -0,0 +1 @@
+#include "qwt_legend_label.h"

qwt/classincludes/QwtLinearColorMap

@@ -0,0 +1 @@
+#include "qwt_color_map.h"

qwt/classincludes/QwtLinearScaleEngine

@@ -0,0 +1 @@
+#include "qwt_scale_engine.h"

qwt/classincludes/QwtLogScaleEngine

@@ -0,0 +1 @@
+#include "qwt_scale_engine.h"

qwt/classincludes/QwtLogTransform

@@ -0,0 +1 @@
+#include "qwt_transform.h"

qwt/classincludes/QwtMagnifier

@@ -0,0 +1 @@
+#include "qwt_magnifier.h"

qwt/classincludes/QwtMath

@@ -0,0 +1 @@
+#include "qwt_math.h"

qwt/classincludes/QwtMatrixRasterData

@@ -0,0 +1 @@
+#include "qwt_matrix_raster_data.h"

qwt/classincludes/QwtNullPaintDevice

@@ -0,0 +1 @@
+#include "qwt_null_paintdevice.h"

qwt/classincludes/QwtNullTransform

@@ -0,0 +1 @@
+#include "qwt_transform.h"

qwt/classincludes/QwtOHLCSample

@@ -0,0 +1 @@
+#include "qwt_samples.h"

qwt/classincludes/QwtPainter

@@ -0,0 +1 @@
+#include "qwt_painter.h"

qwt/classincludes/QwtPainterCommand

@@ -0,0 +1 @@
+#include "qwt_painter_command.h"

qwt/classincludes/QwtPanner

@@ -0,0 +1 @@
+#include "qwt_panner.h"

qwt/classincludes/QwtPicker

@@ -0,0 +1 @@
+#include "qwt_picker.h"

qwt/classincludes/QwtPickerClickPointMachine

@@ -0,0 +1 @@
+#include "qwt_picker_machine.h"

qwt/classincludes/QwtPickerClickRectMachine

@@ -0,0 +1 @@
+#include "qwt_picker_machine.h"

qwt/classincludes/QwtPickerDragLineMachine

@@ -0,0 +1 @@
+#include "qwt_picker_machine.h"

qwt/classincludes/QwtPickerDragPointMachine

@@ -0,0 +1 @@
+#include "qwt_picker_machine.h"

qwt/classincludes/QwtPickerDragRectMachine

@@ -0,0 +1 @@
+#include "qwt_picker_machine.h"

qwt/classincludes/QwtPickerMachine

@@ -0,0 +1 @@
+#include "qwt_picker_machine.h"

qwt/classincludes/QwtPickerPolygonMachine

@@ -0,0 +1 @@
+#include "qwt_picker_machine.h"

qwt/classincludes/QwtPickerTrackerMachine

@@ -0,0 +1 @@
+#include "qwt_picker_machine.h"

qwt/classincludes/QwtPixelMatrix

@@ -0,0 +1 @@
+#include "qwt_pixel_matrix.h"

qwt/classincludes/QwtPlainTextEngine

@@ -0,0 +1 @@
+#include "qwt_text_engine.h"

qwt/classincludes/QwtPlot

@@ -0,0 +1 @@
+#include "qwt_plot.h"

qwt/classincludes/QwtPlotAbstractBarChart

@@ -0,0 +1 @@
+#include "qwt_plot_abstract_barchart.h"

qwt/classincludes/QwtPlotAbstractCanvas

@@ -0,0 +1 @@
+#include "qwt_plot_abstract_canvas.h"

qwt/classincludes/QwtPlotBarChart

@@ -0,0 +1 @@
+#include "qwt_plot_barchart.h"

qwt/classincludes/QwtPlotCanvas

@@ -0,0 +1 @@
+#include "qwt_plot_canvas.h"

qwt/classincludes/QwtPlotCurve

@@ -0,0 +1 @@
+#include "qwt_plot_curve.h"

qwt/classincludes/QwtPlotDict

@@ -0,0 +1 @@
+#include "qwt_plot_dict.h"

qwt/classincludes/QwtPlotDirectPainter

@@ -0,0 +1 @@
+#include "qwt_plot_directpainter.h"

qwt/classincludes/QwtPlotGLCanvas

@@ -0,0 +1 @@
+#include "qwt_plot_glcanvas.h"

qwt/classincludes/QwtPlotGraphicItem

@@ -0,0 +1 @@
+#include "qwt_plot_graphicitem.h"

qwt/classincludes/QwtPlotGrid

@@ -0,0 +1 @@
+#include "qwt_plot_grid.h"

qwt/classincludes/QwtPlotHistogram

@@ -0,0 +1 @@
+#include "qwt_plot_histogram.h"

qwt/classincludes/QwtPlotIntervalCurve

@@ -0,0 +1 @@
+#include "qwt_plot_intervalcurve.h"

qwt/classincludes/QwtPlotItem

@@ -0,0 +1 @@
+#include "qwt_plot_item.h"

qwt/classincludes/QwtPlotLayout

@@ -0,0 +1 @@
+#include "qwt_plot_layout.h"

qwt/classincludes/QwtPlotLegendItem

@@ -0,0 +1 @@
+#include "qwt_plot_legenditem.h"

qwt/classincludes/QwtPlotMagnifier

@@ -0,0 +1 @@
+#include "qwt_plot_magnifier.h"

qwt/classincludes/QwtPlotMarker

@@ -0,0 +1 @@
+#include "qwt_plot_marker.h"

qwt/classincludes/QwtPlotMultiBarChart

@@ -0,0 +1 @@
+#include "qwt_plot_multi_barchart.h"

qwt/classincludes/QwtPlotOpenGLCanvas

@@ -0,0 +1 @@
+#include "qwt_plot_opengl_canvas.h"

qwt/classincludes/QwtPlotPanner

@@ -0,0 +1 @@
+#include "qwt_plot_panner.h"

qwt/classincludes/QwtPlotPicker

@@ -0,0 +1 @@
+#include "qwt_plot_picker.h"

qwt/classincludes/QwtPlotRasterItem

@@ -0,0 +1 @@
+#include "qwt_plot_rasteritem.h"