Website updates to release version 2.1.0

Added v2.0.0 information.
Update documentation
2026-02-14 16:39:57 +00:00 · 2012-03-06 17:16:46 -05:00 · 2012-03-05 10:21:49 -05:00 · 2012-03-05 09:50:55 -05:00 · 2012-02-12 19:18:29 +00:00 · 2012-02-12 19:17:46 +00:00
14 changed files with 433 additions and 151 deletions
--- a/doc/developers-guide.content
+++ b/doc/developers-guide.content
@@ -28,7 +28,7 @@ mailing list message</a>.</p>
 </tr>
 <tr>
  <td><a href="http://qt.nokia.com/downloads">Qt</a></td>
-  <td>4.5.0 or later</td>
+  <td>4.6.0 or later</td>
  <td>qt4-mac</td>
  <td>libqt4-dev</td>
 </tr>
--- a/doc/download.content
+++ b/doc/download.content
@@ -17,24 +17,32 @@ before downloading.
 <p>
 On Linux and Mac OS X, Golden Cheetah also downloads from the SRM PCV.  On Mac
 OS X, you'll need to install <a href="http://osx-pl2303.sourceforge.net/">the
-open source PL2303 driver</a> to download from an SRM.
+open source PL2303 driver</a> to download from an SRM. Please see the
+<a href="http://bugs.goldencheetah.org/projects/goldencheetah/wiki/">WIKI</a> article
+ - <a href="http://bugs.goldencheetah.org/projects/goldencheetah/wiki/PCV_on_Mac_OS_X">
+PCV on Mac OS X</a> for further information.
 </p>

 <p>
 <font face="arial,helvetica,sanserif">
-<big><strong>Download Release 2.0</strong></big>
+<big><strong>Download Release 2.1</strong></big>
 </font>
+</p>

 <ul>
-<li><a href="GoldenCheetah_2.0.0_Linux_x86.gz">Linux x86</a><br>
-<li><a href="GoldenCheetah_2.0.0_Linux_x86_64.gz">Linux x86_64</a><br>
-<li><a href="GoldenCheetah_2.0.0_Mac_Universal.dmg">Mac OS X Universal 10.5 & 10.6</a><br>
-<li><a href="GoldenCheetah_2.0.0_Mac_PPC.dmg">Mac OS X 10.4</a><br>
-<li><a href="GoldenCheetah_2.0.0_Windows_Installer.exe">Windows 32-bit</a>
+<li><a href="GoldenCheetah_2.1.0_Windows_Installer.exe">Windows 32-bit (runs on 64bit as well)</a>
+<li><a href="GoldenCheetah_2.1.0_Mac_Universal.dmg">Mac OS X Universal 10.4->10.7</a><br>
+<li><a href="GoldenCheetah_2.1.0_Linux_x86.tgz">Linux x86</a><br>
+<li><a href="GoldenCheetah_2.1.0_Linux_x86_64.tgz">Linux x86_64</a><br>
 </ul>
+</p>

 <p>
-You can also <a href="release-notes.html">view the release notes</a> for 2.0
+Please follow the <a href="/users-guid.html">User's Guide</a> on how to install
+and use Golden Cheetah.
+</p>
+<p>
+You can also <a href="release-notes.html">view the release notes</a> for 2.1
 or <a href="older-releases.html">download older releases</a> of Golden Cheetah.
 </p>

@@ -42,21 +50,23 @@ or <a href="older-releases.html">download older releases</a> of Golden Cheetah.
 <font face="arial,helvetica,sanserif">
 <big><strong>Development Releases</strong></big>
 </font>
+</p>

 <p>Gareth Coco has also made
-<a href="http://goldencheetah.stand2surf.net/">nightly development builds</a>
-available.  These binaries are based on the latest code, so they have more
-features and (sometimes) more bugs than the stable 2.0 release above.
+<a href="http://goldencheetah.stand2surf.net/">regular development builds</a>
+available.  These binaries are based on the latest source code, so they may have
+more features and less (but sometime more) bugs than the stable release above.
+</p>

 <p>
 <font face="arial,helvetica,sanserif">
 <big><strong>Source Code</strong></big>
 </font>
+</p>

 <p>
 The Golden Cheetah source code is available via git.  See the
 <a href="developers-guide.html">Developer's Guide</a> for more information.
 You can also <a href="http://github.com/srhea/GoldenCheetah/tree/master/">browse
 the source on github</a>.
-
-
+</p>
--- a/doc/older-releases.content
+++ b/doc/older-releases.content
@@ -18,6 +18,92 @@ please see <a href="download.html">the download page</a> instead.
 <td><i>Description</i></td>
 </tr>

+<tr>
+<td valign="top">2.0.0</td>
+<td valign="top">
+<a href="GoldenCheetah_2.0.0_Linux_x86.gz">Linux x86</a><br>
+<a href="GoldenCheetah_2.0.0_Linux_x86_64.gz">Linux x86_64</a><br>
+<a href="GoldenCheetah_2.0.0_Mac_Universal.zip">Mac OS X Universal</a><br>
+<a href="GoldenCheetah_2.0.0_Windows_Installer.exe">Windows 32-bit</a>
+</td>
+<td valign="top">
+<p>
+New Features
+  <ul>
+  <li>Aerolab (Andy Froncioni)</li>
+  <li>View ride in Google Maps (Greg Lonnon)</li>
+  <li>Long Term Metrics (Mark Liversedge)</li>
+  <li>User configurable ride metadata (Mark Liversedge)</li>
+  <li>Ride editor and tools (Mark Liversedge)</li>
+  <li>HR Zones and TRIMP Metrics (Damien Grauser)</li>
+  <li>Twitter support (Justin Knotzke)</li>
+  </ul>
+</p>
+
+<p>
+Internationalisation
+  <ul>
+  <li>Updates to French translation (Damien Grauser)</li>
+  <li>Japanese translation (Mitsukuni Sato)</li>
+  </ul>
+</p>
+
+<p>
+New Logo and Icons
+  <ul>
+  <li>Golden Cheetah Logo(Dan Schmalz)</li>
+  </ul>
+</p>
+
+<p>
+Enhanced Ride Plot
+  <ul>
+  <li>Ride plot stacked view (Damien Grauser)</li>
+  <li>Scrolling Ride Plot (Mark Liversedge)</li>
+  </ul>
+</p>
+
+<p>
+New Devices and File Formats Supported
+  <ul>
+  <li>Support for Joule BIN File Format (Damien Grauser)</li>
+  <li>Tacx CAF Ride File Format Support (Ilja Booij)</li>
+  <li>Garmin FIT ride file support (Sean Rhea)</li>
+  <li>Export to Google Earth 5.2 KML (Mark Liversedge)</li>
+  <li>Training Peaks PWX ride file support (Mark Liversedge)</li>
+  <li>Polar SRD ride file support (Mark Liversedge)</li>
+  <li>Racermate CompCS/Ergvideo .TXT ride file support (Mark Liversedge)</li>
+  </ul>
+<p>
+
+<p>
+Numerous enhancements and bug fixes from
+  <ul>
+  <li>Julian Baumgartner</li>
+  <li>Robert Carlsen</li>
+  <li>Rainer Clasen</li>
+  <li>Gareth Coco</li>
+  <li>Dag Gruneau</li>
+  <li>Jamie Kimberley</li>
+  <li>Jim Ley</li>
+  <li>Patrick J. McNerthney</li>
+  <li>Austin Roach</li>
+  <li>Ken Sallot</li>
+  <li>Thomas Weichmann</li>
+  </ul>
+</p>
+
+<p>
+Builds, testing and support
+  <ul>
+  <li>Robert Carlsen</li>
+  <li>Gareth Coco</li>
+  <li>Jamie Kimberley</li>
+  <li>Justin Knotzke</li>
+  </ul>
+</p>
+</td>
+</tr>
 <tr>
 <td valign="top">1.3.0</td>
 <td valign="top">
--- a/doc/release-notes.content
+++ b/doc/release-notes.content
@@ -1,81 +1,259 @@
 <p>
 <font face="arial,helvetica,sanserif">
-<big><strong>GoldenCheetah 2.0</strong></big>
+<big><strong>GoldenCheetah 2.1</strong></big>
 </font>
 </p>

 <p>
-New Features
+New Features and Enhancements
  <ul>
-  <li>Aerolab (Andy Froncioni)</li>
-  <li>View ride in Google Maps (Greg Lonnon)</li>
-  <li>Long Term Metrics (Mark Liversedge)</li>
-  <li>User configurable ride metadata (Mark Liversedge)</li>
-  <li>Ride editor and tools (Mark Liversedge)</li>
-  <li>HR Zones and TRIMP Metrics (Damien Grauser)</li>
-  <li>Twitter support (Justin Knotzke)</li>
+  <li>FIT file support for Mac OSX - Rainer Clasen</li>
+  <li>SRM 5 - Rainer Clasen</li>
+  <li>Aerolab Improvements - Damien Grauser</li>
+  <li>O-Sync Macro X device support - Damien Grauser</li>
+  <li>Air density (RHO) Calculator - Steven Gribble</li>
+  <li>Virtual Power - Darren Hague</li>
+  <li>GoldenCheetah JSON - Mark Liversedge</li>
+  <li>Support TrainerRoad.com TCX Files - Mark Liversedge</li>
+  <li>Garmin GPX - Greg Lonnon</li>
+  <li>Sigma SLF/SMF - Frank Zschockelt</li>
  </ul>
 </p>

 <p>
 Internationalisation
  <ul>
-  <li>Updates to French translation (Damien Grauser)</li>
-  <li>Japanese translation (Mitsukuni Sato)</li>
+  <li>Czech (David Kramar)</li>
+  <li>French (Damien Grauser, Guillaume LeMaitre)</li>
+  <li>German (Alexander Pietsch)</li>
+  <li>Italian (Robert Masso)</li>
+  <li>Portugese (Thomas Irps)</li>
+  <li>Portugese-Brazil (Bruno Assis)</li>
+  <li>Japanese (Mitsukuni Sato, Keisuke Yamaguchi)</li>
+  <li>Spanish (Alejandro Martinez)</li>
  </ul>
 </p>

 <p>
-New Logo and Icons
+Development Builds
  <ul>
-  <li>Golden Cheetah Logo(Dan Schmalz)</li>
-  </ul>
-</p>
-
-<p>
-Enhanced Ride Plot
-  <ul>
-  <li>Ride plot stacked view (Damien Grauser)</li>
-  <li>Scrolling Ride Plot (Mark Liversedge)</li>
-  </ul>
-</p>
-
-<p>
-New Devices and File Formats Supported
-  <ul>
-  <li>Support for Joule BIN File Format (Damien Grauser)</li>
-  <li>Tacx CAF Ride File Format Support (Ilja Booij)</li>
-  <li>Garmin FIT ride file support (Sean Rhea)</li>
-  <li>Export to Google Earth 5.2 KML (Mark Liversedge)</li>
-  <li>Training Peaks PWX ride file support (Mark Liversedge)</li>
-  <li>Polar SRD ride file support (Mark Liversedge)</li>
-  <li>Racermate CompCS/Ergvideo .TXT ride file support (Mark Liversedge)</li>
-  </ul>
-<p>
-
-<p>
-Numerous enhancements and bug fixes from
-  <ul>
-  <li>Julian Baumgartner</li>
-  <li>Robert Carlsen</li>
-  <li>Rainer Clasen</li>
-  <li>Gareth Coco</li>
-  <li>Dag Gruneau</li>
-  <li>Jamie Kimberley</li>
-  <li>Jim Ley</li>
-  <li>Patrick J. McNerthney</li>
-  <li>Austin Roach</li>
-  <li>Ken Sallot</li>
-  <li>Thomas Weichmann</li>
-  </ul>
-</p>
-
-<p>
-Builds, testing and support
-  <ul>
-  <li>Robert Carlsen</li>
  <li>Gareth Coco</li>
  <li>Jamie Kimberley</li>
-  <li>Justin Knotzke</li>
  </ul>
 </p>
+
+<p>
+Full Change Log
+<pre>
+Alejandro Martinez (7):
+      Add Spanish Translation and Enable Metrics Translation
+      Add Spanish Translation & Fix Translation Issues
+      Set UTF-8 in charts,metadata and seasons xml files
+      Add HrZones to Weekly Summary and Fix Spanish Translation
+      Update Spanish Translation
+      Enable 3d Plot Translation and include spanish translation
+      Rho Estimator Translation
+
+Bruno Assis (1):
+      Portugese (Brazil) Translation
+
+Damien (22):
+      Modify csv import for ergomo file with comma or semicolon separator
+      Remove error logs for unused datas in ride file
+      handle showHr/Speed/Cad/Alt state for stacked view
+      Add summary metrics list to preferences
+      Correct crash with truncated files
+      Add PeakPowerHr metric (average HR during peak power)
+      Altitude scale present with no altitude data.
+      Bug #178 TRIMP is not updated after modification in Rest Hr Tag -> compute metric after save
+      Add a setFocus on the Treelist to correct a MacOs Bug of Qt
+      Modification to handle odd start page and compatible with qt 4.6
+      Correct interval
+      Modify TRIMP formula to use time_riding instead of workout time
+      Modify Aerolab to add interval highlight and zoom + auto offset
+      Aerolab : Change LCD display to LineEdit
+      Correct bug in the peakPowerHr formula
+      Correct encoding in json parser
+      Correct bug #496 for longitude < -65
+      Remove Joule warnings
+      Update french translation for rho estimator
+      Change speed to double in Bin parser
+      Correct intialisation of altitude for TCX without altitude
+      Correct intialisation of altitude for TCX without altitude
+
+Damien Grauser (2):
+      Update French translation.
+      O_Sync Macro X device support
+
+Darren Hague (5):
+      Virtual Power; Better GSC-10 pairing support.
+      Corrected - to + in CycleOps formula
+      Use realtime clock for realtime-mode clock
+      Add virtual power support for BT-ATS trainer
+      Remove toMSecsSinceEpoch() and work around
+
+David (1):
+      Updated Czech translations
+
+Eric Brandt (1):
+      fix realtime mode load timer and lcd sig. digit display issues
+
+Frank Zschockelt (2):
+      Support for Sigma SLF/SMF file formats
+      Included 4 sample sigma files in the test/rides directory
+
+Gareth Coco (25):
+      Changes to map markers
+      FIT file reader fixes
+      Set default Smoothing (secs) in Ride Plot to one (1) second
+      Change start date from UTC to localtime for bin ride file
+      Make interval period on map user defineable
+      Reorder liboauth includes
+      Comment out QwtDesigner build in qwtconfig.pri.in
+      Changed kph to km/h in displays
+      Changed KPH to km/h in displays
+      Update translation .qm files
+      Update gc_fr.qm for updated French translation
+      Fixes for RealtimeController
+      Initialise LAT/LON to zero (0.0) in the parser
+      Updated Spanish Translation
+      Add a Portuguese translation
+      Add a TCX ride exporter
+      Fix interpolation of lat/lon when missing or 0/0
+      Allow CdA to lowest possible in AerolabWindow.cpp
+      Update translation files
+      Ordered build - qwt then src
+      Fixes for Manual Ride Entry
+      Comment added and replace tabs with spaces
+      v2.1dev - Allow ride to be added with no Average HR
+      Update documentation
+      Added v2.0.0 information.
+
+Greg Lonnon (3):
+      GPX RideFile Support
+      changes to the markers in google maps.
+      Added a QFilesystemWatcher to monitor adding files to the workout directory.
+
+Ilja Booij (1):
+      fix 'Wrong distance on Tacx caf file import'
+
+Jamie Kimberley (6):
+      Update download page to reflect build of mac 10.4
+      force use of no elide and scrollbars in main tab
+      Update user guide steps 1 and 2
+      clean up wishlist web page
+      Add other TRIMP metrics to performance manager.
+      update French Translation
+
+Justin Knotzke (2):
+      Cycleops Test Ride
+      Update of German translation by LukeNRG
+
+Keisuke Yamaguchi (1):
+      Update Japanese translation files
+
+LukeNRG (4):
+      German Translation
+      Updated German Translation
+      Updated German Translations
+      German Translations
+
+Mark Liversedge (59):
+      Updated www.goldencheetah.org for v2.0 release.
+      Joule support fixed on download page.
+      Add link to wiki from the website.
+      Mac PPC binary added to downloads page.
+      Merge branch 'master' of github.com:/srhea/GoldenCheetah
+      Translations Bonanza!
+      Fix Computrainer with Stereo FTDI adaptor
+      Fix 'Save data' in RealtimeWindow
+      Updated Czech translation
+      Fix Wko GPS parsing on 64bit
+      Fix Virtual Power for Fluid2
+      Revert "Add Spanish Translation and Enable Metrics Translation"
+      Fix WKO parser for Ergomo users
+      Better rounding of time in AllPlot
+      Fix WKO+ file reader GPS 'drops'
+      Remove console error for seasons.xml
+      Fix RideSummaryWindow crash
+      Fix RideEditor find dialog for 'between'
+      Fix .man crash in CP plot
+      Better support for Negative, Inf, NaN and High Values
+      Fix annoying gap in CP curve.
+      Fix Save when old .bak exists
+      Fix SummaryWindow crash
+      Merge branch 'master' of github.com:/srhea/GoldenCheetah
+      Don't allow Nan or Inf sample values
+      Fix LogY Intervals on Histogram
+      Fit files sometimes go backwards
+      Guess ride date time for Poweragent CSV files
+      Add JSON support to v2.1
+      Merge branch 'master' of github.com:/srhea/GoldenCheetah
+      Fix date/time handling when importing rides
+      Update .gitignore for Lex/yacc
+      Fix Macro device data crash
+      Support FR310xt latest firmware
+      Fix FitRideFile for header change
+      Fix Download Ride Dialog instructions refresh
+      Merge branch 'master' of github.com:/srhea/GoldenCheetah
+      SplitRide overwrites existing file
+      Revert "SplitRide overwrites existing file"
+      Fix Split Ride file loss bug
+      Merge branch 'master' of github.com:/srhea/GoldenCheetah
+      Check Date/Time unique
+      Summary fixups
+      Updated translation files.
+      Add virtual power for LeMond Revolution
+      Use strtod() to convert text to double
+      Fix FTDI Adaptor on Linux and Mac
+      Merge branch 'master' of github.com:/srhea/GoldenCheetah
+      Better Bounds Checking in RideFile::intervalBegin()
+      Forward support in .json for temp/slope
+      Add Virtual Power for 1UP USA bike trainer
+      FitRideFile distance of zero bug
+      Disable roch text in metadata
+      Fix zero speed in TxtRideFile for Imperial units
+      Support TrainerRoad.com TCX Files/Tcx speed in meters/sec The TCX parser ignored samples where distance is
+      Fix crash if TRIMP zones > 5
+      Fix PWX file intervals
+      Fix SEGV on empty/dodgy FIT files
+      Merge branch 'master' of github.com:/srhea/GoldenCheetah
+
+Mitsukuni Sato (1):
+      Japanese Translation
+
+Rainer Clasen (8):
+      Added SRM5 file format read support
+      whitespace cleanup
+      fix reading signed values from srm files
+      Fit: ignore unknown message types
+      Fit: support big/little endian data
+      Fit: handle unknown fields gracefully
+      SrmRideFile: turned assertions into graceful fail
+      FitRideFile: turned assertions into graceful fail
+
+Roberto Massa (1):
+      Italian Translation
+
+Roderic Campbell (1):
+      There was what looked like a copy paste error. I changed the zone 7 label to the appropriate 7 instead of
+
+Steven Gribble (1):
+      This patch adds an air density (rho) calculator feature to GoldenCheetah.
+
+Thomas Irps (1):
+      Portuguese translation
+
+Tim Shaffer (1):
+      Make the default date range for Performance Manager a user preference.
+
+kohasa (1):
+      enabled editing interval duration by keyboard.
+
+lemaitre (1):
+      Updating of the French translation
+
+unknown (1):
+      This patch correct altitude for TCX files converted from FIT files These files doesn't have altitude for e
+</pre>
+</p>
--- a/doc/users-guide.content
+++ b/doc/users-guide.content
@@ -62,22 +62,30 @@ and download the version for your operating system and processor.
 On Mac OS X, when the download finishes, Mac OS X should automatically open
 the <code>.dmg</code> file for you.  If not, double-click to open it.  Drag
 the GoldenCheetah icon into your Applications folder, and you're done.
+</p>

 <p>
-The Linux version of GoldenCheetah is distributed as a GZipped archive.
+The Windows version has an installer. Just run the Installer, select where
+to install the application and away you go.
+</p>
+
+<p>
+The Linux version of GoldenCheetah is distributed as a GZipped tar archive.
 Download this file and save it to <code>/tmp</code>, then from a terminal:

 <pre>
 cd /tmp
-gunzip -vf GoldenCheetah_X.X.X_Linux_x86.gz
-cd GoldenCheetah_X.X.X_Linux_x86
+tar xvzf GoldenCheetah_X.X.X_Linux_ARCH.tgz
+cd GoldenCheetah_X.X.X_Linux_ARCH
+sudo chmod u+x GoldenCheetah
 sudo cp GoldenCheetah /usr/local/bin
 cd ..
-rm -rf GoldenCheetah_X.X.X_Linux_x86.gz
+rm -rf GoldenCheetah_X.X.X_Linux_ARCH
 </pre>

 Be sure to replace "X.X.X" with the version of the release you downloaded,
-such as "2.0.0".
+such as "2.1.0" and replace "ARCH" with the architecture of the release
+you download - either "x86" (32bit) or "x84_64" (64bit).

 <p>
 <big><font face="arial,helvetica,sanserif">
@@ -86,7 +94,9 @@ Step 3: Running GoldenCheetah

 <p>
 To run GoldenCheetah on Mac OS X, double-click on the GoldenCheetah icon in
-your Applications folder.  On Linux, just type "GoldenCheetah" at the prompt.
+your Applications folder. On Windows, click the Start button, All Programs
+link, GoldenCheetah folder and then the Golden Cheetah program. On Linux,
+just type "GoldenCheetah" at the prompt.

 <p>
 The first time you run GoldenCheetah, you'll get an empty "Choose a Cyclist"
--- a/src/BinRideFile.cpp
+++ b/src/BinRideFile.cpp
@@ -425,9 +425,9 @@ struct BinFileReaderState
                        nm = value;
                        break;
                    case FORMAT_ID__SPEED :
-                        value = value*3.6/100.0;
-                        if (value < 145) // Limit for data error
-                            kph = value;
+                        kph = value*3.6/100.0;
+                        if (kph > 145) // Limit for data error
+                            kph = 0;
                        break;
                    case FORMAT_ID__CADENCE :
                        if (value < 255) // Limit for data error
--- a/src/FitRideFile.cpp
+++ b/src/FitRideFile.cpp
@@ -289,6 +289,8 @@ struct FitFileReaderState
        time_t time = 0;
        if (time_offset > 0)
            time = last_time + time_offset;
+        else
+            time = last_time;
        int i = 0;
        time_t this_start_time = 0;
        ++interval;
@@ -304,11 +306,11 @@ struct FitFileReaderState
                default: ; // ignore it
            }
        }
-        if (this_start_time == 0)
-            errors << QString("lap %1 has no start time").arg(interval);
+        if (this_start_time == 0 || this_start_time-start_time < 0)
+            errors << QString("lap %1 has invalid start time").arg(interval);
        else {
-            rideFile->addInterval(this_start_time - start_time, time - start_time,
-                                  QString("%1").arg(interval));
+            if (rideFile->dataPoints().count()) // no samples means no laps..
+                rideFile->addInterval(this_start_time - start_time, time - start_time, QString("%1").arg(interval));
        }
    }

--- a/src/ManualRideDialog.cpp
+++ b/src/ManualRideDialog.cpp
@@ -56,7 +56,6 @@ ManualRideDialog::ManualRideDialog(MainWindow *mainWindow,
    QIntValidator * hoursValidator = new QIntValidator(0,99,this);
    //hrsentry->setInputMask("09");
    hrsentry->setValidator(hoursValidator);
-    hrsentry->setPlaceholderText("00");
    hrsentry->setMaxLength(2);
    hrsentry->setAlignment(Qt::AlignCenter);
    manualLengthLayout->addWidget(hrslbl);
@@ -68,7 +67,6 @@ ManualRideDialog::ManualRideDialog(MainWindow *mainWindow,
    QIntValidator * mins_secsValidator = new QIntValidator(0,59,this);
    //minsentry->setInputMask("00");
    minsentry->setValidator(mins_secsValidator);
-    minsentry->setPlaceholderText("00");
    minsentry->setMaxLength(2);
    minsentry->setAlignment(Qt::AlignCenter);
    manualLengthLayout->addWidget(minslbl);
@@ -79,7 +77,6 @@ ManualRideDialog::ManualRideDialog(MainWindow *mainWindow,
    secsentry = new QLineEdit(this);
    //secsentry->setInputMask("00");
    secsentry->setValidator(mins_secsValidator);
-    secsentry->setPlaceholderText("00");
    secsentry->setMaxLength(2);
    secsentry->setAlignment(Qt::AlignCenter);
    manualLengthLayout->addWidget(secslbl);
@@ -101,7 +98,6 @@ ManualRideDialog::ManualRideDialog(MainWindow *mainWindow,
    //distanceentry->setInputMask("009.00");
    distanceentry->setValidator(distanceValidator);
    distanceentry->setMaxLength(6);
-    distanceentry->setPlaceholderText("0");
    distanceentry->setAlignment(Qt::AlignCenter);

    QLabel *manualDistanceHint = new QLabel(tr("(0-9999) "), this);
@@ -117,7 +113,6 @@ ManualRideDialog::ManualRideDialog(MainWindow *mainWindow,
    HRentry = new QLineEdit(this);
    //HRentry->setInputMask("099");
    HRentry->setValidator(hrValidator);
-    HRentry->setPlaceholderText("0");
    HRentry->setAlignment(Qt::AlignCenter);

    QLabel *manualHRHint = new QLabel(tr("(30-199) "), this);
@@ -154,7 +149,6 @@ ManualRideDialog::ManualRideDialog(MainWindow *mainWindow,
    BSentry = new QLineEdit(this);
    BSentry->setValidator(bsValidator);
    BSentry->setMaxLength(6);
-    BSentry->setPlaceholderText("0");
    BSentry->setAlignment(Qt::AlignCenter);
    BSentry->clear();

@@ -169,7 +163,6 @@ ManualRideDialog::ManualRideDialog(MainWindow *mainWindow,
    DPentry = new QLineEdit(this);
    DPentry->setValidator(dpValidator);
    DPentry->setMaxLength(6);
-    DPentry->setPlaceholderText("0");
    DPentry->setAlignment(Qt::AlignCenter);
    DPentry->clear();
    QLabel *manualDPHint = new QLabel(tr("(0-9999) "), this);
@@ -305,15 +298,15 @@ ManualRideDialog::enterClicked()
 {

  if (!( ( BSentry->text().isEmpty() || BSentry->hasAcceptableInput() ) &&
-		 ( DPentry->text().isEmpty() || DPentry->hasAcceptableInput() ) &&
-                 ( HRentry->hasAcceptableInput() ) &&
-		 ( distanceentry->text().isEmpty() || distanceentry->hasAcceptableInput() ) ) ) {
+     ( DPentry->text().isEmpty() || DPentry->hasAcceptableInput() ) &&
+     ( HRentry->text().isEmpty() || HRentry->hasAcceptableInput() ) &&
+     ( distanceentry->text().isEmpty() || distanceentry->hasAcceptableInput() ) ) ) {
        QMessageBox::warning( this,
            tr("Values out of range"),
            tr("The values you've entered in:\n ")
            +((!distanceentry->hasAcceptableInput() && !distanceentry->text().isEmpty() )
                ? "  Distance (max 9999)\n " : "")
-            +((!HRentry->hasAcceptableInput()) 
+            +((!HRentry->hasAcceptableInput() && !HRentry->text().isEmpty() )
                ? " Average HR (30-199 bpm)\n " : "")
            +((!BSentry->hasAcceptableInput() && !BSentry->text().isEmpty() )
                ? "  BikeScore (max 9999)\n " : "")
--- a/src/PwxRideFile.cpp
+++ b/src/PwxRideFile.cpp
@@ -161,7 +161,7 @@ PwxFileReader::PwxFromDomDoc(QDomDocument doc, QStringList &errors) const
                // duration - convert to end
                QDomElement duration = summary.firstChildElement("duration");
                if (!duration.isNull() && add.start != -1)
-                    add.stop = beginning.text().toDouble() + add.start;
+                    add.stop = duration.text().toDouble() + add.start;
                else
                    add.stop = -1;

--- a/src/TcxParser.cpp
+++ b/src/TcxParser.cpp
@@ -34,6 +34,9 @@ TcxParser::TcxParser (RideFile* rideFile) : rideFile(rideFile)
  if (GarminHWM.isNull() || GarminHWM.toInt() == 0)
      GarminHWM.setValue(25); // default to 25 seconds.

+  // First initialisation for altitude (not initialised for each point)
+  alt= 0;
+
 }

 bool
@@ -71,7 +74,7 @@ TcxParser::startElement( const QString&, const QString&,
        lat = 0.0;
        lon = 0.0;
        badgps = false;
-        //alt = 0.0; // TCS from FIT files have not alt point for each trackpoint
+        //alt = 0.0; // TCX from FIT files have not alt point for each trackpoint
        distance = -1;  // nh - we set this to -1 so we can detect if there was a distance in the trackpoint.
        secs = 0;
    }
--- a/src/test/rides/2012_01_11_11_51_01.fit
+++ b/src/test/rides/2012_01_11_11_51_01.fit
--- a/src/test/rides/2012_02_05_09_03_59.fit
+++ b/src/test/rides/2012_02_05_09_03_59.fit
--- a/src/translations/gc_de.qm
+++ b/src/translations/gc_de.qm
--- a/src/translations/gc_de.ts
+++ b/src/translations/gc_de.ts
@@ -179,7 +179,7 @@
    <message>
        <location filename="../AllPlotWindow.cpp" line="60"/>
        <source>Stacked view</source>
-        <translation>Stapelansicht</translation>
+        <translation>Gesplittete Ansicht</translation>
    </message>
    <message>
        <location filename="../AllPlotWindow.cpp" line="90"/>
@@ -209,12 +209,12 @@
    <message>
        <location filename="../AllPlotWindow.cpp" line="111"/>
        <source>Power + shade</source>
-        <translation>Leistung: Schattierung erhöhen </translation>
+        <translation>Leistungszonen einblenden</translation>
    </message>
    <message>
        <location filename="../AllPlotWindow.cpp" line="112"/>
        <source>Power - shade</source>
-        <translation>Leistung: Schattierung verringern</translation>
+        <translation>Leistungszonen ausblenden</translation>
    </message>
    <message>
        <location filename="../AllPlotWindow.cpp" line="113"/>
@@ -250,7 +250,7 @@
    <message>
        <location filename="../BasicRideMetrics.cpp" line="367"/>
        <source>Average Cadence</source>
-        <translation>Durchschnittliche Trittfrequenz</translation>
+        <translation>∅ Trittfrequenz</translation>
    </message>
    <message>
        <location filename="../BasicRideMetrics.cpp" line="368"/>
@@ -264,7 +264,7 @@
    <message>
        <location filename="../BasicRideMetrics.cpp" line="327"/>
        <source>Average Heart Rate</source>
-        <translation>Durchschnittliche Herzfrequenz</translation>
+        <translation>∅ Herzfrequenz</translation>
    </message>
    <message>
        <location filename="../BasicRideMetrics.cpp" line="328"/>
@@ -278,7 +278,7 @@
    <message>
        <location filename="../BasicRideMetrics.cpp" line="287"/>
        <source>Average Power</source>
-        <translation>ø Leistung</translation>
+        <translation>∅ Leistung</translation>
    </message>
    <message>
        <location filename="../BasicRideMetrics.cpp" line="288"/>
@@ -292,7 +292,7 @@
    <message>
        <location filename="../BasicRideMetrics.cpp" line="238"/>
        <source>Average Speed</source>
-        <translation>ø Geschwindigkeit</translation>
+        <translation>∅ Geschwindigkeit</translation>
    </message>
    <message>
        <location filename="../BasicRideMetrics.cpp" line="239"/>
@@ -684,7 +684,7 @@
    <message>
        <location filename="../Pages.cpp" line="46"/>
        <source>Portugese</source>
-        <translation type="unfinished"></translation>
+        <translation>portugisisch</translation>
    </message>
    <message>
        <location filename="../Pages.cpp" line="74"/>
@@ -1247,7 +1247,7 @@ und dann auf&quot;Download&quot; klicken.</translation>
        <source>

 You may need to (re)install the FTDI or PL2303 drivers before downloading.</source>
-        <translation>Eventuell müssen sie (erneut) das FIDI oder PL2302 Treiberpaket installieren um fortfahren zu können.</translation>
+        <translation> Eventuell müssen sie (erneut) das FIDI oder PL2302 Treiberpaket installieren um fortfahren zu können.</translation>
    </message>
    <message>
        <location filename="../DownloadRideDialog.cpp" line="112"/>
@@ -1277,7 +1277,7 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
    <message>
        <location filename="../DownloadRideDialog.cpp" line="179"/>
        <source>This ride appears to have already </source>
-        <translation>Diese Trainingseinheit scheint schon</translation>
+        <translation>Diese Trainingseinheit scheint schon </translation>
    </message>
    <message>
        <location filename="../DownloadRideDialog.cpp" line="180"/>
@@ -1303,12 +1303,12 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
    <message>
        <location filename="../DownloadRideDialog.cpp" line="195"/>
        <source>Failed to remove existing file </source>
-        <translation>Die exisierende Datei konnte nicht überschrieben werden</translation>
+        <translation>Die exisierende Datei konnte nicht überschrieben werden </translation>
    </message>
    <message>
        <location filename="../DownloadRideDialog.cpp" line="206"/>
        <source>Failed to rename </source>
-        <translation>Umbenennen fehlgeschlagen</translation>
+        <translation>Umbenennen fehlgeschlagen </translation>
    </message>
    <message>
        <location filename="../DownloadRideDialog.cpp" line="206"/>
@@ -2835,7 +2835,7 @@ Drehmomentkorrektur - Dies definiert einen Linearfaktor in Nm (oder Pfund pro Qu
        <location filename="../Pages.cpp" line="2392"/>
        <location filename="../Pages.cpp" line="2416"/>
        <source>Rest HR</source>
-        <translation>Ruheherzfrequenz</translation>
+        <translation>Ruhepuls</translation>
    </message>
    <message>
        <location filename="../Pages.cpp" line="2393"/>
@@ -2872,7 +2872,7 @@ Drehmomentkorrektur - Dies definiert einen Linearfaktor in Nm (oder Pfund pro Qu
 on and that its display says, &quot;PC Link&quot;</source>
        <translation>Stellen Sie bitte Sicher, dass der o-Synce
 Macro radcomputer angeschaltet ist und
-&quot;PC Link&quot; im Display anzeigt</translation>
+&quot;PC Link&quot; im Display anzeigt.</translation>
    </message>
 </context>
 <context>
@@ -3126,7 +3126,7 @@ Skipping file...</source>
    <message>
        <location filename="../MainWindow.cpp" line="399"/>
        <source>Export to TCX...</source>
-        <translation type="unfinished"></translation>
+        <translation>Als *.tcx exportieren</translation>
    </message>
    <message>
        <location filename="../MainWindow.cpp" line="402"/>
@@ -3151,7 +3151,7 @@ Skipping file...</source>
    <message>
        <location filename="../MainWindow.cpp" line="419"/>
        <source>Air Density (Rho) Estimator</source>
-        <translation type="unfinished"></translation>
+        <translation>Luftdichte (Rho) Kalkulator</translation>
    </message>
    <message>
        <location filename="../MainWindow.cpp" line="450"/>
@@ -3205,12 +3205,12 @@ Skipping file...</source>
    <message>
        <location filename="../MainWindow.cpp" line="733"/>
        <source>Export TCX</source>
-        <translation type="unfinished"></translation>
+        <translation>Als *.tcx Datei exportieren...</translation>
    </message>
    <message>
        <location filename="../MainWindow.cpp" line="733"/>
        <source>TCX (*.tcx)</source>
-        <translation type="unfinished"></translation>
+        <translation>TCX (*.tcx)</translation>
    </message>
    <message>
        <location filename="../MainWindow.cpp" line="753"/>
@@ -3508,7 +3508,7 @@ Fahrer CP wurde auf %3 Watt gesetzt.</translation>
    <message>
        <location filename="../ManualRideDialog.cpp" line="103"/>
        <source>Average HR: </source>
-        <translation>ø Herzfrequenz: </translation>
+        <translation>∅ Herzfrequenz: </translation>
    </message>
    <message>
        <location filename="../ManualRideDialog.cpp" line="109"/>
@@ -4549,12 +4549,12 @@ Möchten Sie fortfahren?</translation>
    <message>
        <location filename="../PerformanceManagerWindow.cpp" line="55"/>
        <source>Use TRIMP 100</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwende TRIMP 100</translation>
    </message>
    <message>
        <location filename="../PerformanceManagerWindow.cpp" line="56"/>
        <source>Use Trimp Zonal</source>
-        <translation type="unfinished"></translation>
+        <translation>Verwende Zonenbasierten TRIMP</translation>
    </message>
    <message>
        <location filename="../PerformanceManagerWindow.cpp" line="78"/>
@@ -4775,23 +4775,23 @@ angeschaltet ist und im Display &quot;Host&quot; anzeigt.</translation>
    <message>
        <location filename="../RealtimeWindow.cpp" line="176"/>
        <source>WATTS</source>
-        <translation>Watt</translation>
+        <translation>Leistung (W)</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="178"/>
        <source>BPM</source>
-        <translation>spm</translation>
+        <translation>Herzfrequenz (spm)</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="52"/>
        <location filename="../RealtimeWindow.cpp" line="180"/>
        <source>km/h</source>
-        <translation>km/h</translation>
+        <translation>Geschwindigkeit (km/h)</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="182"/>
        <source>RPM</source>
-        <translation>rpm</translation>
+        <translation>Trittfrequenz (upm)</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="184"/>
@@ -4814,18 +4814,18 @@ angeschaltet ist und im Display &quot;Host&quot; anzeigt.</translation>
    <message>
        <location filename="../RealtimeWindow.cpp" line="191"/>
        <source>Avg WATTS</source>
-        <translation>Leistung Ø</translation>
+        <translation>Ø Leistung</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="193"/>
        <source>Avg BPM</source>
-        <translation>Herzfrequenz Ø</translation>
+        <translation>Ø Herzfrequenz</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="53"/>
        <location filename="../RealtimeWindow.cpp" line="195"/>
        <source>Avg km/h</source>
-        <translation>Geschwindigkeit Ø</translation>
+        <translation>Ø Geschwindigkeit</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="51"/>
@@ -4843,18 +4843,18 @@ angeschaltet ist und im Display &quot;Host&quot; anzeigt.</translation>
        <location filename="../RealtimeWindow.cpp" line="53"/>
        <location filename="../RealtimeWindow.cpp" line="195"/>
        <source>Avg MPH</source>
-        <translation>Geschwindigkeit Ø (mi/h)</translation>
+        <translation>Ø Geschwindigkeit (mi/h)</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="197"/>
        <source>Avg RPM</source>
-        <translation>Trittfrequenz Ø</translation>
+        <translation>Ø Trittfrequenz</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="199"/>
        <location filename="../RealtimeWindow.cpp" line="810"/>
        <source>Avg Load WATTS</source>
-        <translation>Belastung Ø (Watt)</translation>
+        <translation>Ø Belastung (Watt)</translation>
    </message>
    <message>
        <location filename="../RealtimeWindow.cpp" line="202"/>
@@ -4884,7 +4884,7 @@ angeschaltet ist und im Display &quot;Host&quot; anzeigt.</translation>
    <message>
        <location filename="../RealtimeWindow.cpp" line="817"/>
        <source>Avg Gradient PERCENT</source>
-        <translation>Durchschnittliche Steigung (%)</translation>
+        <translation>Ø Steigung (%)</translation>
    </message>
 </context>
 <context>
@@ -6012,7 +6012,7 @@ Möchten Sie fortfahren?</translation>
    <message>
        <location filename="../TRIMPPoints.cpp" line="124"/>
        <source>TRIMP(100) Points</source>
-        <translation>TRIMP(100) Punkte</translation>
+        <translation>TRIMP 100 Punkte</translation>
    </message>
 </context>
 <context>
@@ -6088,78 +6088,78 @@ Möchten Sie fortfahren?</translation>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="38"/>
        <source>Air Density (Rho) Estimator</source>
-        <translation type="unfinished"></translation>
+        <translation>Luftdichte (Rho) Kalkulator</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="46"/>
        <source>Enter measured values for the following:</source>
-        <translation type="unfinished"></translation>
+        <translation>Gebe Messwerte für folgende Werte ein:</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="52"/>
        <source>Metric</source>
-        <translation type="unfinished"></translation>
+        <translation>metrisch</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="55"/>
        <source>Imperial</source>
-        <translation type="unfinished">imperial</translation>
+        <translation>imperial</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="70"/>
        <location filename="../ToolsRhoEstimator.cpp" line="181"/>
        <source>Temperature (C):</source>
-        <translation type="unfinished"></translation>
+        <translation>Temperatur (°C):</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="74"/>
        <location filename="../ToolsRhoEstimator.cpp" line="171"/>
        <source>Temperature (F):</source>
-        <translation type="unfinished"></translation>
+        <translation>Temperatur (Fahrenheit):</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="91"/>
        <location filename="../ToolsRhoEstimator.cpp" line="184"/>
        <source>Air Pressure (hPa):</source>
-        <translation type="unfinished"></translation>
+        <translation>Luftdruck (hPa):</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="95"/>
        <location filename="../ToolsRhoEstimator.cpp" line="174"/>
        <source>Air Pressure (inHg):</source>
-        <translation type="unfinished"></translation>
+        <translation>Luftdruck (inHg):</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="112"/>
        <location filename="../ToolsRhoEstimator.cpp" line="186"/>
        <source>Dewpoint (C):</source>
-        <translation type="unfinished"></translation>
+        <translation>Taupunkt (°C)</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="116"/>
        <location filename="../ToolsRhoEstimator.cpp" line="176"/>
        <source>Dewpoint (F):</source>
-        <translation type="unfinished"></translation>
+        <translation>Taupunkt (Fahrenheit)</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="130"/>
        <source>Estimated air density (rho):</source>
-        <translation type="unfinished"></translation>
+        <translation>Geschätzte Luftdichte (Rho):</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="138"/>
        <source>(kg/m^3)</source>
-        <translation type="unfinished"></translation>
+        <translation>(kg/m^3)</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="147"/>
        <source>(lb/ft^3)</source>
-        <translation type="unfinished"></translation>
+        <translation>(lb/ft^3)</translation>
    </message>
    <message>
        <location filename="../ToolsRhoEstimator.cpp" line="154"/>
        <source>Done</source>
-        <translation type="unfinished">Fertig</translation>
+        <translation>Fertig</translation>
    </message>
 </context>
 <context>
@@ -6260,7 +6260,7 @@ Möchten Sie fortfahren?</translation>
    <message>
        <location filename="../TwitterDialog.cpp" line="42"/>
        <source>Average Power</source>
-        <translation>Durchschnittliche Leistung</translation>
+        <translation>∅ Leistung</translation>
    </message>
    <message>
        <location filename="../TwitterDialog.cpp" line="43"/>
@@ -6270,7 +6270,7 @@ Möchten Sie fortfahren?</translation>
    <message>
        <location filename="../TwitterDialog.cpp" line="44"/>
        <source>Average Cadence</source>
-        <translation>ø Trittfrequenz</translation>
+        <translation>Ø Trittfrequenz</translation>
    </message>
    <message>
        <location filename="../TwitterDialog.cpp" line="45"/>
@@ -6442,7 +6442,7 @@ Möchten Sie fortfahren?</translation>
    <message>
        <location filename="../ViewSelection.cpp" line="40"/>
        <source>Train and Racing View</source>
-        <translation>Echtzeitansicht</translation>
+        <translation>Echtzeitmodus</translation>
    </message>
 </context>
 <context>
@@ -6743,12 +6743,12 @@ Möchten Sie fortfahren?</translation>
    <message>
        <location filename="../Zones.cpp" line="579"/>
        <source>&lt;td align=&quot;center&quot;&gt;Low (watts)&lt;/td&gt;</source>
-        <translation>&lt;td align=&quot;center&quot;&gt;Untere (Watt)&lt;/td&gt;</translation>
+        <translation>&lt;td align=&quot;center&quot;&gt;Untere Grenze(W)&lt;/td&gt;</translation>
    </message>
    <message>
        <location filename="../Zones.cpp" line="580"/>
        <source>&lt;td align=&quot;center&quot;&gt;High (watts)&lt;/td&gt;</source>
-        <translation>&lt;td align=&quot;center&quot;&gt;Obere (Watt)&lt;/td&gt;</translation>
+        <translation>&lt;td align=&quot;center&quot;&gt;Obere Grenze( W)&lt;/td&gt;</translation>
    </message>
    <message>
        <location filename="../Zones.cpp" line="582"/>
Author	SHA1	Message	Date
Gareth Coco	c436ff4305	Website updates to release version 2.1.0	2012-03-06 17:16:46 -05:00
Gareth Coco	abb7ab9869	Added v2.0.0 information.	2012-03-05 10:21:49 -05:00
Gareth Coco	5d5054d64d	Update documentation	2012-03-05 09:50:55 -05:00
Mark Liversedge	d70cf5aae4	Merge branch 'master' of github.com:/srhea/GoldenCheetah	2012-02-12 19:18:29 +00:00
Damien	6e0f769b26	Correct intialisation of altitude for TCX without altitude modified: src/TcxParser.cpp	2012-02-12 19:17:46 +00:00
Damien	86fa671858	Correct intialisation of altitude for TCX without altitude modified: src/TcxParser.cpp	2012-02-12 09:51:54 -05:00
Damien	7fcc83f62c	Change speed to double in Bin parser Fixes #636.	2012-02-11 12:32:49 +00:00
LukeNRG	fff37e524c	German Translations	2012-02-05 10:47:22 -05:00
Mark Liversedge	ab03dd3637	Fix SEGV on empty/dodgy FIT files Fixes #633.	2012-02-05 10:31:59 -05:00
Mark Liversedge	1ad2228b84	Fix PWX file intervals Fixes #624.	2012-02-03 19:37:00 +00:00
Gareth Coco	57fbf65b23	v2.1dev - Allow ride to be added with no Average HR Removed setPlaceholderText("") as not in Qt4.6.x Replaced tabs with spaces Fixes #626	2012-02-02 11:02:12 -05:00