Dirk Hohndel [Mon, 24 Oct 2011 19:24:51 +0000 (12:24 -0700)]
Annotate Makefile with hints about building under Windows
You can build subsurface with MinGW. It requires installing lots of random
packages, plus some things still don't work. One is that xml2-config
appears to be missing. So this annotates the Makefile to tell a person
building under Windows how to work around this. But we can't make this
platform conditional as this workaround is hardcoding the install path.
Linus Torvalds [Mon, 24 Oct 2011 08:23:09 +0000 (10:23 +0200)]
Subsurface 1.1
We've added a fair amount of features since 1.0 (like multi-tank) and
we've made things a lot prettier and supports editing much more
information. So let's make a new release.
Linus Torvalds [Mon, 24 Oct 2011 05:03:22 +0000 (07:03 +0200)]
Merge branch 'ui' of git://github.com/dirkhh/subsurface
* 'ui' of git://github.com/dirkhh/subsurface:
Disable sorting by dive number
Fix oversight in preference implementation
Make columns for temperature, cylinder, and nitrox optional
Show dive number in dive list
Improve time marker handling and add printing of some time labels
Dirk Hohndel [Sun, 23 Oct 2011 21:23:58 +0000 (14:23 -0700)]
Fix oversight in preference implementation
Not being careful enough doing copy and paste and then making manual
changes... this inconsistency caused subsurface to always store the
opposite of what you wanted in the preferences for SAC and O2%.
Dirk Hohndel [Sun, 23 Oct 2011 15:04:54 +0000 (08:04 -0700)]
Improve time marker handling and add printing of some time labels
We now draw time markers at most every 5 min, but no more than 12 markers.
For convenience we do 5, 10, 15 or 30 min intervals.
This allows for 6h dives - enough (I hope) for even the craziest divers -
but just in case, for those 8h depth-record-breaking dives, we double the
interval if this still doesn't get us to 12 or fewer time markers.
We label the first and then every other time marker with the minute text.
Linus Torvalds [Sun, 23 Oct 2011 14:52:45 +0000 (17:52 +0300)]
Handle 'gas change' events correctly
Dirk wrote the multi-cylinder support assuming that the dive computer
always gives the selected cylinder index in the sample data - that's
what his Uemis does, and it makes sense for any dive computer that
supports multiple pressure transmitters.
However, the other case is a dive computer where the pressure samples
are all from cylinder 0, and any other cylinder will have the starting
and ending pressure set by hand. And the gas change events show when
the cylinder change happened.
So this creates a "turn gas change events into pressure sample fixups"
phase just before we actually analyze the pressures. That way the
pressure analysis can alway sdo the right thing, regardless of how the
data was originally stores in the dive.
Linus Torvalds [Sun, 23 Oct 2011 14:18:30 +0000 (17:18 +0300)]
Split the cylinder pressure analysis into a second loop
For the dive computers that give cylinder change events, we want to
re-write the cylinder index and pressure information with the event
information before we start analyzing the pressures. So instead of
filling the plot info and analyzing in one loop, split it up into two
phases. We'll do the "fix up cylinder pressure info based on events" in
between those phases.
Linus Torvalds [Sun, 23 Oct 2011 12:42:57 +0000 (15:42 +0300)]
Merge branch 'plot-multitank' of git://github.com/dirkhh/subsurface
* 'plot-multitank' of git://github.com/dirkhh/subsurface:
Plot tank pressures for multiple tanks
Change plot_info to use depth (instead of val) for depth value
Dirk Hohndel [Sat, 22 Oct 2011 02:04:44 +0000 (19:04 -0700)]
Plot tank pressures for multiple tanks
The code keeps track of the segments of time when a specific tank was used
and interpolates the pressure values for that tank based on a simulated
average SAC rate for the times in which no pressure readings are
available.
This changes the way we used to plot the pressure when only beginning and
end pressure of a tank are known; it used to be a straight line, now it is
a sloped line where the steepness of the slope is proportional to the
depth at that point - which is much more realistic.
We also plot the pressures in two colors now. The old green for pressure
data that came from the input file (that is not the same thing as saying
it came from the computer - divelog for example appear to create pressure
readings in the samples even if it only has beginning and end pressure).
Interpolated values are plotted in yellow. If you have a sub-standard dive
computer which has a frequently failing pressure sensor, you can now tell
the parts of the plot where data was missing and we are filling in.
The function that prints the pressure text labels had to be completely
redone as it previously assumed one tank for the whole dive and
simplisticly printed that tank's start and end pressure at the beginning
and end of the profile plot with the y-values being the maximum and
minimum pressure...
This commit introduces a custom simplistic single linked list data
structure to keep track of the pressure information per segment - Linus
hated the idea of using GList for this purpose, and I have to admit that
in the end this was very straight forward to implement and made the code
easier to read and debug.
Linus Torvalds [Sun, 23 Oct 2011 07:07:01 +0000 (10:07 +0300)]
Make the divemaster/buddy/location text entries be combo box entries
The text entries have completions, but if you want to see the full list
of possibilities, I'm not seeing how to do that without turning the
GtkEntry into a GtkComboBoxEntry.
The list of people/locations are not sorted, though, which makes the
full list less than readable. Will have to do that too.
Linus Torvalds [Sun, 23 Oct 2011 06:47:19 +0000 (09:47 +0300)]
Add completions to the dive location, buddy and divemaster entries
This way you can just type the first few characters of a location you've
been to before, and it will show you a list of possible completions.
Same for buddies and divemasters (which take the completions from a list
of people you've used before).
Linus Torvalds [Sat, 22 Oct 2011 16:39:03 +0000 (19:39 +0300)]
Add a completion for the cylinder type entry combo box
This allows us to start typing the cylinder description and we'll get a
matching list that we can select. This is similar to selecting one from
the model, and works in addition to the explicit selection.
Linus Torvalds [Sat, 22 Oct 2011 15:12:30 +0000 (18:12 +0300)]
Add cylinder data to cylinder model as we record each dive
This way the cylinder model list will contain all the different
cylinders that we have ever seen, rather than only containing the models
that we have *edited*.
That makes it much more practical to add new dives with the same
cylinders that we've used before, because now those cylinders will show
up as cylinder models even if we haven't looked and edited the old dives
first.
Linus Torvalds [Sat, 22 Oct 2011 14:18:58 +0000 (17:18 +0300)]
Fix the reading of the cylinder start/end pressure from cylinder models
The cylinder model doesn't contain the start/end pressures, they just
contain the cylinder type information. So trying to read the start and
end pressure from the cylinder model change callback is totally bogus.
We need to set the start/end pressures from the cylinder info when we
create the cylinder widget, and not touch them when the type changes.
So split up the "set_cylinder_spinbuttons()" function in two: one that
sets the type information, and one that sets the start/end pressure.
Linus Torvalds [Fri, 21 Oct 2011 14:30:36 +0000 (17:30 +0300)]
Merge branch 'minor-fixes' of git://github.com/dirkhh/subsurface
* 'minor-fixes' of git://github.com/dirkhh/subsurface:
Fix "Keep window size for new notebook pages" to not set minimum size
Make the first filename on the command line the default filename
Dirk Hohndel [Fri, 21 Oct 2011 14:13:59 +0000 (07:13 -0700)]
Fix "Keep window size for new notebook pages" to not set minimum size
Turns out I used the wrong function to keep the size of notebook pages
that were ripped off. Using gtk_widget_set_size_request on the new
notebook creates a hard minimum size for this window.
Instead we should use gtk_window_set_default_size on the new window that
is the parent of the notebook. This has the desired effect of creating the
new window with the same size as the one the page was ripped off from -
without making that the minimum size for this window.
Dirk Hohndel [Fri, 21 Oct 2011 03:59:13 +0000 (20:59 -0700)]
Allow multiple selections in the dive list
At this point we don't do anything with this - the commit just provides
the infrastructure changes so that this becomes possible. Subsurface
behaves the same if exactly one dive is selected and simply keeps the last
selected dive if zero or more than one dives are selected.
The goal is to be able to select multiple dives and then do actions on
them. For example pick a tank used for all of them. Or edit the location
or (yet to be implemented) other equipment data like weight carried.
And also to be able to merge multiple dives.
Dirk Hohndel [Thu, 20 Oct 2011 20:11:26 +0000 (13:11 -0700)]
Fixed off by one error in uemis importer
I clearly had never tried this with a dive that used the "just air"
setting the uemis. With this fix the cylinder data for that one tank is
read correctly.
Linus Torvalds [Thu, 20 Oct 2011 19:25:38 +0000 (22:25 +0300)]
Add quick hack for "no sample pressure but tank index changed" case
This isn't right if you switch back to the same cylinder multiple times,
but for the first time it kind of works - just take the beginning
cylinder pressure if we have one.
Dirk Hohndel [Thu, 20 Oct 2011 10:04:18 +0000 (03:04 -0700)]
Keep window size for new notebook pages
We used to set a fixed size instead of just copying the size that the
existing notebook has - which didn't really feel right when resizing and
then ripping of a page.
Linus Torvalds [Wed, 19 Oct 2011 17:06:11 +0000 (10:06 -0700)]
Parse the xml sample cylinder index properly
We would save it in the xml file, but then not actually read it back
properly. Oops. Not that we actually have any multi-tank dives yet, so
it doesn't matter. Yet.
Linus Torvalds [Wed, 19 Oct 2011 16:47:46 +0000 (09:47 -0700)]
Start some rough multi-cylinder pressure data plot infrastructure
It doesn't actually do multiple cylinders correctly yet, but it should
be a nice framework for it. And accidentally (not) it also ends up
drawing the final line for the end pressure of a single-cylinder dive
that has been fixed up by hand too.
Linus Torvalds [Wed, 19 Oct 2011 16:25:47 +0000 (09:25 -0700)]
Don't overwrite the end pressure with sample data if one already exists
If we have en explicit end pressure in the dive information, we should
not change it just because we also have some samples. The sample data
may not be complete (read: "Linus wireless connection dropped during the
dive again, and he fixed up the end pressure manually afterwards").
The beginning pressure already works correctly, because it will only use
the sample data for the first sample if no pressure existed before.
Linus Torvalds [Mon, 17 Oct 2011 18:12:11 +0000 (11:12 -0700)]
Add start/end pressure to cylinder edit dialog
This finally allows you to set the start/end pressures by hand.
HOWEVER! Right now, if we have samples with pressures, those samples
will always end up overriding anything you set manually. Which can be
very annoying if your wireless air integration fails halfway through.
Martin Gysel [Mon, 17 Oct 2011 13:53:59 +0000 (15:53 +0200)]
use DESTDIR according to my understanding of GNU standards
make DESRDIR a prefix of everything according my understanding
of the GNU standards. This is also useful(/needed) for installing
in Gentoo. Declare BINDIR for bin/program directory.
Signed-off-by: Martin Gysel <me@bearsh.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Fri, 14 Oct 2011 04:06:13 +0000 (16:06 +1200)]
Don't use dynamic linking for libdivecomputer
Commit bd8948386d55 ("Since we don't want configure, use gnumake to find
libdivecomputer") was totally broken. Sure, using GNU make features is
fine. But then hiding in that commit is the fact that it also changed
it to use "-ldivecomputer" instead of just linking with the static
libdivecomputer archive.
And that's just a really bad idea. Dynamic linking is useful for things
like libc, where it allows sharing of the code pages across all the
programs using it. For something like libdivecomputer it's just a *bad*
idea, and doesn't even work. The libdivecomputer interfaces aren't
stable enough to make it a good idea even if it *did* work, and the
libdivecomputer "make install" phase doesn't do the proper ldconfig etc
setup anyway.
Static linking is just simpler and better. It also means that the
binary will work even if you move it around to another machine - since
libdivecomputer isn't exactly a "standard library"..
Dirk Hohndel [Tue, 11 Oct 2011 22:58:38 +0000 (15:58 -0700)]
Have "make install" act more as expected for a desktop application
I'm trying to get subsurface to get closer to becoming a "regular desktop
application"; so far this is based on the recommendations and guidelines
on OpenSUSE and Fedora.
The icon is now named subsurface.svg and make install installs it in the
correct location. At runtime subsurface first checks if an icon is
installed and if it is it uses that - otherwise it falls back to the old
code that tries to read the svg file from the current directory.
Linus Torvalds [Sun, 9 Oct 2011 02:19:16 +0000 (14:19 +1200)]
Don't drop precision from floating point GP coordinates
Using '%f' limits the precision to 6 decimals, which may well be
perfectly ok. But at least in theory you *could* have higher precision,
and gps units will report it, so don't mindlessly limit us to what %f
shows.
This arbitrarily uses '%.12g' instead. %g will drop excess zeroes at
the end, so it actually results in the same (or shorter) ascii
representation unless you have the extra precision.
Remove some useless casts from and to void pointers
Remove casts from/to void*. They are unneeded in C, can hide problems
in the future, and are far too C++ish. Furthermore, they were
inconsistent with the rest of the code and even with regards to
themselves (at least in terms of whether or not to have space after the
cast).
In this case, we temporarily lose const specifiers in libdivecomputer.c
due to the unneeded cast, so it seems better to avoid the cast at all,
so you get warned about a const->non-const cast if you ever change it to
do something like this.
The casts in gtk-gui.c are just useless semantically, although they
might be useful as a hint to the reader that the void pointers are char
arrays.
Signed-off-by: Julian Andres Klode <jak@jak-linux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Dirk Hohndel [Wed, 5 Oct 2011 21:09:49 +0000 (14:09 -0700)]
Fix import tracking
Minor logical flaw that breaks the model.
When the --import parameter is found we need to mark that the FOLLOWING
dives are imported, not the ones loaded so far.
Dirk Hohndel [Wed, 5 Oct 2011 18:36:15 +0000 (11:36 -0700)]
Add XML file import back and treat open and import differently
Open (or adding a file name on the command line) means that this is just
one of the files that you consider part of your dive history. So dives
don't get automagically numbered and the dive_list is not considered
"changed" just because another file was opened.
Import (or adding a file on the command line after --import) means that
you are importing the content of this file to your dive history. So if the
imported file has un-numbered dives that are newer than everything else,
those get correctly renumbered. And importing marks the dive_list as
changed.
Dirk Hohndel [Wed, 5 Oct 2011 18:36:15 +0000 (11:36 -0700)]
Add an '--import' command line option
This option indicates that all files that come AFTER it on the command
line are being added to our divelist. The dives in these files should
receive numbers (assuming they are un-numbered and are all newer then the
dives in the files before the --import option, and assuming those dives
are numbered).
This also marks the dive_list changed after the new dives are added.
Using this option gives us a reasonable user experience in the case where
a user has one file with all their dives and wants to add newer dives
after this (after extracting them from a dive computer - as in the case of
a uemis owner where there is no direct import from the dive computer,
yet). Something like
subsurface MyDives.xml --import NewDives.SDA
It also doesn't break Linus' vision where the user has many files on the
command line which don't imply a changed dive_list.
Dirk Hohndel [Wed, 5 Oct 2011 16:24:52 +0000 (09:24 -0700)]
Mark divelist changed when renumbering or adding dives
The behavior is not yet consistent when calling with multiple file names
on the command line (as we don't add number to the later ones in this
case), but at least it catches the case if you manually renumber the dives
or if you import new dives that get added at the end - which are the two
most typical cases.
Linus Torvalds [Wed, 5 Oct 2011 15:37:14 +0000 (08:37 -0700)]
For a manual renumber, default to the existing first dive number
If renumbering a list of dives, default the start number to the existing
first dive number. That way, if you do need to renumber (overlapping
import or whatever), but your at least had your really old dives already
numbered, we start off with a sane default.
Linus Torvalds [Wed, 5 Oct 2011 15:31:31 +0000 (08:31 -0700)]
Automatically renumber new dives when they are "obvious".
When importing (or reading xml from files) new dives, we now renumber
them based on preexisting dive data, *if* such re-numbering is obvious.
NOTE! In order to be "obvious", there can be no overlap between old and
new dives: all the new dives have to come at the end. That's what
happens with a normal libdivecomputer import, since we cut the import
short when we find a preexisting dive.
But if any of the new dives overlap the old dives in any way, or already
have been numbered separately, the automatic renumbering is not done,
and you need to do a manual renumber.
Linus Torvalds [Wed, 5 Oct 2011 15:06:48 +0000 (08:06 -0700)]
Move 'dive_list_update_dives()' call into 'report_dives()'
All the callers were always calling report_dives first, followed by
dive_list_update_dives(). And there really was no reason to have the
callers call two separate functions for the "I've added new dives" case.
So just call dive_list_update_dives() directly from report_dives(), and
remove it from the callers.
Dirk Hohndel [Wed, 5 Oct 2011 03:33:17 +0000 (20:33 -0700)]
Make the dive merging code more tolerant
Depending on the tool used to import a dive from the uemis Zurich we end
up with different time stamps for the dive - just by a few seconds, but
the existing code insisted on an exact match.
We now allow for up to 60 seconds in difference and still consider two
dives as the same.
Dirk Hohndel [Tue, 4 Oct 2011 19:27:55 +0000 (12:27 -0700)]
Replace event text with small red triangle and tooltip
We draw a little red triangle (of hardcoded size - not sure if this SHOULD
scale with the size of the plot... I like it better if it doesn't) to the
left of an event.
We then maintain an array of rectangles that each circumscribe one of
those event triangles and if the mouse pointer enters one of these
rectangles then we display (after a short delay) a tooltip with the event
text.
Manually creating these rectangles, maintaining the coordinate offset,
checking if we are inside one of these rectangles and then showing a
tooltip... this all seems like there should be gtk functions to do this by
default... but if there are then I failed to find them. So instead I
manually implemented the necessary logic.
Dirk Hohndel [Tue, 4 Oct 2011 19:14:26 +0000 (12:14 -0700)]
Change plot routine to take a drawing_area as argument
Previously we passed in width and height and the routine itself decided to
keep 5% margin around each edge - oddly doing this with double precision,
even though this is all integer coordinates.
Instead we are now passing in a drawing_area. We are kind of abusing the
cairo_rectangle_int_t data type here - but it seemed silly to redefine a
new data type for this.
Width and height give the size of the TOTAL drawing area (as before).
x and y give the offset from the edges - so the EFFECTIVE drawing area is
width-2x and height-2y
This is in preparation for adding tooltips - those need to know the
coordinate offsets from the edges - so having this hard coded inside the
plot function didn't make sense anymore.
Linus Torvalds [Mon, 3 Oct 2011 20:19:23 +0000 (13:19 -0700)]
Merge branch 'uemis-integration' of git://github.com/dirkhh/subsurface
* 'uemis-integration' of git://github.com/dirkhh/subsurface:
Much nicer implementation of uemis sample parsing - and add events, too
Add working pressure to uemis tank data
Dirk Hohndel [Mon, 3 Oct 2011 19:27:14 +0000 (12:27 -0700)]
Much nicer implementation of uemis sample parsing - and add events, too
This is something I wanted to do for a while. Every uemis sample is simply
a packed structure with no padding. Instead of grabbing random bytes from
the middle of an unstructured data blob let's just define the structure
and access its members.
And while we do that, add support for the more useful uemis events as
well.
A couple of the warnings are disabled by default (compile time flag) as
they are just crazy - any normal dive will give you dozens and dozens of
speed warnings. Same goes for the PO2 green warning (I haven't looked but
this seems to trigger on a PO2 over 1.0 or something). Completely useless
and just hides actually useful info.
I still want to redo the way we visualize events in general - just
printing the text ontop of the profile really is suboptimal. Especially as
the uemis really seems to love to repeat several of the warnings quite
frequently.
Linus Torvalds [Mon, 3 Oct 2011 19:13:54 +0000 (12:13 -0700)]
Merge branch 'uemis-integration' of git://github.com/dirkhh/subsurface
* 'uemis-integration' of git://github.com/dirkhh/subsurface:
Remove the ability to 'Import' .SDA files
Integrate loading of uemis SDA files into the regular xml parsing
First steps towards integrating SDA files into the default XML loading
Dirk Hohndel [Mon, 3 Oct 2011 16:55:17 +0000 (09:55 -0700)]
Add working pressure to uemis tank data
Turns out they use 202.6bar as default working pressure. WTF?
Also I had misunderstood the way I should record the pressure internally
(which happened to work since I didn't set the working pressure). This is
now fixed as well.
Dirk Hohndel [Mon, 3 Oct 2011 16:55:17 +0000 (09:55 -0700)]
Add working pressure to uemis tank data
Turns out they use 202.6bar as default working pressure. WTF?
Also I had misunderstood the way I should record the pressure internally
(which happened to work since I didn't set the working pressure). This is
now fixed as well.
Dirk Hohndel [Mon, 3 Oct 2011 15:27:36 +0000 (08:27 -0700)]
Remove the ability to 'Import' .SDA files
We can instead 'Open' these files as they are just bastardized XML files.
This gets us back to a more consistent point where 'Import' gets data
directly from the dive computer (and hopefully soon we will add the
ability to load a dive directly from a uemis SDA to libdivecomputer),
and 'Open' loads a file from the filesystem of the computer we are
running on (this last sentence phrased so awkwardly as the uemis Zurich
SDA is a computer and presents a file system when connected via USB - it
just doesn't have the dive data in an accessible format in that file
system).
As a bonus we get to throw away quite a bit of code (the uemis specific
file handling, mini-XML parser with helper functions, the file open dialog
in the importer). Yay!
Dirk Hohndel [Mon, 3 Oct 2011 04:59:54 +0000 (21:59 -0700)]
Integrate loading of uemis SDA files into the regular xml parsing
There are a few interesting issues with this:
- this requires a change to the SDA file format; thankfully I control that
format, too (the default files are not valid XML files)
- once again, the fact that adding samples can change the dive pointer
messes with me - I decided to change the interface of ALL of the
XXX_dive_match functions to take a struct dive**
I know this is not ideal as all the other functions don't need that -
but I would have hated the inconsistency
- there is the issue that we now overload two _different_ uemis formats in
the same function - that's certainly a potential point of confusion
- a minor detail is the problem that the SDA format is kinda odd to parse
and that we trigger on the duration field by it being the only float.
Yeah, that's not ideal - but again, I control the format, so I _know_
this is true.
Linus Torvalds [Mon, 3 Oct 2011 02:14:00 +0000 (19:14 -0700)]
Remove cylinder index from cylinder list model
Instead of having to keep the index up-to-date as we edit entries
around, just figure out the entry index from the model itself. Gtk
seems to make it unnecessarily hard, but what else is new?
Linus Torvalds [Mon, 3 Oct 2011 00:16:50 +0000 (17:16 -0700)]
Change calling convention of 'edit_cylinder_info'
Instead of passing it the model and iterator (which requires that we
create the new entry for an 'add' event even if we then cancel the
operation), just make the caller do the final cylinder list update.
This way we can make 'add' work more sanely: if you cancel the add, we
now do not create an empty cylinder entry at the end.
Linus Torvalds [Sun, 2 Oct 2011 23:41:17 +0000 (16:41 -0700)]
First cut at working cylinder editing dialog
This currently only does the same old things we used to do (so still no
start/end pressure or trimix support), but despite that this is already
more flexible than the old model:
- we can now add new cylinders, rather than just edit the information of
the first two cylinders of the dive
- because the cylinder editing is being done in a edit dialog, it is
now much more reasonable to use multiple lines and expand all the
things we can edit.
But to actually make this fully fledged, we'll need to add all the other
info to the cylinder edit dialog, and probably add a confirmation dialog
for the "delete cylinder" case too.
Oh, and right now deleting a cylinder doesn't mark the dive info changed.
Linus Torvalds [Sun, 2 Oct 2011 20:42:51 +0000 (13:42 -0700)]
Add the ability to add new cylinders
This is totally useless since you cannot actually *edit* the resulting
new dive yet, but we'll get there. And this already conceptually shows
a capability that we didn't use to have with the old interface.
Linus Torvalds [Sun, 2 Oct 2011 20:13:27 +0000 (13:13 -0700)]
Start re-organizing the cylinder entry in equipment.c
This leaves the actual editing code unconnected, so now you can only see
the cylinder information, not actually edit it. However, with the big
re-organization I really do want to have this as a half-way point where
I have created the new cylinder tree-view.
I now need to connect the "add/edit" buttons to dialogs that then use
the editing widgets - so I've left that widget code around, because I'll
be able to reuse a lot of it. Not all, but the cylinder type model code
in particular will be re-used pretty much as-is.
Linus Torvalds [Sun, 2 Oct 2011 20:05:12 +0000 (13:05 -0700)]
Split up generic code to generate a gtk tree view column
We used to do this just for the dive list, but the new cylinder view
will want to do a lot of the same boilerplate gtk stuff, so make it a
bit more generic and move it to gtk-gui.c.
Linus Torvalds [Sat, 1 Oct 2011 04:55:51 +0000 (21:55 -0700)]
We forgot to pick up the 'value' field of a dive event
Just missed that one entirely in the xml parser for some reason.
Probably because the fields don't have much semantic meaning, so I
didn't even realize that I had missed one of the random integer values
in an event.
On my suunto, the 'value' field seems to contain things like the new
Oxygen percentage of a gas change event etc.
Distinguish internally between min pressure and end pressure
And don't artificially end dives on min pressure
This may be a problem for dive computers like Linus' Suunto Vyper Air
where the failure mode seems to be _high_ pressure readings (that's scary,
btw). If the transmitter fails at the end of the dive the pressure plot
ends with incorrect high pressure. But that's simply a bug with the dive
computer and not something that subsurface should hack around. Maybe we
should offer a way to edit the incorrect data points instead.
Always ending on the minimum pressure is definitely wrong as it causes
bogus plots when you do a valve shutdown during the dive (which means that
valid data gets plotted incorrectly).
We were missing the last sample (which is usually a fast ascent).
Also, reduced the velocity smoothing to 15 seconds as the 30 seconds were
hiding too much valid information
Correctly parse the braindamaged tank size information from uemis
Admittedly the cuft ratings are stupid, but still, it's not that hard.
In order to correctly describe a tank based on the cuft system you need to
know the cuft AND the working pressure. But the uemis Zurich always
assumes that the working pressure is 200bar. That's pretty close to
3000psi and therefore works "good enough" for Aluminum tanks - but in
general this will of course fail (e.g. for HP or LP tanks).
Yes Linus, gas pressure can indeed go up during a dive
At first glance it seems logical to make the ending pressure be the
lowest pressure observed during a dive. But if you do valve shut down
drills with a tech setup (where you have a fully redundant double
tank setup with two valves, two regulators and a manifold in between),
then you continue to breath from what is indeed the same "tank", but still
the valve on which your air pressure transmitter sits does get shut down
and de-pressurized. So your pressure goes down by quite a bit, and then
comes back up when the valve is turned back on.
And the ending pressure of the dive (which is used for things like the SAC
calculation) is indeed potentially higher than the lowest pressure
observed during a dive.
Allow larger tanks (change maximum from 200 to 300 cuft)
We don't handle doubles any different than single tanks - so while
200 cuft was a sane maximum size for a tank, once you dive with
doubles this logic fails.
We may or may not decide to implement special handling for doubles at some
point, but for now simply allow for tanks all the way up to double-150.
Merge branch 'ui' of git://github.com/dirkhh/subsurface
* 'ui' of git://github.com/dirkhh/subsurface:
The notebook pages can only be dropped back into the main notebook
Linus would like to be less on the bleeding edge of Gtk+
Use the correct signal to avoid Gtk-CRITICAL error message
Clean up the drag and drop code and allow ripping off the Dive Profile
Use the correct signal to avoid Gtk-CRITICAL error message
We used the wrong signal - "data-drag-received" is intended to check
whether the target will accept the drop. What we want is the "drag-drop"
signal which tells the widget that something was dropped on it.
Also fix an embarrassing lack of NULL pointer checks in my string
comparisons...
projects / ext / subsurface.git / log