nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,804 Commits 16 Branches 99 Tags
4b588f71701cdf6e102cddedee6993cee3aa3d51
Commit Graph

6804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Liversedge
4b588f7170 CI Travis Disable GC_WANT_R for now 
.. c++11, 5.5.1, stdlib conflicts across dependencies
 2016-04-13 09:47:32 +01:00
Mark Liversedge
00c32f58e2 CI Travis OSX clang++ stdlib 
.. need to select which one to use with clang++ on QT5
 2016-04-13 09:10:49 +01:00
Mark Liversedge
4715b19aae CI Travis Build with GC_WANT_R 
.. build with R support baked in.
 2016-04-13 08:38:54 +01:00
Mark Liversedge
4dafe866de CI Travis Should Fix Shell Escape Hell 
.. shaking my head, escaped YAML for escaped Shell, for sed.
 2016-04-12 21:49:53 +01:00
Mark Liversedge
a02ac0fae5 CI Travis Sed syntax and escaped commands 
.. losing the will to live.
 2016-04-12 21:45:28 +01:00
Mark Liversedge
cac3d0657a CI Travis Shell Escape Again 2016-04-12 21:41:17 +01:00
Mark Liversedge
c467df815c CI Travis Shell Escape Hell 
.. something is broken in .yml markup (!?)
 2016-04-12 21:37:28 +01:00
Mark Liversedge
fdaa3ee0a6 CI Travis sed and shell escapes 2016-04-12 21:31:31 +01:00
Mark Liversedge
0315534fd5 CI Travis Shell Escape Error (?) 
.. not sure why their was a mismatched " at runtime
   it looks ok to me. So changed to ' in an attempt to fix
 2016-04-12 21:13:32 +01:00
Mark Liversedge
49b357e63f CI Travis RInside Fix 
.. sed command line error
 2016-04-12 20:52:03 +01:00
Mark Liversedge
71c54fd329 CI Travis install RInside 
.. with CALLBACKS enabled
 2016-04-12 20:35:36 +01:00
Mark Liversedge
f7fbeecf5d CI Travis Rcpp install (again) 
.. halfwittery in last commit
 2016-04-12 20:17:59 +01:00
Mark Liversedge
371fadfdcb CI Travis Install Rccp 
.. in readiness for RInside build and install
   with GC_WANT_R
 2016-04-12 20:02:39 +01:00
Mark Liversedge
197aab06a5 CI update install-packages.R 
.. to reflect we need to build with RInside with
   callbacks enabled.

[skip ci]
 2016-04-12 19:48:06 +01:00
Mark Liversedge
b0b4f868d5 CI Install R update 
.. brew tap homebrew/science
   to see if that finds it
 2016-04-12 19:31:53 +01:00
Mark Liversedge
2a5243e558 CI Travis Install R 
.. getting ready to build with GC_WANT_R
 2016-04-12 19:24:13 +01:00
Mark Liversedge
37a0229daa R Console History 
.. using up/down arrows
 2016-04-12 19:01:00 +01:00
Mark Liversedge
f2bd37227b R GC.activity() function 
.. to get a dataframe containing all the
   data in a ride.
 2016-04-12 17:45:48 +01:00
Mark Liversedge
52e3f764b3 Merge pull request #1925 from amtriathlon/master 
Fixed AvgSpeed to fallback to Distance/Duration when there are no sam…
 2016-04-12 17:44:44 +01:00
Alejandro Martinez
4ecb4bc57c Fixed AvgSpeed to fallback to Distance/Duration when there are no samples 
This behavior was changed after compute() refactor.
 2016-04-12 13:02:10 -03:00
Mark Liversedge
600bc6d2f3 R Chart refactor with RTool 
.. refactoring code to introduce an RTool for working
   with RInside and Rcpp and move code away from main.cpp

.. get ready to write all the data accessors in a way
   that supports multiple athlete windows.
 2016-04-12 15:55:03 +01:00
Mark Liversedge
e4a23583af RChart Athlete/Home 
.. add GC.athlete and GC.athlete.home to the variables
   list - setting context every time we parse any kind
   of expression.
 2016-04-12 00:52:01 +01:00
Mark Liversedge
1c96ae9a63 R Chart Console and "GC" object 
.. now have a console in the RChart to issue R commands.
   Its very basic and doesn't handle multi-line commands
   well nor support up/down to cursor through history.

.. added a "GC" object with 3 variables
   GC.version - a version string
   GC.build - build id, later always higher
   GC.home - root of all athlete directories

.. No access yet to athlete, metrics, models and rides.
   This will come very shortly; need to decide on best
   way to handle accessing different athletes within
   a single global context.
 2016-04-12 00:33:57 +01:00
Mark Liversedge
88819973d3 Add new RConsole Chart 
.. to trend and analysis view

.. its a blank chart for now, building begins now we are
   ready to support this across all platforms.
 2016-04-11 16:37:40 +01:00
Mark Liversedge
3b8e2070bf Add RInside Developer Instructions 
... see doc/user/RInside.txt
 2016-04-11 15:44:31 +01:00
Mark Liversedge
955922fee3 Fix compile error for last commit 2016-04-09 21:24:40 +01:00
Mark Liversedge
773cc6fcc4 R integration and Version in About 
.. integration fixups for cross platform
.. RInside will need to be built with callbacks enabled
.. R Version is shown in about version
 2016-04-09 20:47:44 +01:00
Mark Liversedge
129b88dc0f Fix R src.pro to make cross-platform 
.. working on Linux and now OS X
 2016-04-09 13:01:13 +01:00
Mark Liversedge
56ab168336 Fix SEGV on Cancel at Startup 
.. of you cancel before opening an athlete you get a SEGV
   on some platforms under some conditions (threads)

.. we now tidy up a little better and avoid deleting static
   objects when application->exec() has not been called.
 2016-04-09 10:47:32 +01:00
Mark Liversedge
65b7768de2 Add -lR and -lRInside for 'R' Chart 
.. still working on the build/configuration to get things
   started. main.cpp now creates an instance of RInside
   that is shared by all athletes/charts.

.. not clear if this is going to work (!)

.. pushing to repo to test cross-platform support during
   development. It /should/ not impact any code since it
   will be an optional dependency.
 2016-04-08 12:22:44 +01:00
Mark Liversedge
ba5b797aba Add an 'R' Chart 
.. first part just to get the configuration ready to
   build out a chart for the trend and activity view

.. src.pro and gcconfig.pri are updated to link in with
   the RInside/Rcpp package install (new dependency)

.. there is a script in util called install-packages.R
   which can be run to install the packages so long as
   R is available:

   $ R CMD BATCH util/install-packages.R
 2016-04-08 11:45:34 +01:00
Mark Liversedge
25e8f30454 Ride Editor Find and Replace 
.. extend the find dialog to enable the user to replace
   and replace all values found in one hit.
 2016-04-07 17:18:17 +01:00
Mark Liversedge
00f696b00c Merge pull request #1923 from dresco/timestamp 
Fix corrupt timestamps on Windows builds
 2016-04-07 14:17:23 +01:00
Jon Escombe
715f476d45 Fix corrupt timestamps on Windows builds 
The logic for building the timeval struct wasn't quite right.
 2016-04-07 13:26:08 +01:00
Mark Liversedge
005632351a Merge pull request #1922 from erikboto/add_tw_garmin_edge_520 
FitRideFile: Add Garmin Edge 520 Taiwan version
 2016-04-06 20:27:50 +01:00
Mark Liversedge
118f47e337 Merge pull request #1921 from amtriathlon/master 
Fixed LTMPlot so By Week grouping starts on monday
 2016-04-06 20:27:40 +01:00
Erik Botö
0b80ec4949 FitRideFile: Add Garmin Edge 520 Taiwan version 
Fixes Issue #1919
 2016-04-06 20:46:20 +02:00
Alejandro Martinez
b3a9b34633 Fixed LTMPlot so By Week grouping starts on monday 
instead of Wednesday due to missing parentheses
 2016-04-06 15:23:01 -03:00
Mark Liversedge
0db36a9ad2 DataFilter Update Syntax 
.. allow single character variable name

.. dereference via $name not just name perhaps to
   consider user prompts to set values at runtime
 2016-04-06 18:43:27 +01:00
Mark Liversedge
40b3f0040e Merge pull request #1920 from lumanz/master 
Update gc_zh-cn.ts
 2016-04-06 15:54:47 +01:00
Sping Zhao
2cf9b69a2c Update gc_zh-cn.ts 2016-04-06 20:49:19 +08:00
Mark Liversedge
ad1558ac21 Merge pull request #1899 from erikboto/filetype_by_suffix_export 
Use filename suffix to determine filetype if possible during export
 2016-04-03 18:36:29 +01:00
Mark Liversedge
9440c1e5ec Merge pull request #1912 from leukzx/master 
Added virtual power support for the Tacx Sirius trainer.
 2016-04-03 18:34:04 +01:00
Mark Liversedge
acaa69e280 Handle NOWEBKIT for QT < 5 Gracefully 
.. if NOWEBKIT is set in gcconfig.pri when QT < 5 we unset it, since
   it is only supported for QT versions > 5.0 where QWebEngine is
   available

.. gcconfig.pri.in has also been updated to have a line to set
   NOWEBKIT as a signpost to the user

.. we /could/ use the sed s/#DEFINES/DEFINES technique in .travis.yml
   now to set NOWEBKIT always and it will only take effect if building
   with QT5
 2016-04-03 08:16:35 +01:00
gcoco
9f2d92687b Fix QT install. 
Allows sub-version so we can do QT5.5.1 (Webkit) and QT5.6 (Webengine) at a later date.
 2016-04-02 17:36:41 -04:00
gcoco
e16ac1ae5c Allow QT version choice for MAC 
[ci skip]
 2016-04-02 17:35:28 -04:00
Mark Liversedge
ed4a850bc6 Cleaner version of previous commit 
.. just clear the tree, no need to traverse it.
 2016-04-02 20:40:20 +01:00
Mark Liversedge
96aee7d487 Fix LTMSidebar::resetSeasons SEGV 
.. takeChild(0) called repeatedly caused a crash for every
   season that had no children.
 2016-04-02 20:33:25 +01:00
Mark Liversedge
26d09a3e98 CI Travis QT5 issues 
.. added -Wno-c++11-narrowing to fix build of qwtplot3d libs
.. travis/install-qt.sh has some diags
 2016-04-02 19:48:02 +01:00
Joern
8d2bf5529d Update README.md 
... link to correct CI project
 2016-04-02 19:31:10 +02:00