aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-01-06Clean a lot of code for a new and improved CSV import dialogGravatar Tomaz Canabrava
This mostly cleans out stuff that is going to be uneeded. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-06Always show deco gas as dive gasGravatar Anton Lundin
This unifies how we prints Nitrox deco gas dives with Trimix deco gas dives. Reviewed-By: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Remove unused importsGravatar Anton Lundin
These doesn't exits in Qt for android to... Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05DLF import: Document unknown fieldsGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2015-01-05DLF import: Decode and import ceiling informationGravatar Anton Lundin
This imports the ceiling information as stopdepth, our way of showing a ceiling. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05DLF import: Decode and import temperatureGravatar Anton Lundin
These decodings and constants makes the numbers line up perfectly with the numbers presented on wetnotes.com. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05DLF import: Decode and import NDL and TTSGravatar Anton Lundin
The units of these values are guessed, but these values makes they match up well with the values we calculate ourself. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05DLF import: Decode ppO2Gravatar Anton Lundin
This decodes the ppO2 value stored in the DLF files. It looks like the DiveSoft Freedom computers always stores the ppO2 value, even for OC dives. This import only stores the ppO2 value from CCR and PSCR dives, where these values comes from sensors and makes sense to store. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05DLF import: Restructure depth decodingGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Give oxygen a proper colour in the tankbarGravatar Joakim Bygdell
Oxygen should be representad by its own solid green colour not the yellow/green of nitrox. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Use correct name for oxygenGravatar Joakim Bygdell
When O2 is 100% we should use oxygen instead of EAN100. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Need to warn about some more characters on CSV importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Don't always show the setpoint graphGravatar Dirk Hohndel
We need to use the same conditional here as we do earlier in the code. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Display CCR setpoint values on the po2 graphGravatar Willem Ferguson
When a CCR dive is viewed and the toolbar button for PO2 is activated, both the PO2 (green line) and the O2 setpoint (red line) are shown. This allows evaluation of the PO2 in the CCR loop with respect to the pre-configured O2 setpoint. The setpoint graph can be disabled from the Preferences/Graphs tab by checking the appropriate checkbox. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Caveats of CSV import added to documentationGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Indentation fix for Subsurface CSV importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Support for multi-line notes on SubsurfaceCSV importGravatar Miika Turkia
This patch only implements the feature, indentation fix is to follow. This ensures that the actual change can be more easily reviewed. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Various capitalization fixesGravatar Joseph W. Joshua
Fix various discrepancies in the capitalization format, as we are using 'down format' for titles and actions. Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-05Add required empty fields on CSV exportGravatar Miika Turkia
We need to have empty field printed for every value on the CSV export. Hopefully this is enough. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Initialize edit hack variableGravatar Miika Turkia
The accepting mode variable must be initialized to false to allow editing of dive data. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Do not add uninitialized setpoint or ndlGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Fix CapitalizationGravatar Joseph W. Joshua
Capitalize the word Facebook in 2 occurences in socialnetworks.cpp Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Update strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Close two compiler warnings about reorderingGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Fix spelling errorGravatar Joseph W. Joshua
Fix small spelling error in configure dive computer dialog. Signed-off-by: Joseph W. Joshua <joejoshw@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Make sure we do not fall back to edit mode on acceptGravatar Miika Turkia
On Ubuntu 14.04 the edit mode does not exit successfully when applying the changes. It instead jumps back to edit mode (even though hiding the option to apply/discard changes again). So let's just have a flag to prevent faulty behavior. Fixes #786 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04The margin between toolbar and profile looked strangeGravatar Dirk Hohndel
Especially on Mac where there is already a lot of padding around the action buttons. Also made the spelling of the zeroMargins variable more consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Latest strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Fix incorrect name for layoutGravatar Dirk Hohndel
If I want to use the names to make more sense out of the layouts, I might as well name them correctly... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Make text in user survey follow our capitalization conventionsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Attempt to move the more frequently used toolbar actions to the topGravatar Dirk Hohndel
This is highly dependent on the user, I guess. So I may be totally off here. But the previous order was pretty much random (and even tried to push one button in there twice in a row)... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Fix toolbar icon size issueGravatar Dirk Hohndel
Instead of messing with the margin (which didn't work, anyway), we need to set the size of the icons. Apparently on Linux this was implicitly done, but on Mac it didn't scale the icons and provided space for the largest one (and we have a couple that are twice as big as the others). What we really need are scalable icons that allow us to set the icon size relative to the font size. But for now this solves the ugliness on Mac. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-04Trip editing: zero out potential previous editsGravatar Dirk Hohndel
This was silly; if we rely on this to be zero to indicate no change then we better zero it out when we start editing. Fixes #805 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Layout fine-tuning: remove the outermost margin around the windowGravatar Dirk Hohndel
That added visual distraction on some desktop themes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Extend SAMPLE_EVENT_GASCHANGE2 to have cylinder index in 'flags' fieldGravatar Linus Torvalds
A value of zero (which is the normal legacy one) remains "unknown", but the divecomputer backend can now give both gasmix and cylinder number this way. Currently only the EON Steel backend does that, but it should be easy enough to extend others too. Also, fix the user-visible cylinder numbering in the cylinder change tooltip to use a human-friendlier one-based numbering (ie first cylinder is "cyl 1", not "cyl 0") Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Latest strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03When editing trip data, only copy actual changesGravatar Dirk Hohndel
We zero out the displayedTrip and only copy changed data into it; so a NULL value is not deleted text, it means there was no change. Fixes #805 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Fix the update check logicGravatar Dirk Hohndel
Oops. That was supposed to do the opposite of what it ended up doing. The goal was to NOT check for two weeks when the user updates to a new version. Instead it always checked when the user updated to a new version. This mostly would hit developers... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Fix cross references in user manualGravatar Miika Turkia
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-03Interpolate running depth when necessaryGravatar Miika Turkia
The running depth must be interpolated when sample interval is more than 10 seconds. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Fix gaschange tooltip informationGravatar Linus Torvalds
The code tried to look up the cylinder index from the Qt data models, which was not only horribly confusing, but was also buggy. I think the index ends up being off by one when the first cylinder change is hidden (because it's at the beginning of the dive), but I can't make heads or tails of that crazy code, so there might be something else going on. Just remove all the crazy code, and use the event data directly. Which gas the gasmix and the (potential) explicit cylinder index already. It's much more straightforward, and it just automatically gets the right end result whether some other event is hidden or not. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Fix a crash when dive date is epochGravatar Miika Turkia
With a dive that's date is 1970-01-01, starting at 00:00 the assert causes subsurface to crash when performing auto grouping. This happens to be a perfectly valid date, and we might end up getting such dates when importing dives from other software, so removing the assert. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02git save format: Don't save redunant temperature sample dataGravatar Linus Torvalds
The git sample loader will fill in temperature data from the previous entry anyway, so saving repeated temperatures is just wasteful. It turns out that commit 6cf3787a0ed1 ("Remove code that zeroes out duplicate oxygen sensor and temperature values") removed the explicit redundant temperature removal in the dive fixup, which had hidden this issue. Cc: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Small tweaks to the Mac package making scriptsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Zero out the margins instead of just not changing themGravatar Dirk Hohndel
At least on the Mac some objects appear to have generous default margins. This creates a somewhat less wasteful layout. Still we have those massive margins around the toolbar buttons. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Layout fine tuning. Exclude a few more layouts.Gravatar Dirk Hohndel
The goal is to have things look as consistent as possible - so if some elements have another nested level of layouts, their margins need to be zero. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Remove margins from maintab.ui fileGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Remove all margins from mainwindow.ui fileGravatar Dirk Hohndel
And adjust them in code instead. This seems to look nice. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Give more layouts reasonable namesGravatar Dirk Hohndel
This time for the mainwindow. This includes an adjustment in the C++ code where we actually referenced one of those weird generic names. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-01-02Fine tune some spacingGravatar Dirk Hohndel
Now that we set the margins everywhere, the manual corrections here aren't needed. At the same time, the spacing for the labels looks better if it is a tiny bit more generous. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>