Adding the support for recorded and paused time #222
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…bobox disappears in Linux -> unusable Normally when a combobox has the focus, then an item can be selected with the keyboard, which works in Linux but the focus in this slideout did also not work This is the first time that a listbox is used in MT :-) Maybe there are other places where a combobox in a slideout is also used. Removed listbox.select(0) -> a disabled list is not readable
Added a number of optimizations to provide better support for Dropbox feature. Conflicts: bundles/net.tourbook/src/net/tourbook/importdata/EasyImportManager.java bundles/net.tourbook/src/net/tourbook/ui/views/rawData/RawDataView.java
…n translation is in progress
…isplayed disable tree actions when flat layout is displayed
…b but this was not the reason to remove it, this image was NEVER disposed -> SWT was running very fast out of handles when moving the tour chart slider as this would create a new image for every new slider position, discovered this issue with SWT sleak
… a feature used: - import - tour directories - display a tour, e.g. in map or chart sometimes it is not easy to get the "correct" sorting or find the best category new/improved/bugfix
requires complex sql, it looks good now but needs more testing
mytourbook#220 now the sql statements are much more complex
* Proof of concept for Elapsed Time * Numbers for POC * Support for pauses for the fitlog format * It is fully working for fitlog files * First stab at the fit pauses * Pause time for Suunto 9 files but the recorded time is wrong * TODOs * Revert of BreakTimeTool.java * WIP Storing tourTimerPauses differently in the database * Fixed the database design issue. * Adding the paused time in the Calendar view * Misc * Formatting * Rearranged value formats preferences with all the times * Added all the time values in the Tour Tooltip * Added all the time values in the Calendar view and added the property tourRecordedTime in TourData * done and todo * WIP : Paused times for fit files * WIP : Fit pauses imports * Revert * FIT : Suunto and maybe others don't have events for pauses but the recorded time is available * Formatting * Revert * Suunto Ambit XML pauses import * Bugfix for Suunto Ambit import introduced in last commit * done * Suunto Ambit SML pauses import * todo * Bugfix : We need to set the tourdata for each tourtimerpause * TODO * TODO * TODO * Adding the ability to reimport only tour timer pauses * Alphabetical order * When updating to the new DB, by default, the recorded time will be the elapsed time (hence the pause time will be 0) * Some fit files don't have the detailed pauses information but they have the total recorded time * Adding the Recorded time column in the TourBookView * Adding strings for paused time * Added the paused time in the TourBookView * When reimporting, we set the recorded time (if any) before setting the timer pauses * Adding the paused time and recorded time as sums * Icon fix * WIP * TODO * Readme update * When reimporting a tour and only importing the tour timer pauses, we display the previous vs new data. We should do that for the other reimport menus * TODO * DB version change * We need to save the previous data * Changing header icons * Setting the recorded time and paused time when importing pauses as a list * CSV Import * Misc * Revert * Only setting the paused time when the recorded time is not 0 * Polar HRM * Fit log import fixes * GPX Import * Misc * Headers * Done and checked * Renaming * Renaming * Renaming * French translation * TODO * WIP UI update when manually modifying elapsed recorded paused moving and break time * DONE UI update when manually modifying elapsed recorded paused moving and break time * More info * Adding Recorded and Paused Time in the Statistics tooltip * Renaming computeTourDrivingTime to computeTourMovingTime * WIP Displaying the pause durations on the 2D Map * Misc code beautifying * 2d map Added the ability to display/hide the location and duration of the tour pauses * Small fix * Adding the icon for showing/hiding tour pauses * Fix for Fitlog import * Setting the tour recorded time * Comments * TODOs * Add the PR number when created * Checking that every file import sets correctly the tour recorded time * Exporting/importing recorded and paused time for the GPX format * Beautifying * Added the new time Tourbookview columns in CSV Export * WIP TCS Pauses import * Formatting * Pause import for TCX files * Merge part 2 * TODO Fix unknown regression * Added the ability to display recorded and paused time in the Day/Week/Month/Year Summaries * DONE AND TODOs * Readme update * TODO * TODO * WIP Added the ability to display/hide the tour pauses in the chart * Removing Unused action * WIP Display pauses in the tour chart * S9 Import: We need to take into account when the user starts and stops the activity to have a correct elapsed time * XML tags
FJBDev
changed the title
|
I cannot set a comment on a binary file, so my comment is for https://github.com/FJBDev/mytourbook/blob/f93e3daaef02f600a67f63f3637ebdbca015ab41/bundles/net.tourbook/icons/tour-pauses-disabled.png The disabled action image is very dark but all other disabled actions have a much lighter grey. I've done this with the Curves dialog in Gimp similar to this curve.
|
wolfgang-ch
reviewed
Aug 31, 2020
bundles/net.tourbook/src/de/byteholder/geoclipse/mapprovider/DialogMP.java
Show resolved
Hide resolved
wolfgang-ch
reviewed
Aug 31, 2020
bundles/net.tourbook/src/de/byteholder/geoclipse/mapprovider/LayerOfflineData.java
Show resolved
Hide resolved
wolfgang-ch
reviewed
Aug 31, 2020
wolfgang-ch
reviewed
Aug 31, 2020
wolfgang-ch
reviewed
Aug 31, 2020
wolfgang-ch
reviewed
Aug 31, 2020
wolfgang-ch
reviewed
Aug 31, 2020
wolfgang-ch
reviewed
Aug 31, 2020
wolfgang-ch
reviewed
Aug 31, 2020
wolfgang-ch
reviewed
Sep 1, 2020
bundles/net.tourbook/src/net/tourbook/map25/layer/marker/ProjectedItem.java
Show resolved
Hide resolved
bundles/net.tourbook/src/net/tourbook/tour/filter/geo/TourGeoFilter_Loader.java
Show resolved
Hide resolved
bundles/net.tourbook/src/net/tourbook/ui/views/tourBook/TVITourBookItem.java
Show resolved
Hide resolved
FJBDev
commented
Sep 1, 2020
wolfgang-ch
reviewed
Sep 2, 2020
There was a problem hiding this comment.
This code review is now done, I'm doing a functional review with the resolved issues.
Currently I'm implementing the app tag filter with AND'ed tags, so there will modifications (-> merge conflicts) everywhere were tag's are filtered as the SQL statements must be slightly restructured. The Tour Book view is now done and will merge it now but any other tag filter dependened views will also have these changes.
bundles/net.tourbook.device.garmin/src/net/tourbook/device/garmin/GarminSAXHandler.java
Show resolved
Hide resolved
bundles/net.tourbook.statistics/src/net/tourbook/statistics/messages.properties
Show resolved
Hide resolved
Fixed |
This was referenced Sep 10, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
"Paused Time" & "Recorded Time" data element in MyTourbook
As requested in this discussion thread and this GitHub issue, I have added the following time data for each tour:
New time data:
Existing time data:
WHY ?
As the famous ultra-trail runner Xavier Thévenard says here in his 2018 summary :
What he is basically saying is that if the user-triggered pauses are not taken into account, it can lead to yearly numbers that can be quite far from the reality. In his example, it can lead up to 52h of training where he was actually enjoying the landscape, taking a bio break etc.....
Hence, having MyTourbook that stores and displays the pauses time for each activity is very important if not mandatory.
HOW ?
The new time values (Recorded and Paused Time) are imported from the following file formats :
Garmin FIT, Suunto (Ambit 2 xml, Ambit 2 sml, Suunto Spartan/9 .json.gz), SportTracks Fitlog, Garmin TCX
Note: I could do it for more formats but I don't own files for the other supported extensions. Hence, for those formats, I have set during the import the recorded time to be equal to the elapsed time. See here as an example
Furthermore, for existing activities, I have added the ability to re-import, for any given tour, only the timer pauses (and hence also the recorded time).
When re-importing only this data, the log will display the previous timer pauses value and the current one for more clarity for the user.
The appropriate UI, menus and tooltips were updated to display the recorded and paused times :
TourBookView and TourDataEditorView
Calendar View
Statistics View
Added the ability to choose in between the different times
2D Map
Tour Chart
UI
Important note:
When upgrading from database 41 (20.8) to 42 (20.NEXT), the recorded time will be updated to be equal, by default, to the elapsed time (recording time) and hence the paused time will be equal to 0. See the note above on how to import the recorded/paused time in existing tours.
Misc other changes: