nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 08:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Joachim Kohlhammer
2024-01-06 22:59:55 +01:00
committed by GitHub
parent ea044a0c39
commit 49cf6340a4
991 changed files with 63097 additions and 46278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
qwt/admin/svn2package.sh → qwt/admin/sf2package.sh
View File

@@ -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" ]
then
rm -rf $3
mv $2 $3
fi
rm -rf $2/.git $2/.gitignore
}
##########################
@@ -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=qwt
BRANCH=multiaxes
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 ... "
checkoutQwt $SVNDIR $BRANCH $TMPDIR
echo -n "downloading to $TMPDIR ... "
downloadQwt $BRANCH $TMPDIR
cleanQwt $TMPDIR
echo done