Commit graph

9265 commits

Author SHA1 Message Date
Dirk Hohndel
5f2f415cdb Add pHe and pN2 plotting
Adjust the color for pN2 to the standard for this gas (black). We keep pO2
green (even though the ISO 32 color for that would be white). pHe is
marked in brown (which is the matching standard color).

Calculate correct partial pressures for the synthetic plot info points at
the beginning and end of the dive.

Minor fine tuning to the positioning / scaling of the temperature plot
when partial pressures are plotted.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-01 15:39:15 -07:00
Dirk Hohndel
f806cdbe2e Fix the pO2 calculation when diving with air
So few of my dives are on air that at first I didn't notice - but for
those dives we set the o2 permille to 0 - which of course causes incorrect
(and extremely deadly) pO2 of 0...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-01 12:05:31 -07:00
Dirk Hohndel
01fd6a57bc Add vertical space to depth plot if we are showing partial pressure graphs
Fairly simplistic change that modifies the way we calculate the "maxdepth"
for a particular dive as that is used to scale the plot vertically.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-01 11:44:18 -07:00
Dirk Hohndel
bdc6b6ba24 Change preferences into a notebook and add second page for tec settings
Not sure this is the best naming scheme (General Settings / Tec Settings)
but it's a start.

The idea is to have the settings that a recreational diver might care
about on the first page, and all the other stuff on the second one. Let's
see how this works out long term. For now I moved OTU over and added
toggles for the different partial pressure graphs (only the pO2 one is
implemented so far).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-01 11:11:05 -07:00
Dirk Hohndel
1b606ae226 First stab at plotting a pO2 graph
So far this is done unconditionally. This already starts some of the
infrastructure for other gases, but so far only O2 is handled.
We also need a pressure scale on the right to make this useful - or we
need to do peek / trough pressure prints like we do for temperature and
depth.

Finally, I think I want to move the plot further down, maybe make the
whole plot area taller if we are plotting partial gas pressures as well.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-01 10:04:12 -07:00
Dirk Hohndel
072b4f743c Merge branch 'dc-device-selector'
Bring the device selector (when downloading from a dive computer) into
master.
2012-10-31 16:53:05 -07:00
Dirk Hohndel
ee5c31d292 Show drive name after the drive letter on Windows
In the device selector when downloading from a divecomputer add the drive
name that we have been looking for (so far that's only "UEMISSDA") to the
drive letter - this should make it easier for people to figure out why
there is a drive letter offered as an option.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-31 16:51:04 -07:00
Lubomir I. Ivanov
ab8af0bdeb windows.c: added device retrieval from subsurface_fill_device_list()
subsurface_fill_device_list() now goes trough the list of registry
entries in the SERIALCOMM key and adds all present values (such as
COM1, COM2) to a GtkListStore. Once done the function compares
all logic drive label to a static list of known DC labels,
such a 'UEMISSDA', which is the only present one at the moment
and adds any matching drive letters (e.g. C:\, H:\) to the list store
as well.

If no serial ports were added or no matching logical drives were found
the function simply adds a default entry named "COM1".

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2012-10-29 13:16:46 -07:00
Linus Torvalds
2d4fee7985 Fix merging of weight systems
I just tried downloading some duplicate dives I had on my second dive
computer, and it all "just worked" and subsurface merged them for me.
Almost perfectly.

I say "almost", because in merging them, it threw my old weightsystem
data away, due to that not being merged.

Also, it was a perfect merge only because the computers are so similar
that they just line everything up - same water activation logic, same
sample interval, same pretty much everything. So while I know the
sample merging is not really the right thing to do (it was designed to
get the "merge the exact same dive from the same computer" case
right), it worked well enough for this particular case. I'll look at
something better later.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-29 11:46:33 -07:00
Dirk Hohndel
029db4aae2 Add depth scale to the dive profile
This is intended to be unobtrusive, but add more information for people
who aren't satisfied with the numeric value we put inside the plot to mark
local peaks and troughs.

See ticket #9

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-29 10:56:20 -07:00
Reinout Hoornweg
913cc48eb9 Updates to the Dutch translation
Added missing translations.
Reviewed and fixed strings marked fuzzy.
Changed date-format to something resembling the usual Dutch notation.
Changed names of months to lowercase.
Changed translation of divemaster from diveinstructor to diveleader.
Fixed some typos.

Signed-off-by: Reinout Hoornweg <reinout@xs4all.nl>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-28 16:40:42 -07:00
Dirk Hohndel
01f1ccff14 Add support for visibility tracking and allow manual entry air temp
Turns out we had a data field for visibility as a length unit - but never
used it. I can never guess how much visibility we actually had on a dive -
but I think most everyone can assign a rating between abysmal (zero stars,
"I couldn't read my dive computer even right in front of my mask" - trust
me, I had some of those dives) to amazing ("five stars, I could see farther
than I though possible" - and I had one or two of those, too). So I
changed this to an integer and am re-using the star infrastructure we have
for the overall dive rating.

When displaying this I was dismayed that we are running out of space in
the "Dive Notes" notbook. So I moved this to the "Dive Info" notebook.
This is not consistent and not logical. I think we need to revisit the
notebooks and think about what we want to display where.

While adding the infrastructure to manually enter the visibility I went
ahead and added the ability to manually enter the air temperature as well
(that was one of the things missing in the previous commit).

Fixes #7

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-28 16:03:03 -07:00
Dirk Hohndel
601ac0c362 Display air temperature in the info notebook page
So far we don't parse air temperature data via libdivecomputer. Nor are we
set up to allow the user to manually enter it. We can parse it when
downloading from a Uemis Zurich, though.

This feature was suggested via trac.hohndel.org; this commit implements
only part of what is requested there, so I simply reference the ticket
here without closing it.

References ticket #7

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-28 13:17:12 -07:00
Dirk Hohndel
2de6f79635 Improve the dive computer device selection
We try to identify devices that are connected and their matching device
names (and mount paths in the case of the Uemis Zurich). Those are
presented as a drop down menu to choose from. The user can still override
this by simply entering a different device / path name.

On Windows this is not functional. How do I find out which drive letter
corresponds to the USB device named "UEMISSDA"? Similarly we need code
that finds serial ports that are present. For now we once again default
to COM3 (so this isn't a step back, but of course it's far from what we
want).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-27 21:12:14 -07:00
Dirk Hohndel
b63a5f0de6 Correct handling of O2 values below 21%
We incorrectly "fixed" those to be 21%. Not useful when diving trimix.

Fixes #4

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-27 18:04:20 -07:00
Stéphane Raimbault
2be4a9f961 Updated French translation reviewed by Pierre-Yves Chibon
Signed-off-by: Stéphane Raimbault <stephane.raimbault@gmail.com>
2012-10-27 02:44:48 +02:00
Dirk Hohndel
d88c69b97a Merge branch 'uemis-next'
No reason to keep this in a separate branch. If we decide to make a 2.1.1
release we'll simply cherry pick only the fixes.
2012-10-25 20:21:43 -07:00
Dirk Hohndel
b8a4730661 Expand Uemis Zurich download support
With this commit we not only use the getDivelogs command but also the
getDive command for each of the dives that was downloaded. Oddly, that
makes quite a bit of redundant (and at times slightly contradictory) data
available, but also many new things.

We now get weight, suit and notes that were stored with a dive in the
logbook on the divecomputer. There are a ton more data available that we
don't use, yet. For example information about altitude, a decoindex, dive
type and dive activity, other equipment information, etc.

I still need to decide how much of this I want to make available in
Subsurface (and how I want to present this - after all most of this is not
available from other dive computers).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-25 20:15:39 -07:00
Dirk Hohndel
d5ac38d9ed Allow debug output to go either to log file or to stderr
This makes it easier to debug things in a debugger, but the infrastructure
to send out debug builds where an end user can send in a useful logfile is
still in place.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-25 20:12:44 -07:00
Stéphane Raimbault
ac723ace81 Missing white-space in Select Events title
Signed-off-by: Stéphane Raimbault <stephane.raimbault@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-25 11:40:43 -07:00
Lubomir I. Ivanov
117008a007 Added confirmation dialog when deleting dives and trips
divelist.c:
Show a "Yes/No" confirmation dialog when performing delete/remove
operations for dives and trips.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-24 10:32:25 -07:00
Lubomir I. Ivanov
b9649f06fe Removed the delete option by right clicking on "Dive Info"
info.c
- Removed the additional pop-up menu entry "Delete"
- Removed the delete_dive_info() function, which created
the yes/no dialog.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-24 10:32:13 -07:00
Lubomir I. Ivanov
aec904b612 info.c: Make sure we only edit when there is dive selection
1) info.c: always check for "amount_selected > 0" before calling
edit_multi_dive_info().

2) populate_popup_cb() should only add the "Edit" and "Delete"
items if there are dives are selected

3) in info_menu_delete_cb() we clear the selection, therefore
we need to set "amount_selected" to 0.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-24 10:31:56 -07:00
Ďoďo Ivanecký
6ea59895ad Updated Slovakian translation
Signed-Off-By: Jozef Ivanecký (dodo.sk@gmail.com)
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-23 20:45:49 -07:00
Dirk Hohndel
48e7575741 Bump version to 2.1
Getting ready for the release

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 20:57:57 -07:00
Dirk Hohndel
8eb15ee324 Update the README with better introduction to Subsurface
This is similar to what we have on the website.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 20:54:45 -07:00
Dirk Hohndel
8f8942f315 Add Uemis section to the user manual
This gives some information on some of the oddities when downloading from
a Uemis Zurich.

Also run a spell checker against the user manual.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 20:53:04 -07:00
Dirk Hohndel
74c94da16d Add the Spanish translators
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 20:31:36 -07:00
Dirk Hohndel
cc3a613b08 Updates to the Spanish translation
This is the result of a joined effort of several people. Thanks to
Pablo Garcia Castro <freixido@gmail.com>
Matthias Kaehlcke <matthias@kaehlcke.net>
Sergio Schvezov <sergiusens@ieee.org>
Auni Somero <aunims@gmail.com>

Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Signed-off-by: Sergio Schvezov <sergiusens@ieee.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 18:36:18 -07:00
Lubomir I. Ivanov
0c2309c656 Small re-wording in the Bulgarian translation
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 11:36:35 -07:00
Lubomir I. Ivanov
77afa1bc93 Use the 'star_strings' buffer to set combo box entries for rating
info.c: extended_dive_info_widget() was still using the
precompiler macros instead of the 'star_strings' buffer,
which may end up being modified if the unicode stars are
not supported on a certain OS (UTF8_FONT_WITH_STARS).

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 11:36:31 -07:00
Henrik Brautaset Aronsen
e77e5e1810 Norwegian translation update.
With libdivecomputer events.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 10:47:40 -07:00
Jozef Ivanecký
e5faf86f5b Update Slovak translation
Signed-Off-By: Jozef Ivanecký (dodo.sk@gmail.com)
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 10:14:05 -07:00
Miika Turkia
a93d6e1853 Added primary translator to fi_FI.po
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 09:46:48 -07:00
Martin Gysel
bebcbfac6b update de_CH translation
use SAC everywhere, use 'O₂' instead of 'O2' since we have it in unicode
add missing translations

Signed-off-by: Martin Gysel <me@bearsh.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 09:43:29 -07:00
Lubomir I. Ivanov
35bd49d210 Updated Bulgarian Translation
- Added libdivecomputer texts
- More small typo fixes

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 09:41:20 -07:00
Sergio Schvezov
d443599b95 Improving Spanish translation
The Spanish translation was previously automatically translated by
Google Translate. This work is an intent on improving upong that
translation and adding to the missing translations to the
untranslated strings.

The poedit tool was used to improve the translation, which reformated
the es_ES.po somewhat.

Signed-off-by: Sergio Schvezov <sergiusens@ieee.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-22 09:35:52 -07:00
Dirk Hohndel
f5ba851c1b Hopefully the last update to the po files before the release
This one breaks with my preference to separate generated changes from
content changes - I wanted to get the new comment next to the
translator-credits text that I added to every .po file. This way the
people who worked on these translations at least get shown in the About
box. But a simple grep on the diff will show you that this is indeed the
only set of changes that I made.

git diff HEAD^ | grep ^+ | grep -v -e^+# -e^+++ -ePOT-Creation

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 21:12:51 -07:00
Miika Turkia
25ddf1caee Map JDiveLog alarms to Subsurface events
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 20:46:50 -07:00
Dirk Hohndel
dbafd6cec6 Merge branch 'master' of http://ambre.pingoured.fr/cgit/subsurface
Get Pierre's latest French translation updates
2012-10-21 20:46:02 -07:00
Dirk Hohndel
315225afb4 Fix annoying whitespace damage that I just introduced
Remember: don't push before doing a git log -p

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 20:44:29 -07:00
Dirk Hohndel
c9226758d4 Small updates to the README
Mention the specific libdivecomputer version needed (0.2).
References to additional documentation.
Remove distracting info from the flow of the text and add a Credits section at
the end.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 20:37:43 -07:00
Dirk Hohndel
79d204dde8 Add quick script to automate Mac dmg creation
This basically automates what is documented in the README

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 13:40:35 -07:00
Pierre-Yves Chibon
cff31db134 Update French translation
Harmonize the translations on the stats tab, let's be consistent on
where we use abbreviations and which one we use.


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
2012-10-21 21:39:04 +02:00
Dirk Hohndel
b1dbdf6322 Fixed French translation
One message had the wrong number of format strings.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 11:52:30 -07:00
Dirk Hohndel
75d0aee907 Merge branch 'translation' of http://ambre.pingoured.fr/cgit/subsurface into translation 2012-10-21 11:51:45 -07:00
Miika Turkia
0f6eb9f12b Updated Finnish translation
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 11:45:21 -07:00
Dirk Hohndel
016365c5f1 Fix the way we handle translated event names
Here is what Linus reported:

 I think you have made a mistake in trying to translate some of
 libdivecomputer.c

 Translating some of those things based on locale is *wrong*, because
 they are saved in the XML file.

 That covers at least the warnings: they'll get translated when you
 import them, and then saved to the XML file as that translation, but
 now if you start subsurface in another locale, they will not get
 translated back.

 So translating XML file contents is fundamentally buggy. It just
 shouldn't be done.

 So all the "translations" for the event handling are buggy, and
 generate crap. Please don't do that. Leave them as English.

And of course he is absolutely right. However, instead of not translating
them at all, this commit fixes things a better way - we now mark the
strings for translation but store the original English strings everywhere
(in the in-memory data structure as well as in the XML file). Only when we
actually display something on the screen (in a tooltip or in the filter
dialog) do we actually translate the strings into the native language.

This should address both Linus' issue and the desire to have localized
event texts.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 11:40:30 -07:00
Pierre-Yves Chibon
2b00e6ae00 Update french translation
Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
2012-10-21 15:33:14 +02:00
Dirk Hohndel
e47b52ecdb Bump version to 2.1-rc3
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-10-21 01:27:49 -07:00