VERSION 3.6 RELEASE

.. final release of version 3.6

.travis.yml

@@ -14,6 +14,7 @@ cache:
   - D2XX
   - site-packages
   - VLC
+  - src/GoldenCheetah.app
 
 env:
   global:
@@ -37,6 +38,10 @@ env:
   - secure: em0xXIm69rMHsHXYQiizeJB7dEFBkX33PsWDHwBNrX6lFBued23eL96KJC4RVbk6A+AHFtXFATrreZ14D5JH/E/37CXhe3X2R93WqiPUSH0s7NI4fFA1BroKUNAlqO4bMqDBidtNmwMPaLTXjaOnOZyvbAG7z+QV3TKC8tOeZDU=
   - secure: VFaSERlgsjzjiDQhKw8XFvQrjdvFzHHL7V3NQg+RfELHoT6I1pAGFdl/+lRBIVOiVkbQ6XnpBA28nlf0QydPHElRZdqmh0azQV/bkUXD4ffPE8q0iSqeqhAZ+5L05K5K+Gby/y8TZE4FX6e/7trFL7oq+h9x0gq5RQO8rAcTV84=
   - secure: eTSJmS38EsTkI22yvDJLUrBxSyLDwd3pDRsyLQfZ3ThN0UJ9cQN2uB7aLy3OzNYadpi+Axlr46MgG0G5qGV1hHXkf+C4orGkURQWxHA7L5R/oE98TuYMO1bisZu9dJEVbmEM4cehCjbB7DExzxK4m6+oTJsWhVbIwlNh5Poq/v4=
+  - secure: gUDTEErUOhzkSVofEvdw1jqHHsE/K+/SOqRBKDToaFPhi6XK+Tvu1LqPMjfPdjYLaCSiwc/R79fJrAEuK+7KSwdiLEnDv3RMpRS5g1UWyJ/ZYd5xNR+WiBqUvnY/S/CJokuNw7gBbGq7JCO4pmIGV5YB9FA4Na6MG/eHzTSOIig=
+  - secure: Qk+gzBLwjrB8abUYzxap10dYSpIeKpB1gqhdoMbqS23G0r1lejnsjutIfReuJGK/efCmhisKN1xIX/InvJWD8z6GsLJFmf3F0oRj7aDJ/X5UIn9Upflje9xgHQafP1FJuzZBWtzandNfPE8EmEOgAQsJZ3c7xBE1SY/6xcJaQTc=
+  - secure: m4+k3/QcYvqmMoRO8uq3ef2jAO1FWeRVDG/XtlbjBlgmB5OR/zW5c7c1Ywm6IM5yzsi1rRks8GFffZ6gYqXhML10EfGKVbnyBcZZ7HVylNtvxDF68W1BLacChzDs4mGYQSV8kJRGI3EaVNdyFJ5yln/HUZ6qBbQ473MtxprO6BI=
+  - secure: GEyUuLuIc7D3F4noKhtTCbWbQAlm61Y7Vh2mOKBEgmyfoV1johwlEL0RaeRyr9MnU2MN+4jeFthvDjxm3LGP19zrpB46GTGHU6/H9BZBodDCJsFTqj32T+5QTcAF2RQ66ZgYpSyTf063/RLlfy7YjCb8KLiJ2asCaoYtQIjx3hA=
 
 jobs:
   include:

INSTALL-LINUX

@@ -6,7 +6,7 @@
                                      John Ehrlinger
                                      Ale Martinez
 
-                                        Mar 2021
+                                        Jul 2022
                                       Version 3.6
 
 A walkthrough of building GoldenCheetah from scratch on Ubuntu linux 18.04
@@ -48,7 +48,7 @@ Install Qt
 ----------
 Download and install the Qt SDK from http://qt-project.org/
 You can use a browser to download and run the interactive installer, be sure to
-select version 5.14.2 or higher Qt 5 version, including at least the following modules:
+select version 5.15.2 or higher Qt 5 version, including at least the following modules:
 - Desktop gcc 64-bit
 - Qt Charts
 - Qt WebEngine
@@ -93,16 +93,14 @@ Uncomment below and configure the location of the GNU scientific library, this i
 #GSL_INCLUDES = /usr/include
 #GSL_LIBS = -lgsl -lgslcblas -lm
 
-Ensure you have the following lines (which are now also in gcconfig.pri.in which has
-been updated to reflect the new dependencies in version 3.6)
+Uncomment the following lines to use flex and bison:
 
-QMAKE_LEX  = flex
-QMAKE_YACC = bison
-win32 {
-  QMAKE_YACC = bison --file-prefix=y -t
-  QMAKE_MOVE = cmd /c move
-  QMAKE_DEL_FILE = rm -f
-}
+#QMAKE_LEX  = flex
+#QMAKE_YACC = bison
+
+and if you are using bison 3.7 or higher, make sure to also uncomment:
+
+#QMAKE_MOVE = cp
 
 To compile translation you need the QT tool lrelease
 If it is not found using the defaults in src/src.pro then set the full path and

INSTALL-MAC

@@ -1,11 +1,12 @@
 Update Note: to build GoldenCheetah v3.6 we are using the Homebrew Package
 Manager to install dependencies, including Qt and GSL, on Travis-ci
-macOS High Sierra build environment.
+macOS Mojave build environment.
 You can check the travis/osx folder for the complete and updated build scripts,
 the minimum Qt version known to work is 5.13 with Qt WebEngine and Qt Charts.
-GSL - GNU Scientific Library is a mandatory dependency starting with v3.6
+GSL - GNU Scientific Library is a mandatory dependency starting with v3.6 and
+minimum bison version is 2.7, both can be installed using Homebrew.
 
-Ale Martinez - May, 2020
+Ale Martinez - Oct, 2022
 
                                  +++++++++++++++++++++++
                                 MAC OSX BUILD WALKTHROUGH

INSTALL-WIN32

@@ -1,11 +1,11 @@
-Update Note: to build GoldenCheetah v3.6 we are using Microsoft Visual C++ 2017,
-included in Microsoft Visual Studio 2019, with pre-installed Qt and GSL
+Update Note: to build GoldenCheetah v3.6 we are using Microsoft Visual C++ 2019,
+included in Microsoft Visual Studio 2019 AppVeyor image, with Qt5.15.2 and GSL 2.7
 insalled with vcpkg, on AppVeyor continuous integration platform.
 You can check the appveyor.yml for the complete and updated build script,
 the minimum Qt version known to work is 5.13 with Qt WebEngine and Qt Charts.
 GSL - GNU Scientific Library is a mandatory dependency starting with v3.6
 
-Ale Martinez - May, 2020
+Ale Martinez - Jul, 2022
                                  +++++++++++++++++++++++
                                  WIN32 BUILD WALKTHROUGH
                                  +++++++++++++++++++++++

README.md

@@ -1,12 +1,28 @@
-<img src="src/Resources/images/gc.png" height="25%" width="25%">
-
 # GoldenCheetah
 
+<img src="https://raw.githubusercontent.com/GoldenCheetah/GoldenCheetah/067696aafdad21c702672b2c9c41da03c076451c/doc/wiki/GoldenCheetah-Screenshot.png" width="100%">
+
 ## About 
 
-GoldenCheetah is a desktop application for cyclists and triathletes and coaches, providing a rich set of tools and models to analyse, track and predict performance, optimise aerodynamics and train indoors.
+GoldenCheetah is a desktop application for cyclists and triathletes and coaches
+* Analyse using summary metrics like BikeStress, TRIMP or RPE
+* Extract insight via models like Critical Power and W'bal
+* Track and predict performance using models like Banister and PMC
+* Optimise aerodynamics using Virtual Elevation
+* Train indoors with ANT and BTLE trainers
+* Upload and Download with many cloud services including Strava and Todays Plan
+* Import and export data to and from a wide range of bike computers and file formats
 
-GoldenCheetah integrates with most popular cloud services like Strava and Todays Plan, imports data from bike computers, imports downloads from any website like TrainingPeaks and Garmin and will also connect to smart trainers using ANT+ and Bluetooth.
+GoldenCheetah provides tools for users to develop their own own metrics, models and charts
+* A high-performance and powerful built-in scripting language
+* Local Python runtime or embedding a user installed runtime 
+* Embedded user installed R runtime 
+
+GoldenCheetah supports community sharing via the Cloud
+* Upload and download user developed metrics
+* Upload and download user, Python or R charts
+* Import indoor workouts from the ErgDB
+* Share anonymised data with researchers via the OpenData initiative
 
 GoldenCheetah is free for everyone to use and modify, released under the GPL v2 open source license with pre-built binaries for Mac, Windows and Linux.
 
@@ -19,7 +35,7 @@ INSTALL-WIN32   For building on Microsoft Windows
 
 INSTALL-LINUX   For building on Linux
 
-INSTALL-MAC     For building on Apple OS X
+INSTALL-MAC     For building on Apple MacOS
 
 
 macOS and Linux: [![Build Status](https://app.travis-ci.com/GoldenCheetah/GoldenCheetah.svg?branch=master)](https://app.travis-ci.com/GoldenCheetah/GoldenCheetah)
@@ -29,3 +45,8 @@ Windows: [![Build status](https://ci.appveyor.com/api/projects/status/i6dwn4m8oy
 [![Coverity Status](https://scan.coverity.com/projects/7503/badge.svg)](https://scan.coverity.com/projects/goldencheetah-goldencheetah)
 
 Official release builds, snapshots and development builds are all available from http://www.goldencheetah.org
+
+## NOTIO Fork
+
+If you are looking for the NOTIO fork of GoldenCheetah it can be found here: https://github.com/notio-technologies/GCNotio
+

appveyor.yml

@@ -35,10 +35,18 @@ environment:
     secure: n6a8nJgqMyg+VsVeoIIR8TFzxyDFVi2w/ggetQk5agY=
   GC_RWGPS_API_KEY:
     secure: uUtCyF5ByZ1VYJOztUngIA==
+  GC_NOLIO_CLIENT_ID:
+    secure: /OFVjEBwU7o3SItIQVf/YlJ8XErxneXIT2N0JyPMSXR1tCbdZVWixMHpqKNWoNk4
+  GC_NOLIO_SECRET:
+    secure: mmMksvVnfBiXufBDn2gAhQY53n0J9BokSCtDY51uU918QJ/LL4XOojtJp5tMFn8T7ugyDhNASpqZXiK55vxSD53vm+tjufpfzppKEeh93Babvc/VrndLB1X/RZCRUQTR6rka05fYl4e0eBzP1H091A==
+  GC_XERT_CLIENT_SECRET:
+    secure: /1rVLT8LyJCZ4xNJ5W+NtAcZ1rtKaUjW9SYm/T3gHoc=
+  GC_AZUM_CLIENT_SECRET:
+    secure: 2ZpXsA3TQv1zftYVyZSF6f83ftCzza+K22ZX1doj7Yc/5dmGl1bnsSeVChJgJ8lQ2fRPYpdmun9cjqwcrtG/zXTTsYuTvYWegHz/4Y0u6Mg=
 
 init:
-# Setup QT 5.14 - 64Bit
-- set QTDIR=C:\Qt\5.14\msvc2017_64
+# Setup QT 5.15 - 64Bit
+- set QTDIR=C:\Qt\5.15\msvc2019_64
 - set PATH=%QTDIR%\bin;%PATH%
 - qmake --version
 
@@ -76,7 +84,9 @@ install:
 # Get R and add to config
 - ps: >-
     if (-not (Test-Path 'C:\R')) {
-      $rurl = $(ConvertFrom-JSON $(Invoke-WebRequest https://rversions.r-pkg.org/r-release-win).Content).URL
+      # Lets use 4.1 until 4.2 issues are fixed
+      #$rurl = $(ConvertFrom-JSON $(Invoke-WebRequest https://rversions.r-pkg.org/r-release-win).Content).URL
+      $rurl = "https://cran.r-project.org/bin/windows/base/old/4.1.3/R-4.1.3-win.exe"
       Start-FileDownload $rurl "R-win.exe"
       Start-Process -FilePath .\R-win.exe -ArgumentList "/VERYSILENT /DIR=C:\R" -NoNewWindow -Wait
     }
@@ -124,6 +134,9 @@ before_build:
 # Add Train Robot
 - echo DEFINES+=GC_WANT_ROBOT >> src\gcconfig.pri
 
+# Avoid macro redefinition warnings
+- echo DEFINES+=_MATH_DEFINES_DEFINED >> src\gcconfig.pri
+
 # Add debug console
 #- echo CONFIG+=console >> src\gcconfig.pri
 
@@ -145,6 +158,10 @@ before_build:
 - ps: (Get-Content src\Core\Secrets.h) -replace '__GC_POLARFLOW_CLIENT_SECRET__', $env:GC_POLARFLOW_CLIENT_SECRET | Set-Content src\Core\Secrets.h
 - ps: (Get-Content src\Core\Secrets.h) -replace '__GC_SPORTTRACKS_CLIENT_SECRET__', $env:GC_SPORTTRACKS_CLIENT_SECRET | Set-Content src\Core\Secrets.h
 - ps: (Get-Content src\Core\Secrets.h) -replace '__GC_RWGPS_API_KEY__', $env:GC_RWGPS_API_KEY | Set-Content src\Core\Secrets.h
+- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_NOLIO_CLIENT_ID__', $env:GC_NOLIO_CLIENT_ID | Set-Content src\Core\Secrets.h
+- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_NOLIO_SECRET__', $env:GC_NOLIO_SECRET | Set-Content src\Core\Secrets.h
+- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_XERT_CLIENT_SECRET__', $env:GC_XERT_CLIENT_SECRET | Set-Content src\Core\Secrets.h
+- ps: (Get-Content src\Core\Secrets.h) -replace '__GC_AZUM_CLIENT_SECRET__', $env:GC_AZUM_CLIENT_SECRET | Set-Content src\Core\Secrets.h
 
 build_script:
 - qmake.exe build.pro -r -spec win32-msvc
@@ -176,10 +193,10 @@ after_build:
 - copy ..\Resources\win32\gc.ico
 
 # Installer script
-- copy ..\Resources\win32\GC3.6-Dev-Master-W64-QT5.14.2.nsi
+- copy ..\Resources\win32\GC3.6-Dev-Master-W64-QT5.nsi
 
 # Build the installer
-- makensis GC3.6-Dev-Master-W64-QT5.14.2.nsi
+- makensis GC3.6-Dev-Master-W64-QT5.nsi
 - move GoldenCheetah_v3.6-DEV_64bit_Windows.exe ..\..\GoldenCheetah_v3.6-DEV_x64.exe
 - cd ..\..
 - ps: Set-AppveyorBuildVariable -Name 'PUBLISH_BINARIES' -Value false

contrib/boost/GeometricTools_BSplineCurve.h

@@ -3,8 +3,10 @@
 // it requires.
 
 // disable warning messages
+#ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wunused-value"
 #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
 
 #define LogError(a)    (0); return 0;
 #define LogAssert(a,b) (0)

contrib/levmar/misc_core.c

@@ -22,8 +22,10 @@
 #endif
 
 
+#ifdef __GNUC__
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
 #pragma GCC diagnostic ignored "-Wcpp"
+#endif
 
 /* precision-specific definitions */
 #define LEVMAR_CHKJAC LM_ADD_PREFIX(levmar_chkjac)

contrib/qzip/zip.cpp

@@ -430,6 +430,10 @@ void QZipPrivate::fillFileInfo(int index, ZipReader::FileInfo &fileInfo) const
     fileInfo.crc_32 = readUInt(header.h.crc_32);
     fileInfo.size = readUInt(header.h.uncompressed_size);
     fileInfo.lastModified = readMSDosDate(header.h.last_mod_file);
+    // Files of size 0 ending in "/" seems to be an alternative directory encoding used by some compressors
+    bool altIsDir = (fileInfo.size == 0 && fileInfo.filePath.endsWith("/"));
+    fileInfo.isDir = fileInfo.isDir || altIsDir;
+    fileInfo.isFile = fileInfo.isFile && !altIsDir;
 }
 
 class ZipReaderPrivate : public QZipPrivate
@@ -930,7 +934,7 @@ bool ZipReader::extractAll(const QString &destinationDir) const
         if (fi.isDir) {
             if (!baseDir.mkpath(fi.filePath))
                 return false;
-            if (!QFile::setPermissions(absPath, fi.permissions))
+            if (fi.permissions > 0 && !QFile::setPermissions(absPath, fi.permissions))
                 return false;
         }
     }

contrib/voronoi/Voronoi.cpp

@@ -730,8 +730,8 @@ Voronoi::getfree(Freelist * fl)
     Freenode * t ;
     if (fl->head == (Freenode *)NULL)
         {
-        t =  (Freenode *) myalloc(sqrt_nsites * fl->nodesize) ;
-        for(i = 0 ; i < sqrt_nsites ; i++)
+        t =  (Freenode *) myalloc(100 * fl->nodesize) ;
+        for(i = 0 ; i < 100 ; i++)
             {
             makefree((Freenode *)((char *)t+i*fl->nodesize), fl) ;
             }