summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-12-15Ubuntu packaging: add support for better changelog trackingGravatar Dirk Hohndel
This now assumes that a running changelog is maintained in src/debian.changelog, i.e., at the same level as the subsurface tree; the organization now should look like this: src/debian.changelog src/subsurface # subsurface git checkout src/subsurface/libdivecomputer # libdivecomputer git Subsurface-xx branch src/subsurface/marble-source # marble git Subsurface-xx branch src/subsurface/libgit2 # libgit2 git checkout Instead of running dh_make to create all new debian build files, we add the necessary files in our script. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14Fix event/alarm types in UDDF export.Gravatar Martin Long
UDDF only supports a specific set of alarms. Some events also don't map to alarms but map to other types of elements in UDDF. This patch adds a map of the accepted types. Where a map doesn't exist the type will not be mapped to an alarm, the option then remains to map it to another kind of element, in the same way that happened with headings and gas switches. This removes the need for the specific exclusion of heading and gas switch, as they are now simply not included in the map. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14First cut of updates to the INSTALL fileGravatar Dirk Hohndel
Mention our Subsurface branches of Marble and libdivecomputer Massive update of the Linux build instructions TODO: correct package lists for the different Linux distributions TODO: update instructions for Mac TODO: update crossbuild instructions Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14Default some graphs to falseGravatar Miika Turkia
These values are treated as false upon starting Subsurface. Thus they should be set to false as well. Otherwise extra graphs are drawn to the profile when exiting the preferences dialog. Fixes #783 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14New images for the user manualGravatar Pedro António Neves
Added 3 more images to the User Manual (Appendix E). Images illustrate the creation of .CSV file from LibreOffice Calc. Signed-off-by: Pedro António Neves <nevesdiver@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14Updated User Manual to include information on how to add dive data to a new ↵Gravatar Pedro António Neves
logbook. - Changed section 4 name to: Storing dive information in the logbook (to keep it in line with the other titles) - Added some introductory text to section 4, together with links to the appropriate sections on the manual - Changed figure Import_CSV2.jpg to reflect date format options - Added an Appendix (E) explaining users how to create a .CSV file from LibreOffice Calc - Added 3 more images to illustrate Appendix E Signed-off-by: Pedro António Neves <nevesdiver@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14Count the weights properly on UDDF exportGravatar Miika Turkia
Using node() along with the node-set seems to grab the weights properly for me. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-14Update spanish translation of user manual to english 3c9c1ecGravatar Salvador Cuñat
Only update some figures to Fedora 20. Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Enable Marble debug messages from Subsurface command lineGravatar Dirk Hohndel
Calling Subsurface with -v now gets you debug output. Of course, with a regular "release" build of Marble you still won't see much. But with the changes in the special Subsurface-testing branch you actually get some very useful information when debugging a lack of maps in Marble. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Remove debug printfGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Include weight system on uddf importGravatar Miika Turkia
Adjust to UDDF 3.2 specification Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Include dive buddies on uddf importGravatar Miika Turkia
Adjust to UDDF 3.2 specification Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Include dive location on uddf importGravatar Miika Turkia
Adjust to UDDF 3.2 specification Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Include notes on uddf importGravatar Miika Turkia
Adjust to UDDF 3.2 specification Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Fix name for temperature sample on UDDF importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13UDDF import: check following event timeGravatar Miika Turkia
Seems that our UDDF export is adding time after the event name. Thus we need to add reading the following time as well. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Include temperatures properly on uddf importGravatar Miika Turkia
Adjust to UDDF 3.2 specification and use proper tag name for air temperature. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Include rating and visibility on uddf importGravatar Miika Turkia
Adjust to UDDF 3.2 specification Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Grab manually added air temperature on UDDF exportGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Include dive duration on uddf importGravatar Miika Turkia
Adjust to UDDF 3.2 specification Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Include dive number on uddf importGravatar Miika Turkia
Adjust to UDDF 3.2 specification Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Fix switchmix references on UDDF exportGravatar Miika Turkia
The switchmix values must be concatenated properly. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Fix mix reference on UDDF exportGravatar Miika Turkia
The mix value must be concatenated properly. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Export leadquantity only when we have weightsGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Export only used cylinders to divelogs.deGravatar Miika Turkia
This attempts to export only used cylinders to divelogs.de. The detection is based only on o2 percentage as per our test dives. However, the new cylinder id would be better, but that does not exist on old dives. Fixes #757 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Use ascii only IDs in _es manualGravatar Miika Turkia
Generation of PDF document fails if accented characters are used in references. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-13Include *.xml for Documentation cleanGravatar Miika Turkia
These files are left behind when creating PDF fails Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Fix bug in tankpressurebegin in UDDF exportGravatar Martin Long
There was a bug when the first sample doesn't contain pressure info. This fixes that by selecting the first with pressure info. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Lots of minor UDDF export tweaks.Gravatar Martin Long
The XDS schema for UDDF is very sensitive to ordering of elements so I've rearranged many of them to match. Elements in: - informationbeforedive - waypoint Adjusted namespace of export to correct UDDF namespace. Updated remaining references to mixes it include prefix 'mix' Moved equipment from informationbeforedive to informationafterdive * Change trip ids to generated IDs and updated tripmembership to use the trip id instead of the name * * These constitutes a difference in XSD and the documentation. I will raise these issues with the author. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-12-12Various minor fixes to UDDF exportGravatar Martin Long
Removed underscore from buddy name elements Added 'mix' prefix to gas ids. Ids must not start with a number. Added mandatory profile data with empty tags. Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
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>