Commit graph

7531 commits

Author SHA1 Message Date
Robert C. Helling
e03c5ce8e9 Take gas consumption into account for recreational mode
If there is valid gas information (cylinder size and starting pressure),
also ascent before gas runs out (taking a 40bar reserve into account).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-04 10:21:40 -07:00
Dirk Hohndel
acaedee159 cmake: make Windows binary a GUI app
This way we don't get the annoying terminal window

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-03 12:36:30 -07:00
Dirk Hohndel
3dac769c33 cmake: correctly link against CoreServices
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-03 12:34:23 -07:00
Dirk Hohndel
6a466d0cfb cmake: build working Windows installer including all the DLLs
Figure out the DLLs we need to include in the installer before building
the installer executable.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-03 10:05:05 -07:00
Robert C. Helling
61ff7c5f8b Only do safety stop of dive has at least max depth of 10m
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-02 09:46:10 -07:00
Robert C. Helling
cc8d601422 Checkbox and preference for safety stop
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-02 09:46:10 -07:00
Joakim Bygdell
cd34fea1db Add 3min safety stop
Fixes #839

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-02 09:46:08 -07:00
Robert C. Helling
8571dcf967 Introduce recreational planner mode
This adopts the planner to the needs of the recreational diver. Rather than immediately
starting to ascent doing deco stops this mode, this mode stays at the last manually
entered depth for the maximal time before mandantory stops appear (NDL). It does not
change gas but keeps using the last used cylinder.

TODO: * Grey out unused UI elements of the planner in this mode
      * Start ascent before gas runs out (or into reserve)
      * Do a 3min @ 5m safety stop.

Fixes #840

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-02 09:45:50 -07:00
Dirk Hohndel
297ddf666d cmake: add installer target for creating Windows installer
Silly cmake doesn't allow a target to depend on the install target. This
ugly hack appears to be the recommended workaround :-(

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-01 14:44:21 -07:00
Dirk Hohndel
70527ac83a cmake: setup .nsi file when cross building for Windows
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-04-01 13:36:20 -07:00
Dirk Hohndel
1b0d0687f8 cmake: first stab at installing cross built Windows files into staging
From there it can then be assembled as an installer.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-31 14:07:09 -07:00
Dirk Hohndel
1e03edf60d cmake: remove debug output that snuck into an earlier commit
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-31 13:42:03 -07:00
Dirk Hohndel
d9a6acf4be cmake: add Qt translation files
Not doing anything with them, yet.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-31 13:39:09 -07:00
Dirk Hohndel
499aeaf645 cmake: create translations and correctly install them
The previous attempt to install them was completely bogus as it only
worked when the source directory had previously used for an in-source
build using qmake.

Oops.

With this change we now create the translations in the build directory and
install them from there.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-30 16:06:56 -07:00
Dirk Hohndel
eecf40c121 cmake: fix Documentation build and install
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-30 14:43:15 -07:00
Robert C. Helling
ec0de54450 Make the image hashing non-blocking again
...it had become blocking with 1e3700c1

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-30 13:04:01 -07:00
Robert C. Helling
57192063c4 Protect writing to image hashes with a mutex
Hopefully...

Fixes #861

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-30 13:03:56 -07:00
Miika Turkia
03fc9e3c26 Fix a bug in detecting CSV file content
NL should be set only if there is an empty line in the input file. That
way the return if no empty line exists (simplistic test for Seabear CSV
file) makes more sense.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-30 12:55:36 -07:00
Lubomir I. Ivanov
bc44dd8db1 maintab.cpp: fix editing dive profiles from trips
Once a manually added dive is part of a trip and this trip
is edited, applying the modifications leaves the dive profile
in edit mode (e.g. points can be dragged and gas swapping can
be applied).

The issue can be viewed from another angle. Why enable
profile edits of a manually added dive which is in a trip,
while the trip is being edited in the first place?

If there are more than one manually added dives in said trip
we are enabled to edit one of the dive but probably
it's not intended to modify all manually added dives after the
changes are applied for the trip.

This patch disables the functionality in question and it also...

Fixes #864

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-30 12:54:36 -07:00
Gehad elrobey
4122387208 Manual added dives edit button is missing
once the manual added dive is added it can't be edited directly, This
can be fixed by adding an edit button to the log menu, this will be
consistent with the plan/replan buttons.

Fixes #847

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-30 12:53:09 -07:00
Dirk Hohndel
e2a0a51b29 cmake: implement "make install" for Linux
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-30 12:50:52 -07:00
Dirk Hohndel
f956d6291f cmake: make CMakeLists.txt more readable
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-26 13:50:28 -07:00
Dirk Hohndel
3378894291 cmake: add CoreServices framework for Mac
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-26 12:52:48 -07:00
Dirk Hohndel
c41b1dc688 cmake: add support to compile for Windows and Mac
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-26 12:25:26 -07:00
Dirk Hohndel
0a4444930e cmake: use DEFINED instead of comparing to ""
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-26 12:24:19 -07:00
Dirk Hohndel
4309ab4a16 cmake: setup marble link directory correctly
This way the necessary rpath settings are created

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-25 15:02:21 -07:00
Dirk Hohndel
405e52fef9 cmake: handle libzip like the other libraries
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-25 14:48:02 -07:00
Dirk Hohndel
24a1ab461b cmake cleanup
- don't reference .so files, reference libraries
- handle libdivecomputer just like the other libraries
- add the ability to link libdivecomputer statically

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-25 14:31:42 -07:00
Gaetan Bisson
5bf23381e0 Save more planner settings into prefs
This adds to the prefs struct the variables last_stop, verbatim_plan,
display_runtime, display_duration, and display_transitions from the
planner so their values are saved from one session to the next.

The widgets for some of those settings had default values in
plannerSettings.ui; remove them since the new code in
subsurfacestartup.c takes care of initializing them.

Signed-off-by: Gaetan Bisson <bisson@archlinux.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-25 09:45:46 -07:00
Gehad elrobey
3ff73d0a66 HTML: don't collapse the dive if hyperlink is clicked
fixes the wrong behaviour as dive details must not be closed when
hyperlinks are clicking, So check for Hyperlinks before toggling the
dive.

Fixes #713

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-25 02:34:29 -07:00
Marcos CARDINOT
605d2f7386 MultiFilterInterface - initilize member + remove extra ;
initialize member 'anyChecked' in the constructor

Signed-off-by: Marcos CARDINOT <mcardinot@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-25 02:28:22 -07:00
Marcos CARDINOT
135e834019 DivePlannerPointsModel::recalc - initilizes member
Non-static class member recalc is not initialized in the constructor

Signed-off-by: Marcos CARDINOT <mcardinot@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-25 02:28:02 -07:00
Marcos CARDINOT
0bf61844e7 DivelogsDeWebServices::multipart - initializes member
Non-static class member multipart is not initialized in the constructor

Signed-off-by: Marcos CARDINOT <mcardinot@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-25 02:27:53 -07:00
Claudiu Olteanu
dc32d447c3 Fix a memory leak in parser-xml
Free the temporary memory alocated for a cobalt location.

Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-24 09:46:56 -07:00
Claudiu Olteanu
c46bbf3b5e Clean req.txt file path
This patch cleans the path allocated for req.txt file path.

Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-24 09:46:46 -07:00
Claudiu Olteanu
d7f4ea66c2 Fix memory leaks on Cochran file
Free the buffer before terminating the process.

Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-24 09:46:26 -07:00
Claudiu Olteanu
15704da703 Remove some white spaces
Make this code compliant with CodingStyle

Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-24 09:45:39 -07:00
Claudiu Olteanu
1e22f5ea29 Resolve some memory leak on datatrak source
The result of byte_to_bits should be freed by the caller.
This patch frees the memory allocated by that function.
Also there were some memory leaks in data_import and
read_file_header functions when an error occured.

Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-24 09:45:18 -07:00
Salvador Cuñat
c8583fcea3 Improve error management
Show error messages in main window, instead of stdout.
Use translated strings.
Remove redundant error message.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-23 08:40:48 -07:00
Lubomir I. Ivanov
120088fd16 CodingStyle: add an extra line for the braces explaination
The extra call "dosomethingelse()" is added with the
intention that user will not be confused to add braces
around single lined "if" conditions.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-23 08:40:32 -07:00
Dirk Hohndel
2ffdb8945f Update CodingStyle
Initializers were not documenting what we actually do.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-23 05:54:16 -07:00
Miika Turkia
86ac7fdf47 Import support for new Seabear format
This add support for Seabear's new import format that is used by H3 and
T1. In the future also the Hudc  should switch to the new format. The
main difference to the old one is that time stamps are no longer
recorded in the samples, but intervali is specified in the header.

The header contains other useful information as well that we should
build support for. E.g. surface pressure, gas mixes, GF, and mode might
be useful additions later on.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-23 05:44:06 -07:00
Miika Turkia
cb49c37b31 Fix Seabear new line detection
We need to take both \r\n and \n new line formats into account before
failing Seabear validity check on import. (Seabear file has empty lines,
if import file does not have one -> return.)

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-23 05:43:52 -07:00
Marcos CARDINOT
384b9dd09b File.c - Missing break in switch
Simple control flow issue. Missing break in switch.

Signed-off-by: Marcos CARDINOT <mcardinot@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-23 05:38:17 -07:00
Marcos CARDINOT
b5e9663af8 load-git::walk_tree_file - missing break in switch
Let's be consistent and avoid potential future bugs.

Signed-off-by: Marcos CARDINOT <mcardinot@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-23 05:36:13 -07:00
Claudiu Olteanu
1982bdb9fc Implement handler for cancel button of Save As dialog
When an user opened the "Save as" dialog and pressed the
cancel button a null string was returned. Therefore the
file_save_as function returned an error which was lately
shown when the file_save function was called.
Now the function checks if the cancel/exit button was
pressed and returns.

Fixes #844

Reported-by: longjohnsilver
Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-21 11:20:46 -07:00
Joakim Bygdell
90905601c5 GUI fix for OSX. Reduce the padding of the divelist header so that we don't obscure the first dive in the list.
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-21 11:12:13 -07:00
Marcos CARDINOT
056b4baf11 Prevent crash when clicking re-plan without selected dive
test case:
1 - make sure that you DO NOT have anything selected on the 'Dive list;
2 - in the menu bar, click on 'Log'->'Re-plan dive';
3 - crash!

Fixes #858

Signed-off-by: Marcos CARDINOT <mcardinot@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-20 09:57:53 -07:00
Marcos CARDINOT
70b4c9f2d3 RulerItem2::settingsChanged() - NULL pointer dereference
The current code is dereferencing the null pointer 'profWidget'.
It can cause a segmentation fault.

Signed-off-by: Marcos Cardinot <mcardinot@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-19 15:34:10 -07:00
Marcos CARDINOT
d500f56d6f TableView - improving the column width calculation
Even that most (or all) tables have the remove button at the section 0, the method defaultColumnWidth should not assume that it will always be true.

This patch will consider the title width of each section, instead of using a static width (which cause problems when the language is not en).

Signed-off-by: Marcos Cardinot <mcardinot@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-03-19 15:33:16 -07:00