summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-08Mark new string for translationGravatar Dirk Hohndel
This needs to be the same string as used for the entry in the Import dialog... since translate() is a macro in this .c file and defined to have only two arguments, I'm using the NOOP3 macro to get this correctly added to the translation sources, including the comment. That makes the code a little odd, but seems to work. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Fix symbolic links for user manualGravatar Miika Turkia
Let's use implicit anchor for the Appendix A. This will get rid of compilation error when trying to create PDF version of the user manual. (Otherwise all the other links to Appendix A would have to be updated.) Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Don't ignore when we can't parse a fileGravatar Dirk Hohndel
We are quite inconsistent when it comes to reporting back errors. One case where this caused somewhat unexpected behavior was when the user would try to open a .csv file by passing it as command line argument. The file was silently ignored, but treated as if it had been opened successfully. Now we issue a somewhat reasonable error message. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Latest translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Fix a crash on CSV importGravatar Miika Turkia
Seems that there was not enough space reserved for the whole mem buffer when adding XML tags around CSV file. When unlucky, the metadata of memory allocation was overwritten. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08main.cpp: rework the libgit2 version checkGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Unify spelling of DivingLog on user manualGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Typo fixes on user manualGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08User manual: new images taken from Fedora 20 KDE.Gravatar Willem Ferguson
Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08User manual updateGravatar willem ferguson
This update concerns: Import of dive logs from Suunto DM5 Configuration of dive computers Description of main menu items One figure has been added Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Read and write alarm time correctly for StingerGravatar Anton Lundin
The Stinger stores the alarm time in seconds, instead of minutes as the Vyper does it. This corrects for that. Reported-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Emit the successful message the right wayGravatar Anton Lundin
The successful message was emitted in a some what older way then the other messages so it was always emitted, even on error. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Make sure the device open error reaches the userGravatar Anton Lundin
This is a bit ugly fix to make sure the right error message reaches the user in case of being unable to open the device. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-07Style cleanupGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-07Include some extra information on Shearwater importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-07Samples should be inside divecomputer on Shearwater importGravatar Miika Turkia
Data read from a divecomputer is moved inside the divecomputer tag Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-07Add cylinder support for Shearwater XML importGravatar Miika Turkia
This tries to grab the used cylinders when in open circuit mode. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-07Record ppO2 only when on CCR modeGravatar Miika Turkia
Shearwater describes the current mode with tag currentCircuitSetting, thus we should record the ppO2 only when in CCR mode. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-07In diveplan differentiate between last printed depth and last depthGravatar Robert C. Helling
In the decision if a dive segment should lead to a line in the diveplan, we need to differentiate between the lastdepth (the depth of the last dp to tell if we are currently stopping) and the last depth that we printed a line for (needed for gaschange lines). Without this patch, no stops without gas changes were listed anymore in the diveplan. Like the last patch for the diveplan: I hope this time I got this logic right. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-07Add utopic and precise to Ubuntu packagingGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-07User Manual text updateGravatar willem ferguson
Update to user manual text, including Cylinder bar at bottom of profile as well as Extra Data tab. A few smaller sentence-level updates scattered throughout the text New pictures. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-06Latest string and translation updatesGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-06main.cpp: fix broken build for libgit2 0.21Gravatar Lubomir I. Ivanov
799e22ea0c3f20 in libgit2 renamed a function, which breaks our build. To fix that we check the current version and if the USE_LIBGIT21_API definition was used. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
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>