aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2017-04-04QML UI: more hacks for the magicShiftFactor hackGravatar Dirk Hohndel
Since the device pixel ratio can be a fraction we should interpolate the values. I still don't really understand why this is necessary, so this is a hack on top of a hack - but for most values I tried this does seem to give us a reasonably well placed (and well scaled) profile. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-04smtk-import Avoid duplicities in bookmarksGravatar Salvador Cuñat
SmartTrak's bookmarks work in the same fashion Subsurface's do. The user may set a bookmark while underwater or set it just on the divelog software. At this time we are parsing those set in the DC twice, as we get one from libdivecomputer and another from smarttrak's database. This patch just checks if we have a bookmark event downloaded by libdivecomputer which has the same time that the one parsed from the .slg file. If so, merge the names taking the one from smarttrak. Text from smarttrak is preferred because the user may have entered some interesting note there and libdivecomputer's name is just "bookmark". Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-04-04smtk-import Fix wreck data importGravatar Salvador Cuñat
It was assumed that every data field in a wreck table was filled or zeroed. This assumption is actually false, so this patch adds testing for the existence of strings before working with them. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-04-03QML UI: ensure actions are set up for Credentials pageGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-03QML UI: use a scrollable page for StartPageGravatar Marco Martin
Fixes scrolling of the cloud credentials and simplifies code Signed-off-by: Marco Martin <notmart@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-01mxe_build.sh - Rebuild everyth. when switching between debug and releaseGravatar Stefan Fuchs
When switching between debug and release MXE build one needs to rebuild everything. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-04-01Fix mxe-build script to copy correct plugin DLLs for debug and releaseGravatar Stefan Fuchs
For the plugin DDLs: Debug: Only copy *d.DLLs Release: Only copy *.DLLs Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-04-01Add the pressure attribute only if it existsGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Do not convert empty temperatureGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Fix imperial unit conversion on CSV importGravatar Miika Turkia
Math only takes numbers, need to ignore the ft part. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01CSV import: return value only if it existsGravatar Miika Turkia
If the last two fields were empty, we returned the field separator as next to last value. Now we make sure not to return field separator as field value. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Cleanup for CSV testingGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Enable CSV import-export unit conversion testGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Only import weight if availableGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Fix CSV import of cylinder pressuresGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Limit precision for temperature in CSV importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Limit max depth precision on CSV importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Limit mean depth precision on CSV importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01More precision in CSV export for depthsGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Fix size conversion on imperial CSV importGravatar Miika Turkia
We really need the decimal separator to get correct results Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01CSV export: convert cylinder size to imperialGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Export-import test for manual CSVGravatar Miika Turkia
Note that the actual validation of the result is currently disabled, so the tests will pass even though there are some bugs and rounding errors present. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01Change parseCSV to support unit and file selectionGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01CSV export: export only existing temperaturesGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-04-01QML UI: we now depend on QuckControls2Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-01QML UI: replace combobox with custom text field with hintsGravatar Marco Martin
Signed-off-by: Marco Martin <notmart@gmail.com>
2017-04-01QML UI: Fully port dive edit to Kirigami2Gravatar Marco Martin
Completely adapt to the api changes of OverlaySheet in Kirigami2 in order to achieve the same look and behavior for the dive edits that had with kirigami1 Port most components to QtQuickContrls2, except comboboxes in the dive edit sheet that will need a new control type Signed-off-by: Marco Martin <notmart@gmail.com>
2017-03-30Shift fake tank pressures up by 30barGravatar Dirk Hohndel
This is a rather arbitrary value, intended to create actually valid pressure values for Uwatec Memomouse users - since we treat 0bar as invalid pressure value, this simply creates an arbitrary '30bar + delta' to '30bar' consumption graph (since all the Memomouse devices give us is the pressure delta that was used during the dive). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-29Accept 0 as valid endpressure for Uwatec devicesGravatar Dirk Hohndel
Instead of delivering the actual start and end pressure, memomouse gives you a start pressure that matches the delta between actual start and end pressure, and an end pressure of zero. Who the heck knows why it does that, but the information is better than nothing, so we should accept it. Fixes #286 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
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>