aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-04Copy all cylinders when (re)planning a diveGravatar Anton Lundin
This changes the code so we include all the cylinders from a previous dive when we re-plain a dive. Otherwise we would have a hole in the cylinders table when we plan a dive based on a dive where we have unused cylinders, and it makes more sense to copy all of them rather than not. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-04When (re)planning use prefs.decopo2 for modGravatar Anton Lundin
Use our the decopo2 from preferences for mod/switchdepth calculations when re-planning a dive or planning a dive based on a previous dive. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-04Fix DM4/DM5 importGravatar Miika Turkia
The implementation of import for DM5 removed the profileBlob from SQL query, thus breaking the backward compatibility on import of old dives. Need to have bot profile and sample blobs within the query... Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-04Don't interpolate pressure while dragging waypointsGravatar Robert C. Helling
A profiler session in the planner shows that for deep long dives a significant amount of CPU time is spent in populate_pressure_information() which interpolates the cylinder pressure graphs. This patch introduces a "fast" flag for the replot of the profile which is active while the mouse button is still pressed and that suppresses this calculation. In the future, this flag could be used for other responsiveness tunings of the plot. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-04Remove Poseidon XML fileGravatar Dirk Hohndel
The CSV/TXT import is working well now, the XML file is just causing confusion. Suggested-by: Willem Ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-03Parse converted DM4 logs on DM5 importGravatar Miika Turkia
"Converted" DM4 logs are not actually converted, only the database structure is updated. According to Rainer we should be able to read the dive profile from the old format in this case. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-03Fix crash with converted DM5 logGravatar Miika Turkia
If DM4 log file is converted to DM5, the sampleBlob is empty. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-03Ubuntu packaging: move support files into debian directoryGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Ubuntu packaging: remove .git trees from sourcesGravatar Dirk Hohndel
Oops, I thought I had done that but that was flat out wrong. Now the source upload shrinks from over 70MB to around 26MB. Much better. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Ubuntu packaging: switch to Qt5Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Ubuntu packaging: get git version without including the full git treeGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Ubuntu packaging: include static libmarblewidgetGravatar Dirk Hohndel
Still all Qt4 based. Baby steps. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Make sure Ubuntu package built script is started from the right directoryGravatar Dirk Hohndel
I kept starting it from within the subsurface directory which of course failed but left clutter around. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Adjust version numbering for Ubuntu packageGravatar Dirk Hohndel
Let's use all four digits as 'version'. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Allow static libgit2Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Add Ubuntu packaging instructionsGravatar Dirk Hohndel
These files knowingly (one might say, intentionally) violate the spirit and letter of the Debian / Ubuntu packaging rules. They are intended to be able to create our own packages that include their own libdivecomputer, libgit2 and (later) libmarble. Especially for daily builds this is WAY easier than fighting with whatever may be the current version of these packages in Ubuntu (especially since this allows us to use our private libdivecomputer branch). This assumes that the user runs the make-package.sh script from a directory below which we have subsurface/ <- Subsurface checked out git tree subsurface/libdivecomputer <- desired libdivecomputer sources subsurface/libgit2 <- desired libgit2 source Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Allow LIBDCDEVEL to specify a pathGravatar Dirk Hohndel
That's something I had wanted to fix so many times... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Remove libdivecomputer ifdefs for configuring OSTCGravatar Anton Lundin
The hw_ostc_device_eeprom_read / hw_ostc_device_eeprom_write functions have bin in libdivecomputer since v0.1.0, so there was an error when the read settings part ended up behind ifdef's. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-02Variable should be declared before loopGravatar Miika Turkia
Fixing incorrect variable scope. (I do not really see any functional differences on Firefox, but better declare the variable before the loop.) Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-01configuredivecomputerthreads.cpp: conditionally define read_ostc_cf()Gravatar Lubomir I. Ivanov
Fixes a warning. The function is only used if DC_VERSION_CHECK(0, 5, 0) is defined. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-01libdivecomputer.c: reduce the scope of 'i' in sample_cb()Gravatar Lubomir I. Ivanov
Silences a warning about an unused variable. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-01file.c: fix uninitialized variableGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-01Context menu entry to change setpointGravatar Robert C. Helling
This patch adds a context menu entry to add a setpoint change event. In particular, this can be used to turn a logged dive into a CCR dive. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-01A widget to add a set-point changeGravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-01Added XCode to Mac build instructionsGravatar Robert C. Helling
In order to compile anything on Mac you need to have XCode and its command line tools. After an OSX update (as I just did to Yosemite) the command line tools have to be reinstalled. Otherwise there are strange error message about missing header files for libusb2 (even though that is still installed via homebrew). Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-01Add libdivecomputer and libgit2 to Ubuntu buildingGravatar Miika Turkia
Some instructions how building libdivecomputer differs from Subsurface build. And mention to copy libigt2 over to other repository if needed. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-25Tuning the manual CSV import dialogGravatar Miika Turkia
This allows more space between the input fields in the dialog. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-25Allow user to select date format on manual CSV importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-25Correct diveplan as it's dive plan everywhere else in plannerGravatar Tim Wootton
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-25More O₂Gravatar Tim Wootton
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-25Consitent punctuation of shortened wordsGravatar Tim Wootton
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-25Match agreed captalisation styleGravatar Tim Wootton
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-25Consistent representation of O₂Gravatar Tim Wootton
Signed-off-by: Tim Wootton <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-25Assign setpoint to correct sample in plannerGravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-24Let's not store more or less random dataGravatar Dirk Hohndel
The backend needs to convert the firmware and serial information into a sane string - Subsurface shouldn't try to do this by itself. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-24CCR dive logs: git I/OGravatar willem ferguson
This patch privides for writing CCR dive log parameters to a git repository and for reading the data back from a git repository. This involves writing and reading the following members of the structures of sample: o2sensor[3] o2cylinderpressure and dc->no_o2sensors. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-24Tooltips for some of the manual CSV import fieldsGravatar Miika Turkia
Date and duration formats are not necessarily self explanatory so adding tooltips to explain the expected format. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-24Default dive number on manual CSV importGravatar Miika Turkia
If manual CSV import does not have any dive number, give a default one so that the dives get import and not silently ignored. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-24Latest strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-24Reset plot info pointer when painting several polyonsGravatar Robert C. Helling
For each polygon that we paint we have to step through the plot_info from the start again. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-24In our floating point comparison 0.0 should be equal to 0.0Gravatar Robert C. Helling
We when comparing floating points we do a relative comparison of the difference. This fails when both numbers are (exactly) 0.0 which happens to occur when plotting an O2 graph without o2 data resulting in both min and max for the y-axis to be 0. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-23Make the button labels for apply / cancel of edits more consistentGravatar Dirk Hohndel
Before you could 'Cancel' the edit and then would be asked if you wanted to 'Discard' your changes or 'Cancel'. So clicking 'Cancel' cancelled the action of having clicked 'Cancel'. That's so confusing, it's even hard to explain. Yes, it uses "typical" language for user interaction and kind of makes sense, but it's not easy to understand for the non-technical user. With the new labels the user is asked to whether they want to 'Apply' the changes or 'Discard' them. And when they choose 'Discard' the verification question is still 'Discard' or 'Cancel'. That seems much more consistent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-22Check error code of get_cylider_idx_by_use()Gravatar Robert C. Helling
If not cylinder with type DILUENT or OXYGEN is defined, this function returns -1 which should not be used as an index to an array. This patch adds code to check for this return value and exit gracefully. On line I marked with a comment. Someone more knowledgeable of that part of code than me should double check that return is here what we want. [Dirk Hohndel: fixed small oversight...] Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-22Use our own file open dialogGravatar Dirk Hohndel
Clearly the static dialogs don't work. Even with the previous commit the dialog still said "Save" insted of "Open". So let's just assemble our own dialog and be done with it. I hope I got all the options right... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-22Don't ask confusing questions in open file dialogGravatar Dirk Hohndel
Using the SaveFile dialog to open a file caused it to ask the user if they wanted to overwrite a file when they actually tried to open an existing file. This fixes that. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-22Add qtwebkit-devel to Fedora installation reqsGravatar Miika Turkia
One more packet needed to compile on Fedora. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-21Correct Uemis extra dataGravatar Dirk Hohndel
When dropping the pointless surface samples at the end of the dive we stopped going through all the samples - for that reason the offset at the end to find the data in the footer was wrong. Now the extra data all seems to match what I can see on my screen after the dive. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-21Improve Uemis debug output for short data blocksGravatar Dirk Hohndel
It's useful to know just how short the read was when trying to figure out what went wrong. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-21Add serial and firmware to the extra dataGravatar Dirk Hohndel
And add the missing newline to the debug output to help us identify encodings for serial and firmware. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-11-21Create a subsurface_access for Android tooGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>