summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-12Fix divecomputer part of UDDF exportGravatar Martin Long
XPath was incorrect for parsing divecomputers into the equipment section, meaning they dont get inserted. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Use generated Ids for site lookup in UDDF export.Gravatar Martin Long
As with buddies, sites could contain characters which are not valid in Ids. Also, it is very possible to have duplicate site names. This uses an XSL generated id to prevent any issues. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Use generated ids for buddies in UDDF export.Gravatar Martin Long
This is instead of using their names, which may contain illegal characters. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Update UDDF export <generator> header to include madatory tags.Gravatar Martin Long
Add name at <generator> level, and add additional <homepage> in contact tag. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Prevent the tank bar from overlaping the temperature graph.Gravatar Joakim Bygdell
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Ubuntu packaging: Create the correct libdivecomputer versionGravatar Dirk Hohndel
Since we strip the .git data from the source tree (to conserve space and not violate the packaging guidelines - or at least not violate THAT packaging guideline) we need to create the correct revision before the tar file of sources is packaged. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12More lists organized alphabetically.Gravatar Tomaz Canabrava
I forgot this one, tsc. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Set sample setpoint correctlyGravatar Robert C. Helling
Forward the sample set-point setting as otherwise all ascents are planned on OC. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Prevent 0/0 in partial pressure calculationGravatar Robert C. Helling
If for some reason the diluent is pure oxygen, there is a zero divided by zero error in the partial pressure calculation. This patch prevents it. Fixes #774 Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Don't rely on malloc to return NULL for zero sizeGravatar Anton Lundin
We rely on samples being NULL if a dc have no samples. Its completely legal for malloc to return a valid pointer to nowhere for zero sized malloc, which you can't follow and read what its pointing at. Its only viable to call free() on. In other code, if samples is a valid pointer, we dereference it and look at the first sample. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Initialize alloc_samples in copy_samplesGravatar Anton Lundin
We rely on alloc_samples in prepare_sample. If alloc_samples weren't initialized prepare_sample would wreak havoc on the samples list. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-11User manual: Eight more figures replacedGravatar Willem Ferguson
Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Add 'trip' support to UDDF exportGravatar Martin Long
Currently repetition groups are used to group dives into trips. This is not really correct. Repetition groups should really represent a group of dives where tissue loading needs to be preserved between dives (typically the same day). UDDF has support for trips, using the <divetrip> tags. This is a bidirectional link between the dives and the trips. This patch adds support for these trips. However, it leaves in the repetition groups. Repetition groups may need further consideration. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Trivial white space fixGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10More temperature plot position tuningGravatar Dirk Hohndel
Depending on the options shown, the latest change appears to have moved the temperature graph a bit too low. This seems to work better in my experiments. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Aggregate multiple weights into UDDF export.Gravatar Martin Long
Sum together all of the weights recored on a dive to use in the <leadquantity> tag in UDDF export. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Support buddies with only a first name, no surname.Gravatar Martin Long
The previous patch would not fill the first name field if there was no second name. This rectifies that. Signed-Off-By: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Updates to Ubuntu package building processGravatar Dirk Hohndel
Marble can't be static, so instead we build a shared library but give it a different name so it can be installed in parallel with the "real" libmarblewidget.so. Also make sure that the correct libusb is installed so that Atomics Aquatics dive computers are supported. Fixes #782 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Updated translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Allow more flexible GPS coordinates for CSV importGravatar Miika Turkia
This theoretically allows one to use format like 1°36'11.711"N 124°46'00.368"E for GPS coordinates. However, in practice this is not allowed without properly parsing this format in C/C++ side. This patch changes the export format to UTF8 and improves the location import by allowing either gps or location attributes to be imported. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Minor tweak to Ubuntu package buildingGravatar Dirk Hohndel
12.04 can't build our Qt5 based package, so let's just drop it. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Rearrange the vertical positions to better accomodate the temperature graph.Gravatar Joakim Bygdell
Fixes #778 Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Organize string-lists alphabetically for completionGravatar Tomaz Canabrava
This micro patch adds the ability to sort the lists alphabetically for user interaction. Dirk asked me to do this for location, but this actually changes for location, divemaster, buddy and suit. Seems a good thing for all. Fixes #780 Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Fixed airtemperature in UDDF export.Gravatar Martin Long
The XSLT didn't expect the temperature tag to be within the <divecomputer> element in the source, so the selection wasn't finding it. Signed-off-by: Marton Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Added <leadquantity> to UDDF export, showing weight used.Gravatar Martin Long
Signed-off-by: Marton Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Split last_name and first_name for buddies in UDDF exportGravatar Martin Long
Signed-off-by: Marton Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Fix gasdefinitons in UDDF exportGravatar Martin Long
Selection of <cylinder> elements wasn't working where dives are part of a trip. Change the selection so that it will select all cylinders whether or not the dive is part of a trip. Signed-off-by: Marton Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Prevent UserID from being 'stuffed' into the start of UDDF export.Gravatar Martin Long
Due to there being no xsl template for the userID, it ended up getting inserted at the start of the output. This adds an empty template to map the <settings> element, preventing this erronious insertion. Signed-off-by: Marton Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Update dive site structure in UDDF export to match UDDF 3.2.0 specification.Gravatar Martin Long
The dive site structure in the UDDF export was using an old structure where each site is simply listed as a <dive_site>. The new structure requires a single <divesite> containing at least one <divebase> - a base location where you are diving from, and at least one <site>. As subsurface only tracks sites, I've created a single divebase to be referenced by all of the sites. Note: although profiles in Subsurface can be grouped into trips, these are groupings of profiles, not sites, and the mapping may not be simple. e.g. on different trips the sames sites may be visited but a different base used. Or, different bases may be used on a single trip. Signed-off-by: Marton Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-10Separate out buddies into individual entities when exporting to UDDF.Gravatar Martin Long
Part of a series bringing UDDF export closer to the UDDF standard, as per www.uddf.org. Currently when exporting to UDDF buddy entities are created one-per-unique-combination. This means that a group of buddies on a dive are exported as a single buddy, with the names comma separated. This patch identifies all unique buddies, whether used independently or along with other buddies on a dive. They are then linked independently on each profile. It also uses the UDDF standard <link ref=""> instead of <buddy_ref ref=""> Signed-off-by: Marton Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-09Make filter for filter criteria case insensitiveGravatar Dirk Hohndel
When opening the filter dialog we allow the user to filter the choices that are shown. The text that they enter in that filter for filter criteria should be treated as case insensitive. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-09Hide any pictures shown when closing divelogGravatar Dirk Hohndel
Fixes #776 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-09Don't skip the first tag when filteringGravatar Dirk Hohndel
No idea why this code was there... but what it caused was an invalid access to checkState[-1] when a dive had that first tag. This explains why sometimes the dives that had that tag were shown, regardless of whether the selected filter criteria should have excluded them or not. Fixes #769 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-09Close and clear filters when closing divelogGravatar Dirk Hohndel
Otherwise non-sensical information stays behind. Fixes #777 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-09Update spanish translation of user manual to english b851146Gravatar Salvador Cuñat
Includes Extra data tab, show cylinders button, and Dc configuration. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-09Update user manual figures: Ubuntu to FedoraGravatar willem ferguson
Replace four more figures. Replacement complete up to end of section: Import data from dive computer. Signed-off-by: willem ferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-09Quote picture file names when saving XMLGravatar Miika Turkia
Fixes #775 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Preparing for 4.2.91 aka 4.3 RCv4.2.91Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-08Another update of strings and translationsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
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>