aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-03-29UI: preferences-profile screen beautifyGravatar Jan Mulder
Stefan suggested "Maybe it would be nicer to move the 3 fields for the maximum pressure for N2, He, O2 for MOD to the right in the UI window exactly below the maximum field for the O2 (where we now have minimum + maximum)." And I agree, so this is the change. At the same time, reset the tab-order to a logical one. Reported-by: Stefan Fuchs <sfuchs@gmx.de> Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-28Update translation source stringsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-28Always show notes when replanningGravatar Robert C. Helling
... as per popular request. Plus adding const keyword to constant strings. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-03-28Fix missing slash in markupGravatar Robert C. Helling
Reported-by: Stefan Fuchs Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-03-28Handle notes in replanGravatar Robert C. Helling
Upon replanning a dive, we want to delete the old dive plan in the notes and replace it with the actual. This fixes a problem when we failed to detect the old plan due to the deco model name appearing in the disclaimer that was used as a marker for the notes. This patch also adds translation markers for the deco model name strings.. Fixes #285 Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-03-28minimal pO2 threshold: corrected testpreferencesGravatar Jan Mulder
Adapt the testpreferences procedure for the new min/max pO2 preference. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-28minimal pO2 threshold: color the p02 graph also for minumumGravatar Jan Mulder
Color the p02 graph also in red for going under the minumum p02 value as set in the Preferences. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-28minimal pO2 threshold: split max threshold into min and maxGravatar Jan Mulder
Nothing really special here. Just a split of the only p02 max threshold into a min threshold and max threshold, and the adaptation of the UI. Change of translatable strings included. ref: https://github.com/Subsurface-divelog/subsurface/issues/259 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-28Fix a crash when git init failsGravatar Miika Turkia
This can occur e.g. if directory permissions prevent one from writing to the local cloud storage directory. (Such a crash was discussed on mailing list.) The error message on GUI is misleading, claiming that cloud connection failed... Signed-off-by: Miika Turkia <miika.turkia@gmail.com> --- We probably should check the return value of other git operations as well, but going for bare minimum for now.
2017-03-26compile fixGravatar Jan Mulder
commit 597539ce39ab10 breaks my compile. Fixed here. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-26UI: typo fixGravatar Jan Mulder
Trivial typo fix, suggested in issue #274. Apnea is more common than Apnoea, and Apnea is also used in the code already, so, more common and more consistent. Hmm. A lot of text for a one letter fix. Close of issue suggested #274. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-26Fix issue 280: Facebook without a dive selectedGravatar Jan Mulder
Accessing Facebook stuff without a dive selected (as in an empty logbook) just SIGSEGVs. Just be more carefull. After this fix, it is still possible to upload an "empty dive" to FB. Ok, a little pointless, but a nice picture of the Subsurface logo is uploaded to FB. Consider it an easter egg :-) Fixes: #280 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-26MOBILE: Display pO2 and Setpoint for CCR divesGravatar Joakim Bygdell
For CCR dives we want to display the setpoint and pO2 information, due to the limited screensize we have to remove the temperature graph or the view will be to cluttered. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2017-03-26QStyleOptionViewItemV4 is deprecated as of Qt 5.7Gravatar Jan Mulder
Trivial change to silence compiler waring about QStyleOptionViewItemV4 being deprecated. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-26Improve mxe-based-build.sh for debug buildsGravatar Stefan Fuchs
Give a hint how to enable build of debug Qt5 DLLs when building MXE. Take care about the "d"/"xxxd.dll" suffix for DLLs. Copy libastro.dll from marble to correct loation as well (nevertheless we don't use it) Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-03-26Allow cylinder names to be editedGravatar Robert C. Helling
The same ComboBoxDelegate is used for picking a cylinder model and picking a gas in the planner waypoint table. In the former case we want to allow the user to edit the string in the second we don't. The difference is not if we are in the planner but which use of the class. So add a bool allowEdit to the constructor. Fixes #272 Signed-off-by: Robert C. Helling <helling@atdotde.de>
2017-03-24Update Subsurface-mobile version to 1.2.1Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-24Update ReleaseNotesGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-24Fix double to int truncation in C++ codeGravatar Jeremie Guichard
Wfloat-conversion enabled for C++ part of the code Fix warnings raised by the flag using lrint Original issue reported on the mailing list: The ascent/descent rates are sometimes not what is expected. E.g. setting the ascent rate to 10m/min results in an actual ascent rate of 9m/min. This is due to truncating the ascent rate preference, then effectively rounding up the time to reach each stop to 2s intervals. The result being that setting the ascent rate to 10m/min results in 20s to ascend 3m (9m/min), when it should be exactly 18s. Reported-by: John Smith <noseygit@hotmail.com> Reported-by: Rick Walsh <rickmwalsh@gmail.com> Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-03-24Don't erroneously mark the cylinder pressure red - second tryGravatar Stefan Fuchs
Second attempt to do the thing with the red background color for cylinder start and end pressure correctly. This now should cover all scenarios. This rewrites and partitially reverts commit b8e044d Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-03-24Subsurface-mobile: do send decimal GPS to GoogleGravatar Jan Mulder
Sending nicely readable formatted coordinates to Google Maps does not result in a correctly positioned map. Google likes unreadable decimal format. Little hacky solution. Added a gps_decimal attribute, populate that with the standard function for format a coordinate to string, but reset the preferences value temporarly so that it always converts it to decimal style. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: Preferences Defaults renamed to GeneralGravatar Jan Mulder
See commit 25dcee139e. Preferences Defaults renamed to General. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manaul: Preferences Graph renamed to profileGravatar Jan Mulder
See commit 6305361d1477. Graph is renamed to Profile. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: pSCR diving is similar to OC, not CCRGravatar Jan Mulder
See also commit acb38c9e00f2. pSCR is with respect to cylinder planning very similar to OC planning. Obviously, the SAC is much (max. 8x for counterlung ration 1:10) lower, but multiple gasses are common (in all but recreational pSCR diving). Changed the wording to reflect this. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: weird and incorrect paragraphGravatar Jan Mulder
from the planner section the follwing paragraph is weird and partially incorrect: These changes should reflect the cylinders and gas compositions defined in the table with _Available Gases_. If two or more gases are used, automatic gas switches will be suggested during the ascent to the surface. These changes can be deleted by right-clicking the gas change and manually creating a gas change by right-clicking on the appropriate waypoint. Yes: during the ascent, gas switches are automatically planned (not suggested). These can't be deleted by right-clicking (as there are no real waypoints associated with the gas switches). And futher. To delete a gas change you have to manually create one? Solution: refrase paragraph. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: waypoints on profile can be moved using arrow keysGravatar Jan Mulder
Add a sentence in the central section on manual profile entry that waypoints can also be moved by keyboard (arrows). Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: do not repeatGravatar Jan Mulder
Just said that we do not need to plan the ascent. Removed the 2nd ocurrence. Also: trivial typo corrected Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: p02 setting in Available Gases dialog is not possibleGravatar Jan Mulder
The manual suggests that in the Available Gases dialog of the planner, setting of pO2 is possible. This is not the case, and changed the text accordingly. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: set of small changes in planner textGravatar Jan Mulder
Mostly typos and some wording change due to change of UI from working pressure to starting pressure. And some subscripts changed, some correction, some style. Now all are in ~2~ format. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: section is called ProxyGravatar Jan Mulder
Section is called Proxy and nor Proxy Type (which is attribute in the section). Simple incorrect wording fixed. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: changed unclear wording (network preferences)Gravatar Jan Mulder
The old wording suggests that your ISP has something to do with the Subsurface cloud or companion app. This is not right, so did a little rewrite. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: typoGravatar Jan Mulder
trivial 1 letter typo. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24user manual: spell O2 correctlyGravatar Jan Mulder
Spell (p)O2 correctly with a subscript. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24mobile: the infamous enumerate problemGravatar Jan Mulder
This fix seems to fix the enumerate problem: the problem that on a seemingly non-determinstic way, all the profiles get enumerated and rendered, causing freeze of the app, or even crash due to out of memory. Only 3 lines of code change, but this fix did not come easy. The enumerate problem seems some kind of race condition between QML, Kiragami and most definitely, the Subsurface QML code itself. The breakthrough in my debugging was the setting of highlightRangeMode: ListView.StrictlyEnforceRange based on the QML documentation on snapMode: enumeration. This fix deserves proper testing in multiple environments. As could be seen on the developpers mailing list, I was (easily) able to reproduce the enumerate problem, but Rick was not. So I definitely do not claim to understand why this fix solves the issue for me. And as a sidenote: fixes #263 for me as well. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-20Android build: extend comment for Qt5.8Gravatar Jan Mulder
Just an update of comment. The stange issue with Qt5.7.1 is still present in Qt5.8. Extend the comment accordingly. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-20Add 10l 200bar and 232bar cylinderGravatar Stefan Fuchs
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-03-19Tests for minimum gasGravatar Stefan Fuchs
Add automatic tests in TestPlan for minimum gas: - Copy minimum gas result (pressure) to diveplan. - Add cylinder size and working pressure for bottom gas to every dive in TestPlan Hint: Unrealistic cylinder sizes (100l, 200l) have to be used for the very long and deep dives in TestPlan - Add minimum gas check for every dive - Add two additional test dives in TestPlan which produce sane minimum gas results with 24l tank Hint: Deco check for these new dives is commented out at the moment Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-03-19Prevent overflow in minimum gas calculationGravatar Stefan Fuchs
For the "crazy" long and deep dives in "TestPlan" an overflow happened here. Rearranged the calculation to have more margin. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-03-18QML UI: enable caching of the details viewGravatar Dirk Hohndel
This way the dive on either side should be cached. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-18QML UI: don't explicitly position viewGravatar Dirk Hohndel
Instead have the view follow the currentItem. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-18QML UI: make profile drawing less verboseGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-18QML UI: don't unset the currentIndex in the dive listGravatar Dirk Hohndel
It's unclear why this code was added in the first place - removing it makes the highlight of the selected dive in the dive list work. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-18QML UI: don't clipGravatar Dirk Hohndel
At least that's what the QML documentation recommends. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-18QML UI: small cleanupsGravatar Dirk Hohndel
Remove unused signal handler. Small whitespace cleanup. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-18QML UI: don't access members of undefined objectsGravatar Dirk Hohndel
If we don't have a currentItem, don't try to access its members. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-18QML UI: small clarificationGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-18Prefix and suffix changes in preferences and planner preferencesGravatar Stefan Fuchs
In preferences->profile: Move "bar" from text description to entry field (5x) Move "l/min" from text description to entry field Add suffix "%" to GF values Rename VPM-B conservatism In planner preferences: Add prefix "+" to VPM-B conservatism Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-03-18smtk-import fix is_same_cylinder()Gravatar Salvador Cuñat
Add return value to the gasmix condition, and fix the rest of the conditions. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-03-18smtk-import - Change cylinder import logicGravatar Salvador Cuñat
Until now, we did the cylinder import based on its initial pressure (a tank without pressure is an unused tank). Based in this assumption, we just dropped those tanks whose initial press was 0, losing user introduced tank definitions and getting some duplicities due to one cylinder being numbered (e.g.) 2 by libdivecomputer and 3 by SmartTrak. The new workflow is: get every single tank reported by SmartTrak (giving preference to libdivecomputer parsed data), then clean the cylinder table reverse order, dropping tanks without description and init or end pressures, and checkig them against the previous cylinder to do a merge, if they look the same, and try to avoid duplicities. The new logic assumes a heavier workload for the benefit of lower data loss (e.g. a user may get his/her tanks descriptions despite he/she hasn't recorded their pressures because forgot the values or had an issue with the gas transmitter). Suggested-by: Alessandro Volpi <volpial@gmail.com> Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-03-18smtk-import - Remove tank number limitationGravatar Salvador Cuñat
In the past subsurface managed up to 8 tanks, but now it manages up to 20. SmartTrak manages 10 (3 in older no trimix versions) so there is no more need to drop the last tanks. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>