summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-05-17Implement the row count for location informationGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Implement the data method for location informationGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Start the model for location information.Gravatar Tomaz Canabrava
And implement the reset method. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Move Locationinformation to its own file.Gravatar Tomaz Canabrava
The SimpleWidgets file was getting too big, and location information will also need a new model - a good way to do not mix everything is to put things in a new file. [Dirk Hohndel: added missing include of stdint.h] Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Change the Locationinformation to handle location editingGravatar Tomaz Canabrava
Add a few interface items to handle location editiing, a combobox to show everything, and three buttons: add, edit, delete. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Fix the layout of the geo managementGravatar Tomaz Canabrava
The layout was just plain ugly; this fixes that and also adds the possibility to insert new controls that will be userfull for managing the Locations. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Remove extra ; at the end of lines.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Don't enable the widgets before finishing the threadGravatar Tomaz Canabrava
The maintab should be disabled when the geolocation thread is running - but if you changed the dive, it would reenabled it. (actually this should be only on the location widget, I'll send another path later) Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Fix signal connectionsGravatar Tomaz Canabrava
I don't know what happened to me, I connected to some signals that didn't exist at all. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Show seconds in duration for free divesGravatar Robert C. Helling
For free dives (corresponding to dive mode or duration shorter than 15min), the display format for duration is changed to display minutes and seconds. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-17Correct dive time in DLF importGravatar Miika Turkia
Divesoft Freedom records the dive time in count of seconds since 1.1.2000 00:00:00, not noon. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Make sure that the save file dialog actually is marked as suchGravatar Dirk Hohndel
While this worked on Linux, on the Mac we didn't have an input field to enter the file name. With this we explicitly declare that this is a file save dialog and that the user can specify a non-existing file name. Fixes #872 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Multi dive edit: treat buddy and divemaster as tag listsGravatar Dirk Hohndel
So just like tags do "differential editing". Figure out what (or in this case, who) was added / removed from the displayed dive and do the same for all other selected dives. This does seem a bit over top for divemaster, but this is more consistent and therefore should make more sense to the user - assuming we ever have one who runs into this. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Only add disclaimer and runtime table if we added deco to replanne diveGravatar Robert C. Helling
As a side effect this changes the signature of plan(): Before it returned an int that was supposed to be possibly an error but we never bothered to check it. So now it's bool indicating if the planner did add stops. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Fix initial scrolling problemGravatar Linus Torvalds
The initial selection change signal seems to potentially be sent before the listview is even visible when we do the first "scrollTo()" to the currently selected dive. That, in turn, seems to result in that when the listview is actually shown, it will be scroll the trip description off the visible area, and force the current dive to be shown at the very top of the divelist. Which is not very nice: we do want to scroll to the current dive, but we don't want to hide the current trip in the process. Ignoring the selection change if the listview isn't even visible seems to fix things for me. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Only show Collapse all when its neededGravatar Tomaz Canabrava
This makes Collapse All only visible when its needed, and it also fixes a crash when invocking collapse all when there was nothing to collapse. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-11Only show expand all and collapse all options if there`s a needGravatar Tomaz Canabrava
This patch unclutter the menu by hidding collapse all when all dives are collapsed, and expand all when all dives are expanded. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-10Get the location information in a separate threadGravatar Tomaz Canabrava
This makes Subsurface usable faster for those without a good internet connection when they are opening an older data file. While parsing, we are only feeding an vector of locations, after the parsing is done, we traverse the vector searching for the information on the web. I need to also add a way to stop if there`s no internet connection - but this will be another patch. Also, fixed two small memory leaks from the old imp. [Dirk Hohndel: cleaned up the whitespace mess] Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-09Keep old notes when saving as new dive in replanGravatar Robert C. Helling
... but discard an old disclaimer and runtime table if present. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-09Change menu entry for "replan"Gravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-08Only print gasname for a segment in planner if it differs from the previous oneGravatar Robert C. Helling
This is to avoid visual clutter when replanning logged dives. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-08Only warn when trying to replan a logged diveGravatar Robert C. Helling
If there are more than 100 samples, average some of them so we end up with no more than 100. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Ignore the gas_change alarm on MacDive importGravatar Miika Turkia
As the gas changes can be parsed more reliably from the gases list, we just ignore the gas_change events as redundant information. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Parse MacDive gas usage from gases listGravatar Miika Turkia
Gas change events can be parsed properly from the gases list with clear information on what the gas mixture was. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Use function from commonTemplates on MacDive importGravatar Miika Turkia
Get rid of duplicate function. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Import tags from MacDiveGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Parse the MacDive gaschange valuesGravatar Miika Turkia
Fixes #869 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-07Fix event name for MacDive gas changesGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Add new fields as extra data on MacDive importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Add entryType as tag on MacDive importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Have computer data inside divecomputer tagGravatar Miika Turkia
This includes all the data computer related data within the divecomputer tag. All the extra noise is just indentation (apart from moving the divecomputer end tag). Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Re-order the MacDive importGravatar Miika Turkia
Next commit will do indentation so this one will keep it clear of what actually occurs. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-04Support for new data format for MacDiveGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-02Improve multi dive tag list editsGravatar Dirk Hohndel
The old behavior was kind of crude. Just smack the tags that were on the displayed dive on all selected dives. This seems to make more sense. We figure out which tags were added to the displayed dive and add them to all selected dives. And we remove all tags that were removed from the displayed dive from all selected dives. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-02Tag list handling: add two new helpersGravatar Dirk Hohndel
taglist_added() simply figures out the tags that are in the new list but not in the original list. taglist_dump() makes debugging things easier. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-02User manual updateGravatar willem ferguson
This adds text to the following sections: 1) Dive planner (Open circuit planning) 2) Dive Planner (Recreational OC planning) 3) Use of hashes to move images between directories 4) Undo/Redo feature of dive list manipulations One image in planner text is modified. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-02User manual update: OSTC Tools integrationGravatar willem ferguson
Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-02Use dynamic sample interval on divelogs.de exportGravatar Miika Turkia
Rounding always up should give us sensible sample interval as EON Steel adds extra samples. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-02Have the dive duration in variable for further useGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-05-01cmake: enable Facebook supportGravatar Dirk Hohndel
Not sure if we have this on Android, so right now I just enable it for Linux, OS X, and Windows. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-30Select only "meaningful" samples for divelogs.de exportGravatar Miika Turkia
The logic to select samples from EON Steel for divelogs.de export is the following: - Ignore sample at time zero, as that is surface, and the second "odd" sample contains information we are interested in - Grab the second sample, first sample with pressure and temperature readings - Grab the third sample - "grand parent" is 0, thus our first interval sample - Grab the samples when the predecessor (or grand parent) is at least 10 seconds away This logic seems to produce reasonable results when exporting EON Steel logs to divelogs.de. Naturally there might be corner cases, that are not taken into account, but this basic logic seems reasonable in normal cases. (Unfortunately analysis is done based on a single dive.) Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-30Use variable to track special handling of DCsGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-30Set EON Steel sample interval to 10s onGravatar Miika Turkia
This sets the Suunto EON Steel sample interval to 10 seconds when exporting to divelogs.de. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-30Add text to user manual: Recreational dive planning One figure has been addedGravatar willem ferguson
Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-29Add urldialog.ui to qmake ui listGravatar Anton Lundin
This unbreaks the qmake build system by adding urldialog.ui there. Yes, i know we're planning on switching away but i still build things via qmake and its nice if it works until we actually remove it. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-29Add a default case for switch over dc_family_tGravatar Anton Lundin
This adds a default case which just errors out for the switch over dc_family_t instead of checking a uninitialized variable if this was ever called with something else than one of the expected dc-family types. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-29Rename menu entry for image hashingGravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-29Display a notification while image hashing is ongoing.Gravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-29Small design fix to make labels on Info tab look alignedGravatar Dirk Hohndel
By wrapping the Location label in a layout as well they now all look aligned again. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-28cmake: missing spaceGravatar Dirk Hohndel
This caused cut to fail and the whole dll dependency calculation went wrong. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>