I had some double profiles with slight differences in them, until I
realized that this was caused by including deleted dives in the import.
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
We don't use the data coming from DiveMixture so removing the join. The
join did also generate extra rows of the same dive (with differing gas
info).
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
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>
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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
