Commit graph

6901 commits

Author SHA1 Message Date
Miika Turkia
c7f803b878 Limit pressure and temperature values
Limit temperatures and cylinder pressures to somewhat sensible values.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-18 06:08:37 +00:00
Dirk Hohndel
e157f6220f Don't use DC configuration menu item as preference dialog on Mac
Qt by default uses a rather simplistic text heuristic to figure out if a
menu entry is one of the special ones that need to be moved into the
application menu (About, Preferences, Quit - but for Preferences anything
that matches settings, options, config is used as well).

This patch tells Qt to keep its hands off the the DC configuration entry
in the menu.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-18 06:08:00 +00:00
Dirk Hohndel
d9e8669abe Add new divecomputers to the ReleaseNotes
Of course AFTER cutting Beta 1. Typical.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 23:50:06 +00:00
Dirk Hohndel
91cdb0e2f2 Preparing for 4.3 Beta 1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 22:27:05 +00:00
Dirk Hohndel
44064ba80e Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 22:27:05 +00:00
Dirk Hohndel
99531579e3 Only show tags in filter panel that are actually used
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 21:15:35 +00:00
Lubomir I. Ivanov
609036c570 Ruler: fix weird behaviour near x = 0
RulerNodeItem2::recalculate() does something which is
apparently not a good idea in combination with
RulerNodeItem2::mouseMoveEvent().

Each time the mouse moves, setPos() is called. Then in
recalculate() the x() value is checked and if less than 0
it's changed to x = 0 (setPos(0, y());).

This last call (setPos(0, y());)
however does not work and the value remains less than zero
leaving one of the ruler points outside of the graph.

To solve the issue we add a silly explicit check if x() < 0
before calling setPos() in RulerNodeItem2::mouseMoveEvent().

The 'x() > timeAxis->posAtValue(data->sec)' strangely works
on the other hand.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 21:04:27 +00:00
Dirk Hohndel
c688cc52e8 Update ReleaseNotes
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 19:33:20 +00:00
Dirk Hohndel
6fafd1c781 Updated the included user manual html files
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 19:14:33 +00:00
Dirk Hohndel
25072b60ce Latest strings and translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 18:57:18 +00:00
Dirk Hohndel
3ddbab6847 Clarify the meaning of the values in the stats tab
Extend the tooltips to be shown both on the labels and the values and add
tooltips for all min/avg/max elements.

To avoid confusion when only one dive is selected, no longer show min SAC
or max SAC or min duration or max duration.

Fixes #694

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 18:44:51 +00:00
Dirk Hohndel
f5bea8fcfd Clean up yearly statistics
Remove the unused upper widget, set a somewhat random but at least more
reasonable default size and finally support Ctrl-W and Ctrl-Q shortcuts.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 18:19:51 +00:00
Robert C. Helling
d5d7fdc9af For CCR dives, show plot for diluent and O2 cylinder pressures
Also fixes a bug in the diluent pressure interpolation

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 18:02:42 +00:00
Salvador Cuñat
992e58eaf2 Update spanish translation of user manual to english 7967d2b
Covers CCR APD and Poseidon divelogs and importing.  Already changed
by the time of writing this commit, at least twice.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 14:55:35 +00:00
Salvador Cuñat
651bf5bd69 Update spanish translation of user manual to english 08adb2e
Somehow I forgot to submit this back in October.

Includes the gases pressures bar graph.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 14:55:04 +00:00
Dirk Hohndel
f7efabe425 New strings (and updated translations)
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 14:43:54 +00:00
Dirk Hohndel
8856417b2f Allow translation of the cylinder use strings for the UI
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 14:39:30 +00:00
Dirk Hohndel
0c3f13d128 Add the ability to modify the cylinder use in the UI
Thanks to Tomaz for writing a first draft of the delegate.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 14:03:37 +00:00
Dirk Hohndel
1739042f34 Use cylinder use helper function
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 13:52:22 +00:00
Dirk Hohndel
74582de06c Add helper function to translate cylinder use text to matching idx
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 13:51:19 +00:00
Robert C. Helling
0d7c192e6e For CCR dives, the diluent cylinder is the current cylinder
Change the meaning that _the_ cylinder (as we treat it in OC dives) is the
diluent cylinder (rather than the O2 cylinder). This eliminates special
cases. Now, for CCR, we have to handle the O2 cylinder in addition
(rather than the diluent in addition).

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 11:45:06 +00:00
Dirk Hohndel
5ed4876ad2 Continue cleanup of string copying in equipment
Slowly trying to track down all spots where we copy string pointers
instead of string data. And making sure that we free those pointers before
overwriting them.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 11:30:49 +00:00
Dirk Hohndel
44a154f7da When editing cylinders, copy all relevant data
Maybe it would be better to just copy the whole structure and then clear
the things we don't want to copy? This seems fragile.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 10:45:14 +00:00
Dirk Hohndel
7196176fa0 Correctly copy weight systems on edit
We copied the string pointers instead of copying the strings. Once those
got freed, things went downhill.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 10:41:02 +00:00
Dirk Hohndel
ac9c2ba544 Small modification of the filter description
This seems more important to explain - it's OR within the column and AND
between the columns.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 09:10:46 +00:00
Willem Ferguson
e0c9ebfb23 User manual: text to explain filter panel
Few smaller changes to text dealing with tissue pressures graph

Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 09:10:32 +00:00
Dirk Hohndel
fa181d1ded More CCR code cleanup
Random constants are bad. Let's use the indices that we already calculated
(and true and false if we mean boolean values).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 07:23:20 +00:00
Dirk Hohndel
675646dd2f Update ReleaseNotes.txt
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 06:50:44 +00:00
Tomaz Canabrava
82a946152b 727 fixed
--047d7b8737f87ede8e050803e6b2
Content-Type: text/plain; charset=UTF-8

<div dir="ltr"><br></div>

From 3db4a422485374801ca2f6233ec23b8671a8656d Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabrava@intel.com>
Date: Sun, 16 Nov 2014 23:22:58 -0200
Subject: [PATCH] fix 727 - position correctly the popup.

When the user entered a tag and that made the message box display
the popup with the possible choices was still in the old position
hidding the line edit.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 06:02:21 +00:00
Dirk Hohndel
50ad3f8af9 Add a TODO.CCR file to track what's left to do for CCR support
These are the things I ran into today. I'm sure there are many, many more.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 00:27:21 +00:00
Dirk Hohndel
b0033287b7 CCR test dive
This is an anonymized version of a real dive. With the latest changes the
SAC calculations now make "mostly sense".

What's clearly still broken is the tank pressure graph.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 00:24:33 +00:00
Dirk Hohndel
e1216fafab Translation updates
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 00:23:47 +00:00
Dirk Hohndel
3e5cb7e2aa Fix per_cylinder_mean_depth calculation for CCR
This patch is bigger than necessary because I also renamed the
get_cylinder_use() function to the much more accurate
get_cylinder_idx_by_use().

If we have no gas changes (except for a possible explicit first gas),
(which in the CCR case also means no bailout), this code will give you
correct per cylinder depth and duration for oxygen and diluent and
therefore create more reasonable gas consumption data for CCR dives.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 00:09:59 +00:00
Dirk Hohndel
ee7dd4307a In a CCR dive the diluent and oxygen cylinders are both used
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-17 00:09:19 +00:00
Dirk Hohndel
23304f69c0 Load and save the dc type for CCR dives
Oddly we already had code to load this from XML, but nothing else.
This makes the load from XML work like the rest of our code and adds the
save to XML plus the load and save for the git format.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 23:20:39 +00:00
Dirk Hohndel
202c5cbfeb Save CCR cylinder use in XML and git
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 22:13:12 +00:00
Robert C. Helling
84dc8b8962 Some gas handling improvements
Add a time linear gas interpolation strategy. Some minor changes.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 20:50:16 +00:00
Dirk Hohndel
5034f76072 Latest strings and translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 19:00:45 +00:00
Dirk Hohndel
adc08bba4f Remove bogus strings and add tooltips to filter buttons
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 18:55:27 +00:00
Dirk Hohndel
80bdbc348d Divelist trip text includes the number of dives shown with current filter
But only if not all dives in the trip are shown.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 18:46:07 +00:00
Dirk Hohndel
e5c70de1ee Remove unused DivesFilteredOut variable
It's kinda redundant, anyway, given that we know the total number of
dives.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 18:39:29 +00:00
Dirk Hohndel
05e02b939a Improve the filter logic
The MultiFilter itself should walk the dives in a trip. This way the logic
(OR within a category, but AND between categories) is correctly applied
and the flags in the dives are set correctly (which makes the overall
counts for dives filtered work correctly.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 18:36:42 +00:00
Dirk Hohndel
ad603b6e9f Improve the filter message and placement
This makes the text easier to translate (and more meaningful).
Also modifies its position to be centereed in order to look less "squeezed
into the corner".

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 18:36:42 +00:00
Tomaz Canabrava
7c5c38b154 Addded a min / max layout for the filter, and a filter count
But the filter count seems to be broken for some reason and
I really don't know why. It seems to work for tags, but
not for everything else.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 18:34:47 +00:00
Willem Ferguson
7967d2bec1 User manual: Using CCR equipment with Subsurface.
This is a first stab at some text detailing the import
and handling of CCR dives within Subsurface. Three figures
added.

Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za>Kind
regards,
willem

From da16229327331731794b356b8e8504a4cd160634 Mon Sep 17 00:00:00 2001
From: willem ferguson <willemferguson@zoology.up.ac.za>
Date: Sun, 16 Nov 2014 15:50:44 +0200
Subject: [PATCH] Update user manual with CCR instructions

This is a first stab at some text detailing the import
and handling of CCR dives within Subsurface. Three figures
added.

Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-16 17:18:18 +00:00
Dirk Hohndel
d84f76ae14 Revert "Save cylinder pressure from samples"
This reverts commit 763dfef315.

I didn't pay enough attention when accepting this - it saves redundant
data.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15 09:40:53 -08:00
Dirk Hohndel
499d35f4ff More strings and translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15 08:18:26 -08:00
Miika Turkia
5807e4589f Initial support for Suunto DM5 import
This implements import from Suunto DM5 database, but there is something
wrong with some of the sample dives in the database I received as
sample. It seems that we should detect missing/bogus data and treat it
properly as divelogs.de does with the same dives. Anyway, when we have
proper data, this import appears to produce sensible results.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15 08:15:15 -08:00
Dirk Hohndel
ff193e309c Consistently have a space between file type and extension
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15 08:01:12 -08:00
Dirk Hohndel
adabbb182d Updated strings and translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-15 06:46:23 -08:00