Commit graph

7690 commits

Author SHA1 Message Date
Miika Turkia
27d0cd68fc Import DC info properly from DM5 log
Using serial number as device ID here for simplicity. We also need the
DC info for the divecomputer tag per dive. And it seems that serial
number is in SerialNumber, SourceSerialNumber or both.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22 07:47:54 -08:00
Miika Turkia
5330a612c5 Support for gas changes in DM5 import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22 07:46:44 -08:00
Salvador Cuñat
3610c7b3b7 merge conflicts
Backport to 4.4.1 because of unresolved merge conflicts from f1f0294

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22 07:46:28 -08:00
Miika Turkia
a76d5fb966 Fix surface pressure on DM5 import
Seems that DM5 uses pascal as pressure unit for surface pressure.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-22 07:46:14 -08:00
Guillaume GARDET
fc0d2a3fdb Documentation: Merge/update french user-manual translation
Update french translation of user-manual.

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-20 02:55:26 -08:00
Dirk Hohndel
762315e7ee Update Qt4 patch
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19 21:52:41 -08:00
Dirk Hohndel
6a2efd9ff6 The callback function has to return 0 or sql processing fails
Which means we report an error even if there wasn't a problem.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19 19:52:58 -08:00
Dirk Hohndel
4682002474 Braces are better than indentation to scope if / if / else
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19 19:47:06 -08:00
Miika Turkia
1301cb9664 Use 12 liter default on DM5 import
As the comment says, default to 12 liters if cylinder size is zero.
This is done only when cylinder has start pressure given.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19 19:45:32 -08:00
Miika Turkia
5d18876e78 Support multiple cylinders on DM5 import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-19 19:45:25 -08:00
Dirk Hohndel
f1f02941c7 Merge branch 'v4.4-branch' back into master
The manuals all will need a careful read.
The changes to use lsb-release and the PCLinuxOS specific files got lost
because I didn't want to try to rewite this in the middle of a merge.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Conflicts:
	Documentation/50-pot/subsurface-manual.pot
	Documentation/fr/po/subsurface-manual.fr.po
	Documentation/user-manual.txt
	Documentation/user-manual_es.txt
	Documentation/user-manual_fr.html.git
	Documentation/user-manual_fr.txt
	Documentation/user-manual_ru.html.git
	Documentation/user-manual_ru.txt
	file.c
	qthelper.cpp
	subsurface.pro
	subsurfacesysinfo.cpp
	xslt/DiveLog.xslt
2015-02-19 19:44:37 -08:00
Miika Turkia
554b652d25 DiveLog import: Only include weight when available
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 11:11:03 -08:00
Miika Turkia
541ec4fcac Add some extra data for DiveLog import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 11:10:54 -08:00
Miika Turkia
b87eb78192 Add serial number to DiveLog import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 11:10:38 -08:00
Miika Turkia
f7365015ff Include Boat in DiveLog import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 11:10:32 -08:00
Dirk Hohndel
ea2eb6afe3 Update the ubuntu / debian build rules
Dang. I didn't pay attention that commit 2677f3ca79 ("LIBMARBLEDEVEL
points to an install dir, not a build dir") broke the way I build the
Linux binaries.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 10:37:48 -08:00
Dirk Hohndel
caa153af79 Correctly detect more Linux distributions
I don't think there's a way we can track all of the variations here, but
this supports any distribution that supports the lsb-release standard and
adds extra detection to correctly decode the PCLinuxOS version as they
neither implement /etc/os-release nor completely implement
/etc/lsb-release

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 07:42:48 -08:00
Dirk Hohndel
25d2f187e0 INSTALL: remove the detailed install instructions
It's much easier to just keep the build.sh script working and ask people
to use that instead of all the confusion with the detailed instructions.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 00:17:02 -08:00
Dirk Hohndel
56e1b11c0a Add instructions for building Subsurface under PCLinuxOS
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 00:16:52 -08:00
Dirk Hohndel
b33376e561 Use QMAKE_RPATHDIR instead of -Wl,-rpath
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-18 00:07:37 -08:00
Dirk Hohndel
46ce3043a1 Fix rpath syntax
It appears that gcc toolchains want rpath passed as -Wl,-rpath

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 23:20:16 -08:00
Dirk Hohndel
86274b603e build.sh: use setRpath and remove run.sh
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 23:07:53 -08:00
Dirk Hohndel
26f03be236 build.sh: figure out whether to use qmake or qmake-qt5
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 22:03:15 -08:00
Dirk Hohndel
74fad4a7ce xsltMaxVars was only introduced in libxslt 1.1.27
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 22:00:26 -08:00
Dirk Hohndel
12b73912f2 Use rpath to make binaries run without LD_LIBRARY_PATH
When building binaries with our custom libraries it is always a pain to
ensure that all the libraries are found. Adding an rpath can help.

When running qmake with CONFIG+=setRpath we include the paths for our
private builds of libgit2 and libssrfmarble (assuming those are not using
the system libraries).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 21:48:22 -08:00
Dirk Hohndel
2677f3ca79 LIBMARBLEDEVEL points to an install dir, not a build dir
Since we can't get correct include files out of the build directory
without some major hackery, we need to have LIBMARBLEDEVEL point to an
install destination.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 16:31:20 -08:00
Lubomir I. Ivanov
aa7f2eeb8a subsurfacewebservices.cpp: add QDebug include
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 14:08:44 -08:00
Lubomir I. Ivanov
8053a61442 simplewidgets.cpp: QLineEdit::setClearButtonEnabled() is from Qt5.2
This could cause problems if the user tries to compile with
Qt versions between 5.0 and 5.2.

Reported-by: Michele Fabi <fabiemme@gmail.com>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 14:08:36 -08:00
Miika Turkia
6c0a6af4aa Adding more Suunto events
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 14:07:29 -08:00
Miika Turkia
265128451f Add visibility and weather to dive notes
This adds a bit more information to dive notes on DiveLog import.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 14:07:25 -08:00
Miika Turkia
169fb32484 Add time to DiveLog import
I originally thought about converting the time as well, but my fingers
were too slow and memory too short to actually do that :D

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 14:07:22 -08:00
Miika Turkia
3580c546db Quote tags as attributes
We need to quote the tick char (') on tags as this is used as XML
attribute.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 14:07:15 -08:00
Miika Turkia
5632c0b357 Add limits to cylinder maximum pressures on DM5 import
DM5 seems to have occasionally bogus data for cylinder start and end
pressures. Need to validate that.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 14:07:11 -08:00
Miika Turkia
56f6df4cd8 Hook up DiveLog import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 14:07:01 -08:00
Miika Turkia
3aaa995fc9 XSLT to import MacDive logs
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 14:06:55 -08:00
Dirk Hohndel
c10cc87427 Get ready for Subsurface 4.4.1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 13:55:27 -08:00
Dirk Hohndel
0fb84b8a8a Updated Qt4 patch
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 13:40:57 -08:00
Dirk Hohndel
b71cd66cd2 Document the new scripts in the INSTALL file
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 13:20:08 -08:00
Dirk Hohndel
0d70a597cd Add build and run script for people wanting to build from source
These scripts should make it easier to build from source on platforms
where we don't supply binaries. They should ensure the correct libraries
are build and then used at run time

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 13:10:45 -08:00
Miika Turkia
371feac82f Add visibility and weather to dive notes
This adds a bit more information to dive notes on DiveLog import.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 12:29:00 -08:00
Miika Turkia
4f26240b55 Add time to DiveLog import
I originally thought about converting the time as well, but my fingers
were too slow and memory too short to actually do that :D

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 12:28:56 -08:00
Miika Turkia
acff84a58d Quote tags as attributes
We need to quote the tick char (') on tags as this is used as XML
attribute.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 12:28:35 -08:00
Miika Turkia
598d5866c2 Hook up DiveLog import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 12:28:20 -08:00
Miika Turkia
3f070eadd1 XSLT to import MacDive logs
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 12:28:17 -08:00
Dirk Hohndel
f191f3d845 Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 08:59:25 -08:00
Dirk Hohndel
2d7e8d5ac6 Update html files for user manual to latest versions
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 08:57:53 -08:00
Gehad elrobey
bf31dc01a4 Fix error on HTML worldmap exports.
As HTML worldmap export produces wrong HTML in languages that contains
apostrophe in air/water temperature fields like italian. Translated
strings need to be HTML quoted.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 08:52:29 -08:00
Gehad elrobey
98d1dbef11 HTML: Fix Null values in yearly statistics export.
Null values should be handeled nicely instead of showing NULL or Nan.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 08:52:21 -08:00
Gehad elrobey
043ab5b02c HTML: Fix exporting themes in multilingual environment
Don't compare to static english string, must translate first.

Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 08:52:16 -08:00
Miika Turkia
9e92d27bd0 Add ssrf as dive log extension on import
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-02-17 08:52:11 -08:00