Commit Graph

6262 Commits

Author SHA1 Message Date
Mark Liversedge
874779ec09 Merge pull request #1755 from amtriathlon/master
RideSummary in Trends shows Power Zones according to sport
2015-12-30 21:49:24 +00:00
Alejandro Martinez
77cadf2874 RideSummary in Trends shows Power Zones according to sport
Only when the activities included are homogeneous
2015-12-30 17:53:59 -03:00
Mark Liversedge
5106549120 Workout Editor x/y labels
.. mostly a checkpoint commit since not much
   development done today.
2015-12-30 15:13:26 +00:00
Mark Liversedge
bca2d5145b Merge pull request #1753 from Joern-R/MSVC3
MSVC - QWT Debug vs. Release
2015-12-30 15:12:57 +00:00
Joern
1e0cb4a39f MSVC - QWT Debug vs. Release
... MSVC does not accept mixed libraries (debug/release) when linking
... patch has been tested with MingGW/GCC as well
2015-12-30 15:40:36 +01:00
Mark Liversedge
cc8253489e Merge pull request #1749 from Joern-R/MSVC2
MSVC - LibUSB
2015-12-29 14:41:51 +00:00
Joern
7a2a3050c6 MSVC - Video VLCPlayer
... #warning is unsupported
... uinstd.h not available/required
2015-12-29 13:12:49 +01:00
Joern
e725c77e5e MSVC - LibUSB
.. uinstd.h not required/available unser MSVC
2015-12-29 12:41:28 +01:00
Mark Liversedge
f445189e77 Workout Editor Alignment Guide
.. when dragging a point all points with the same
   Y value are highlighted to help with alignment.
2015-12-29 10:22:17 +00:00
Mark Liversedge
a1e89909b1 Workout Editor X-axis Constraint
.. don't move beyond points to left and right
2015-12-29 09:19:13 +00:00
Mark Liversedge
38c54628de Workout Editor Rough Prototype
.. of point based editing, which is a bit difficult
   without constraints like snap-to, guides, undo
   or delete. But the basic concept is there to play
   with.

.. of course it will still be possible to edit in a more
   traditional 'blocks' and 'rectangles' way too but that
   code hasn't been written yet.
2015-12-28 22:38:02 +00:00
Mark Liversedge
284864bb95 CI Fix gcconfig.pri -lz
.. the logic for gcconfig.pri was reversed
   and now we must uncomment for local compress
   libs, rather than getting them by default.
2015-12-28 19:09:39 +00:00
Mark Liversedge
04ec5349bd Fixup src.pro
.. compress and maths libs with win32 and gnu toolchain
.. WINKIT_INSTALL to specify where winkit is installed for MSVC toolchain
.. update gcconfig.pri to reflect this
2015-12-28 18:46:06 +00:00
Mark Liversedge
5e59fbe0b7 Workout Editor - Part 1 of MANY
.. initial code to display an ERG file for editing

.. this just introduces the basic model for rendering
   the erg file and loading the model.

.. the interaction model using a 'points' editor will
   follow next and then one to use 'blocks'.

.. There is a LONG way to go, this commit is just to
   put a checkpoint down and test across platforms
2015-12-28 16:44:28 +00:00
Mark Liversedge
229a43062b tidy up formatting src.pro 2015-12-26 20:18:00 +00:00
Mark Liversedge
6d4207871d -l -l snafu in src.pro
.. breaks OS X but not Win or Linux interestingly.
2015-12-26 14:41:35 +00:00
Mark Liversedge
222ccc4708 Platform neutral SRC.PRO
.. all libs are now resolved using -Lfolder and -llib
   rather than any reference to .a or .lib
2015-12-26 11:47:45 +00:00
Mark Liversedge
2ca332911f More src.pro cleaning
.. most importantly start to remove any reference
   to .lib or .a library files since these differ
   depending upon toolchain.

.. instead we should use a combination of
   LIBS += -Lfolder
   LIBS += -llib

.. so for example
   LIBS += ../qwt/lib/libqwt.a

   becomes
   LIBS += -L../qwt/lib -lqwt

   and is now platform neutral.

.. this needs to be applied throughout to ensure
   src.pro works for MSVC and GNU toolchains
2015-12-26 10:45:30 +00:00
Mark Liversedge
4b6de65e04 Remove reference to code pushed early
.. in previous commit.
2015-12-25 20:30:58 +00:00
Mark Liversedge
192708c3ab Reorganise src.pro
.. it had become a bit of a mess with various changes
   over the last 5 years so restructured into 3 sections

   * core and platform config
   * optional dependencies
   * source and headers

   This is to help make it easier to maintain, especially
   since support for the MSVC toolchain is likely to mean
   it is modified quite a bit (in section 2 anyway)
2015-12-25 20:10:44 +00:00
Mark Liversedge
2bf9337cda Merge pull request #1746 from maxammann/master
Fixed a german translation in AboutDialog to have a fixed length
2015-12-25 11:39:21 +00:00
Max Ammann
e7fa19e5d6 Fixed translation in AboutDialog to have a fixed length 2015-12-25 12:11:39 +01:00
Mark Liversedge
f70f175e92 Version Dialog MSVC/GCC
.. formatting how version is shown.
2015-12-24 22:57:59 +00:00
Mark Liversedge
682f33c6ba MSVC Toolchain in src.pro
.. just for QWT and MS User32/Gdi32 libs when
   compiling with MS Visual Studio 2015
2015-12-24 22:04:01 +00:00
Mark Liversedge
2057669fbe Fix Computrainer TXT parsing
.. when the values are quoted but contain spaces, since this
   breaks the regexp for finding the separator which uses a
   comma -or- a space.
2015-12-24 17:19:13 +00:00
Mark Liversedge
512fc323ed RideMetric.h logic !
.. the assert condition was lost, only issue a debug
   message if the dependent metric is unknown.
2015-12-24 16:07:14 +00:00
Mark Liversedge
1c6843cdb8 Update gcconfig.pri.in for win_flex/bison
.. so developers don't need to guess what to add
   to gcconfig.pri when using them with VS2015/MSVC
2015-12-24 15:31:02 +00:00
Mark Liversedge
d743fdd3ec No Assert in RideMetric.h
.. gets rid of an iritating compiler warning when
   compiling with VS2015 and MSVC

.. is good because user metrics aren't fixed so the
   assert assumption is wrong now

.. means we have to add assert.h to all the source
   files that had it from including RideMetric.h
   and want to use it.
2015-12-24 15:26:29 +00:00
Mark Liversedge
cc5ba4bf29 Visual Studio 2015 / MSVC2015 compatibility
.. fixup win_flex errors related to isatty
   and prefix not being set on the command line
2015-12-24 15:11:33 +00:00
Mark Liversedge
d86215c5a0 Merge pull request #1745 from Joern-R/msvc1
Visual Studio 2015 / MSVC2015 compatibility
2015-12-24 12:03:04 +00:00
Joern
484a59a640 Fix Build for QT 4 2015-12-24 11:32:49 +01:00
Joern
9935edecd3 Visual Studio 2015 / MSVC2015 compatibility
... first set of syntax error fixes to compile GC using Visual Studio 2015
... changes are encapsulated and tested to not conflict with GCC compilation

Note: there is no full compatibility - so GC is not building with MSVC2015 yet
2015-12-24 11:08:31 +01:00
Mark Liversedge
c46bc137a0 IntervalSummaryWindow SEGV user metric missing
.. if you delete a user metric after adding it to the
   interval metrics list the interval summary window
   will crash.

.. the fix goes to source where the RideMetric::compute()
   method now ignores metrics that are not known instead
   of adding a NULL pointer to the results.
2015-12-23 19:02:01 +00:00
Mark Liversedge
fa47344b8e More test charts
.. aggregate using a formula
.. modality using formula
2015-12-23 16:28:03 +00:00
Mark Liversedge
a7728c6bc2 DataFilter fix builtins (again)
.. the DataFilterFunctions[] were not processed correctly
   after validation of calls to named functions was added
   and the correction applied previously only worked for
   functions defined by the lexer/parser, not those defined
   in DataFilterFunctions[]

.. this fixes that, but it would be nice if this was cleaned
   up in to one unified place in the datafilter.
2015-12-23 15:34:27 +00:00
Mark Liversedge
c329f2bb08 Merge pull request #1741 from amtriathlon/master
Fixes autofilter when field names are translated
2015-12-22 16:41:52 +00:00
Alejandro Martinez
9b7597edd7 Fixes autofilter when field names are translated 2015-12-22 13:11:46 -03:00
Mark Liversedge
c9e1c919e3 ::addRide bool planned
.. should have been added at the end of the parameter
   list since it and tempActivity are optional parameters.

.. it broke import via RideImportWizard.
2015-12-22 15:22:03 +00:00
Mark Liversedge
cff326a1b1 RideSummaryWindow filter missing metrics
.. since we can now delete metrics when they
   are user defined. Previously the summary
   would crash if a Bests metric didn't exist.
2015-12-22 12:46:24 +00:00
Mark Liversedge
1f126c98e0 DataFilter Editor Match { }
.. added matching braces as well as brackets in the
   editor since it can get pretty hairy now we
   have code blocks and named functions using braces.
2015-12-22 10:30:12 +00:00
Mark Liversedge
e1e834aa08 Fix CL in PfPv plot
.. recent commit for Pmax on the PfPv plot introduced
   a  stray line of code settng cranklength incorrectly.
   This results in the QA plot being blank and a warning
   message from qDebug() about trying to read a cyclist
   setting incorrectly.
2015-12-22 08:18:28 +00:00
grauser
8080712d4a RideNavigator : Don't crash is no selection 2015-12-21 19:04:37 +01:00
Mark Liversedge
711cf13372 Fix RideSummary SEGV
.. logic error if/else for plotting rides vs dateranges
   along with assumption that zones will not be NULL (esp
   for running) lead to a repeated crash when running power zones
   are not defined.

.. additionally, when summarising for a date range the table was
   displayed for running vs cylcing based upon the current ride item.
   This has been changed to use cycling power zones always.

.. the proper fix would be to summarize power time in zone for running
   and cycling separately.

.. the compare logic appears to be unaware of power time in zone for
   running and so does not have the same SEGV but will also need to
   be updated to list time in zone for running and power separately.
2015-12-21 17:23:44 +00:00
Mark Liversedge
c6d2fef46c Merge pull request #1739 from amtriathlon/stryd
Add support for running power zones (Stryd) part 3
2015-12-21 15:51:50 +00:00
Alejandro Martinez
faff84a552 Changes ModelPlot tu use Zones according to sport 2015-12-21 10:56:57 -03:00
grauser
b7eadf9fb1 RideItem : Don't update path from cache 2015-12-20 23:29:05 +01:00
grauser
274fa7e8f8 PfPvPlot: Add PMax 2015-12-20 22:53:31 +01:00
grauser
5016300650 Remove planned RideFileCache 2015-12-20 22:43:29 +01:00
grauser
913a0d0c70 RideFileCache: distinguish planned activities 2015-12-20 22:43:29 +01:00
grauser
8eef00d99d LTMPlot: Don't plot expected PMC in the past 2015-12-20 22:43:29 +01:00