Commit graph

11884 commits

Author SHA1 Message Date
Dirk Hohndel
b60b7c108e Enable manual setting of duration
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-04 12:16:49 -08:00
Dirk Hohndel
e9debdf281 Add helper to parse duration text
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-04 12:16:49 -08:00
Dirk Hohndel
3afc4528b3 Only honor drop stone mode when planning a dive
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-04 12:16:49 -08:00
Dirk Hohndel
03eef5b0c2 Implement manual setting of depth
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-04 12:16:49 -08:00
Dirk Hohndel
74b542ee60 Initial response to entering duration or depth
This marks the UI as modified and updates the maxdepth of the dive; it
ignores changes to the duration, doesn't modify the profile, so it's
nowhere near ready.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-04 12:16:49 -08:00
Dirk Hohndel
ba570c9eea For manually added dives, show depth and duration
So far this is purely informational, you can't edit this.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-04 12:16:49 -08:00
Dirk Hohndel
05b53d6204 Add depth and duration fields to maintab
And hide them for now. This doesn't change anything visible, it's just
putting in place the pieces for later use.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-04 12:16:49 -08:00
Dirk Hohndel
813ccb24f9 Update translation source strings
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-04 12:14:43 -08:00
Martin Měřinský
b14301a84c heartrate, heartbeat > heart rate 2017-03-04 12:08:17 -08:00
Martin Měřinský
869a7fcfcc dive master > divemaster 2017-03-04 12:08:17 -08:00
Martin Měřinský
5fa64fd1ea SankTime > Sank Time 2017-03-04 12:08:17 -08:00
Martin Měřinský
59d18a00db divecomputer > dive computer 2017-03-04 12:08:17 -08:00
Martin Měřinský
67bba5d1c2 cu ft > cuft 2017-03-04 12:08:17 -08:00
Martin Měřinský
46e956aede ppO2 > pO₂ 2017-03-04 12:08:17 -08:00
Martin Měřinský
fccfb968c1 Consistent 'salt water' versus 'fresh water'. 2017-03-04 12:08:17 -08:00
Jan Mulder
7f4b0079f8 user manual: do not repeat
Just said the same thing (CSV file can be edited with a text editor). Too
verbose imho.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
d380795deb user manual: make the difference between import and open explicit
Two different menu path lead to "open a logfile". The File-Open-Logfile
and Import-Import Logfile. The first opens a new logbook, and the second adds the
data to the current log.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
69277afa0e user manual. Add 2 supported import file types
Divesoft dive logs and Poseidon MK VI eCCR dive logs where not listed
as supported, but they are.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
3c2f2c6988 user manual: downloading here
Lets try to be consistent. A dive computer can be in upload mode, and is uploading, but
seen from the host PC, we are downloading.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
c5bae2ea5a user manual: try to describe the add of location the way it is
The here edited section is confusing. It references double clicking,
which does not work in 4.6 (and not sure it ever worked)

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
c204eefaae user manual: do not repeat
Do not repeat the almost same text in the next sentence.

When entering a dive location name, auto location of
dive site names makes it easy to select an existing dive site name.

When typing the name of a dive site,
a dropdown list appears showing all sites with similar names.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
84d34e8b22 user manual: date/time instead of only date
Date and time of the dive are two seperate fields.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
f5b98557d4 user manual: correct upload vs download
When importing from a divecomputer, we are downloading.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
ebac9ea6ce User manual: clearify the use of shortcuts
The way keybord shortcuts work is confusing. 2 ways are used:
- denoted as ctrl-? for some of them
- denoted as underlined character in menu items, proabably language
dependent, and inconsistent.

Despite all this, try to describe it in the manual as it is.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
8c559409c6 User manual: https where we can
http is so 1984 :-)

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
77a611d562 User manual: manual added gas changes have effect to the right
Manual added gas gas changes have effect to the right of the profile, not as erroneously
stated to the left of the point of gas change.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
57f4ae2fce user manual: correct main menu items
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Jan Mulder
c663bed4a3 User manual: minimal Windows 7 from 4.6 onwards
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-04 12:07:12 -08:00
Stefan Fuchs
7eda24d6b1 Correct "set-point" -> "setpoint" and window title setpoint change
Change 2x "set-point" to "setpoint".
Correct window title for "Add setpoint change" window.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2017-03-04 12:04:20 -08:00
Jeremie Guichard
b9a3dfb86b Rework TestParse to make tests independent from each other
In the original version, parsing and comparing output was
done in separate test methods. This was forbidding use of
QTest cleanup to call clear_dive_file_data().
As a side effect a failure in one test would make other tests
failing too (since call to clear_dive_file_data was skipped
by QCOMPARE failure).

Added a FILE_COMPARE macro to avoid code duplication.

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-03-04 12:03:33 -08:00
Jeremie Guichard
5caa9b23fe Use QTest cleanup method for proper test shutdown
In case of QCOMPARE failure, code following the comparison
is not executed, this results in application state not being
properly resorted and often gives several test failures,
when only one test really fails.
Using QTest cleanup method allows restoring proper state,
before next test is executed.

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-03-04 12:03:33 -08:00
Jeremie Guichard
16a321d43b Use proper QTest initialization method in TestGitStorage
Method originally called testSetup is more a precondition
to test execution rather than an actual test.
QTest recommends to use initTestCase for that purpose.

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-03-04 12:03:33 -08:00
Jeremie Guichard
7329629b6e Use proper order in QCOMPARE arguments
Expected value is the second argument of QCOMPARE,
having the arguments in the right order avoid confusion
when looking at error message in case of test failure.

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-03-04 12:03:33 -08:00
Dirk Hohndel
c8065a0275 Update README for 4.6.3
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-01 21:54:51 -08:00
Dirk Hohndel
22f1dab3ab Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-03-01 21:44:11 -08:00
Dirk Hohndel
a00e7b0452 Another update to the ReleaseNotes
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-28 22:23:15 -08:00
Dirk Hohndel
120ea25b6a Update Russian user manual
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-28 22:22:53 -08:00
Miika Turkia
0a1224b693 Fix imperial conversion for weight on CSV export
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2017-02-26 11:30:32 -08:00
Robert C. Helling
0eb42b35b8 Call the cylinder working pressure "starting pressure" in planner
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-26 08:20:31 -08:00
Dirk Hohndel
01874e158f Update translation source strings
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-25 10:53:11 -08:00
Jeremie Guichard
f28aab7bd9 Fix trailing '\r' test failure on Windows
Windows implementation of fwrite changes \n to \r\n
for files opened in text mode.
It caused failures in TestMerge and TestParse when
comparing written files against reference data.

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25 09:24:23 -08:00
Jeremie Guichard
08bc1edc81 Improve install and test rules for Windows test execution
Update install rules to create a staging_tests folder
for easy deployment to test target.

Update test rules for compile time testing
when wine is available on build machine.

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25 09:24:23 -08:00
Jeremie Guichard
e418bb7e28 Fix dlllist.cmake not to use hard coded path to link.txt
The utility could be used for other targets,
path should therefore depend on the inputted target parameter

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25 09:24:23 -08:00
Jeremie Guichard
7b08f8d23c Move CMake variables printing into a utility macro
Added cmake_variables_helper.cmake providing 2 helpers
 - print_variable
 - print_all_variables

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-25 09:24:23 -08:00
Salvador Cuñat
c2997c33c7 smtk-import: Fix freeing unallocated memory
hdr_buffer pointer was not always allocated (just on dc dives), but was
always freed.
This should cause a crash while processing a manually added dive (or a dive
whose dc model couldn't be stablished), but not always does, crashes only
if the pointed memory hasn't been previously allocated. In most cases causes
memory corruption, which goes easily unnoticed as it is correctly freed in
next parse run.
This means, obviously, I have some work TODO fixing leaks with valgrind.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2017-02-25 09:19:48 -08:00
Jan Mulder
0f56a1e4bf Add 4 file types op file-open logbook menu filter, consistency
4 file types (that are very rarely used), did showup in the
import-import dive logs menu (e.g. the file filter), but were
missing from file-open logbook file type filter.

Just added them to the file-open part to be more consistent.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-02-25 09:18:53 -08:00
Jan Mulder
7165cb473a Correct file list in file-open filter box
Some missing ;; caused the filter on filetypes in open-open logbook to be garbled.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-02-25 09:18:53 -08:00
Dirk Hohndel
404b0fa16f First pass at ReleaseNotes for 4.6.3
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-24 01:40:40 -08:00
Dirk Hohndel
a3a23f63a6 Add subsurface_stat for Mac
Which is also used on iOS.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-24 01:14:39 -08:00
Jeremie Guichard
5ed93a9d9e Fix "Load/Save to cloudstorage" for non-ASCII user names
On Windows that would fail because stat() doesn't deal well with our
utf8 strings.

Added new subsurface_stat() portability function to replace stat().
Added Windows implementation of subsurface_stat() using wstat(),
with conversion to ut16 of the inputed path.
Other platform implementations (linux, android) make use of the normal stat().

Added non ASCII test case in TestGitStorage::testGitStorageLocal()

Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-02-24 01:10:22 -08:00