Re: please test the Subsurface 4.0 binaries uploaded to the website

2013-12-16 Thread Anton Lundin
with a /usr/local prefix. Use something that is unlikely any other developer will be using. Like /Users/hohndel/Marble :-) That was exactly what i suggested in the other thread about this. //Anton -- Anton Lundin+46702-161604 ___ subsurface mailing

Re: [PATCH 2/2] Allow the user to specify weight units explicitly

2014-01-02 Thread Anton Lundin
of the horrors lurking there =) But, i should have spotted that one, cause i actually use a bunch of AL80's and AL40's, not for there fantastic volume units, but for the quite nice bouncy characteristics of them. //Anton -- Anton Lundin+46702-161604

Re: A quite wierd but intresting screenshot...

2014-01-14 Thread Anton Lundin
On 15 January, 2014 - Dirk Hohndel wrote: On Tue, 2014-01-14 at 21:20 +0100, Anton Lundin wrote: Played around with Qt5 today and managed to produce this. Looks like crap but its a quite nice proof of concept. That's on Android? Wow. Oh, and you seem to have some serious deco

[PATCH 2/2] Query pkg-config with libxml2 via default name to

2014-01-15 Thread Anton Lundin
On Ubuntu and in the source package, libxml2 defaults to naming its pkg-config file to libxml-2.0.pc so query after the package with that name to. I don't know what platform ships it as libxml2, so that might be a typo. Signed-off-by: Anton Lundin gla...@acc.umu.se --- subsurface-configure.pri

[PATCH 04/13] Remove unused variable

2014-01-15 Thread Anton Lundin
Signed-off-by: Anton Lundin gla...@acc.umu.se --- dive.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dive.c b/dive.c index 1a9bdd9..7d62616 100644 --- a/dive.c +++ b/dive.c @@ -612,7 +612,6 @@ static void mark_used_tanks(struct dive *dive, struct divecomputer *dc) /* walk all

[PATCH 06/13] Use setSectionResizeMode if we use Qt5

2014-01-15 Thread Anton Lundin
Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/printlayout.cpp | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp index e60a318..b058bbc 100644 --- a/qt-ui/printlayout.cpp +++ b/qt-ui/printlayout.cpp @@ -219,9

[PATCH 07/13] Make the include Qt5 compatible

2014-01-15 Thread Anton Lundin
Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/groupedlineedit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-ui/groupedlineedit.h b/qt-ui/groupedlineedit.h index 0433b06..6003573 100644 --- a/qt-ui/groupedlineedit.h +++ b/qt-ui/groupedlineedit.h @@ -30,7 +30,7

[PATCH 12/13] Don't downgrade tags to Ascii

2014-01-15 Thread Anton Lundin
Use Utf8 everywhere, and toAscii is depricated in Qt5 Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/maintab.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index be25ea1..9fa94c8 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui

[PATCH 13/13] In Qt5 reset() is depricated.

2014-01-15 Thread Anton Lundin
Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/models.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 82aa312..63b97ad 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -1577,7 +1577,8 @@ void TablePrintModel

Re: A quite wierd but intresting screenshot... and how you can make your own...

2014-01-15 Thread Anton Lundin
On 15 January, 2014 - Anton Lundin wrote: On 14 January, 2014 - Anton Lundin wrote: Played around with Qt5 today and managed to produce this. Looks like crap but its a quite nice proof of concept. So, after changing the font size it looked much less crap. A cross build script

Re: [PATCH 11/13] Convert to TRUE/FALSE to stdbools true/false

2014-01-15 Thread Anton Lundin
On 15 January, 2014 - Dirk Hohndel wrote: On Wed, 2014-01-15 at 13:59 +0200, Lubomir I. Ivanov wrote: On 15 January 2014 10:30, Anton Lundin gla...@acc.umu.se wrote: I had problems with this one on Qt5. this seems like a big change. could you elaborate why it was needed exactly? i

Re: [PATCH 09/13] QAbstractItemModel::reset doesn't exist in Qt5

2014-01-15 Thread Anton Lundin
On 15 January, 2014 - Thiago Macieira wrote: On quarta-feira, 15 de janeiro de 2014 09:30:40, Anton Lundin wrote: -void reset() { QAbstractItemModel::reset(); } +void reset(); I don't see how this one can compile if reset() is virtual or getting called by anything

Re: [PATCH 1/2] Fix linking order of libxslt and libxml

2014-01-15 Thread Anton Lundin
On 15 January, 2014 - Thiago Macieira wrote: On quarta-feira, 15 de janeiro de 2014 09:27:37, Anton Lundin wrote: libxslt depends on libxml, so we need xslt before xml on the linker-line. +1 I guess that you need this for linking statically to those two libs? Yepp. Without that some

Re: [PATCH] Stop doing the (very expensive) pow() calculation pointlessly

2014-01-22 Thread Anton Lundin
it, but I'm kinda busy right now with deliveries to customers, planning a trip to Africa and I'm getting married this weekend so its probably going to be next week before i can have some time over to actually think about this =) //Anton -- Anton Lundin+46702-161604

Re: [PATCH] Stop doing the (very expensive) pow() calculation pointlessly

2014-01-29 Thread Anton Lundin
on the mailinglist again. //Anton -- Anton Lundin+46702-161604 diff --git i/profile.c w/profile.c index 82aa274..5174832 100644 --- i/profile.c +++ w/profile.c @@ -1159,11 +1159,16 @@ static void calculate_deco_information(struct dive *dive, struct divecomputer *d for (i = 1; i pi-nr; i

Re: Everyone please read.... Re: GSOC 2014 is almost here - Volunteer mentors needed

2014-02-09 Thread Anton Lundin
Sorry for answering in a weird place in this thread, I'm on my phone with wherry little internet for another week. I can volunteer as a mentor. I also have another idea for a gsoc project. The idea is to build a ci/cb environment to test build our code on all our platforms and have a good

[PATCH 2/3] Add some notes about vim settings for our style

2014-02-27 Thread Anton Lundin
Basic vim settings to mostly follow our coding style. Signed-off-by: Anton Lundin gla...@acc.umu.se --- CodingStyle | 29 + 1 file changed, 29 insertions(+) diff --git a/CodingStyle b/CodingStyle index a3e4fd1..04fe7f5 100644 --- a/CodingStyle +++ b/CodingStyle

[PATCH 3/3] Remove old leftover header

2014-02-27 Thread Anton Lundin
This got merged into a common divelogimportdialog. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/csvimportdialog.h | 53 - 1 file changed, 53 deletions(-) delete mode 100644 qt-ui/csvimportdialog.h diff --git a/qt-ui/csvimportdialog.h b

[PATCH] Switch profile button events, clicked to toggled

2014-02-27 Thread Anton Lundin
This is needed so the underlaying struct preferences prefs, will be updated when we set the buttons to there previous state after we loaded the settings. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/mainwindow.cpp | 26 +- qt-ui/mainwindow.h | 26

Re: [PATCH] Make Marble optional

2014-03-01 Thread Anton Lundin
@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface

Re: GSoC project idea - CMake based build system for Subsurface and libdivecomputer

2014-03-01 Thread Anton Lundin
windows native builds. (msvc must be as native as it gets on windows?) //Anton -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface

Re: Gsoc idea: Android downloader

2014-03-03 Thread Anton Lundin
On 03 March, 2014 - Jef Driesen wrote: On 2014-02-26 09:45, Anton Lundin wrote: One idea i bin playing with is how to make the Android port capable of downloading data from divecomputers. A port of libdivecomputer to Android is also something I'm interested in. Bringing your smartphone

Re: [PATCH] Make Marble optional

2014-03-04 Thread Anton Lundin
/subsurface -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface

Re: [PATCH] Make Marble optional

2014-03-04 Thread Anton Lundin
to be included into maintab.h in order for QSettings to be defined. I can't find any reason for that change to interact with the rest of the code. //Anton On Tue, Mar 04, 2014 at 09:33:13AM +0100, Anton Lundin wrote: On 03 March, 2014 - Alberto Corona wrote: Here's the link again as I forgot

Re: [PATCH] Make Marble optional

2014-03-06 Thread Anton Lundin
was unclear again and didn't ask if I could continue using some of your work, the reason for me continuing this thread was to communicate with you and then see if you'd like me to ammend the commit message and or send you the patch for your SOB. On Tue, Mar 4, 2014 at 5:34 PM, Anton Lundin

Re: Error during compilation of Libdivecomputer for android

2014-03-16 Thread Anton Lundin
in the android divecomputer downloader and this application is its foundation. Please help. I started to rebase those patches but i ran out of steam when trying to whip libgit2 into the build chain. I pushed out what it looks like so far. //Anton -- Anton Lundin+46702-161604

Some subsurface notes from a week of diving

2014-03-16 Thread Anton Lundin
switching to oxygen(EAN100), the EAD and END values in the info box goes -2147483m. Unsigned zero as signed? Add to trip below is missing. -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org

Re: Error during compilation of Libdivecomputer for android

2014-03-17 Thread Anton Lundin
On 18 March, 2014 - Venkatesh Shukla IIT BHU wrote: On Mon, Mar 17, 2014 at 9:35 PM, Anton Lundin gla...@acc.umu.se wrote: On 16 March, 2014 - Anton Lundin wrote: I started to rebase those patches but i ran out of steam when trying to whip libgit2 into the build chain. I pushed

[PATCH] Don't calculate with NaN when on 100% o2

2014-03-17 Thread Anton Lundin
Fixes: 465 Signed-off-by: Anton Lundin gla...@acc.umu.se --- profile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/profile.c b/profile.c index 2102179..20f157c 100644 --- a/profile.c +++ b/profile.c @@ -1131,6 +1131,9 @@ static void calculate_gas_information_new(struct dive *dive

[PATCH] Translate using tr() to be Qt5-compatible

2014-03-17 Thread Anton Lundin
There are no utf8 in those strings, and we can translate them as everything else with tr() instead. QApplication::UnicodeUTF8-part is deprecated and removed in Qt5. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/maintab.cpp | 8 1 file changed, 4 insertions(+), 4 deletions

[PATCH v2] Translate using tr() to be Qt5-compatible

2014-03-17 Thread Anton Lundin
There are no utf8 in those strings, and we can translate them as everything else with tr() instead. QApplication::UnicodeUTF8-part is deprecated and removed in Qt5. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/maintab.cpp | 8 1 file changed, 4 insertions(+), 4 deletions

Re: New profile, line thickness of pp-graphs and ruler in Qt5

2014-03-18 Thread Anton Lundin
On 18 March, 2014 - Lubomir I. Ivanov wrote: On 18 March 2014 16:40, Lubomir I. Ivanov neolit...@gmail.com wrote: On 18 March 2014 16:14, Anton Lundin gla...@acc.umu.se wrote: I just played around with Qt5 a bit and noticed that the pp-graph lines are way to thick and the ruler line too

Re: New profile, line thickness of pp-graphs and ruler in Qt5

2014-03-18 Thread Anton Lundin
On 18 March, 2014 - Dirk Hohndel wrote: On Tue, 2014-03-18 at 17:05 +0200, Lubomir I. Ivanov wrote: On 18 March 2014 16:40, Lubomir I. Ivanov neolit...@gmail.com wrote: On 18 March 2014 16:14, Anton Lundin gla...@acc.umu.se wrote: I just played around with Qt5 a bit and noticed

[PATCH] Link to marbledata when building out of tree

2014-03-18 Thread Anton Lundin
When building and running subsurface out of tree, marbledata was inaccessible to subsurface. Signed-off-by: Anton Lundin gla...@acc.umu.se --- subsurface.pro | 4 1 file changed, 4 insertions(+) diff --git a/subsurface.pro b/subsurface.pro index 988161f..4cca263 100644 --- a/subsurface.pro

Re: New profile, line thickness of pp-graphs and ruler in Qt5

2014-03-18 Thread Anton Lundin
...@gmail.com wrote: On 18 March 2014 16:14, Anton Lundin gla...@acc.umu.se wrote: I just played around with Qt5 a bit and noticed that the pp-graph lines are way to thick and the ruler line too. see attached patch. is that a fix for the ruler line? updated with the pp-graph lines

Re: Marbledata for out of tree builds

2014-03-18 Thread Anton Lundin
On 18 March, 2014 - Lubomir I. Ivanov wrote: On 18 March 2014 18:17, Lubomir I. Ivanov neolit...@gmail.com wrote: On 18 March 2014 17:51, Anton Lundin gla...@acc.umu.se wrote: Nowadays when i testbuild things for Qt4 and Qt5 ive started to build out of tree to make it easy to compare

Re: Marbledata for out of tree builds

2014-03-18 Thread Anton Lundin
On 18 March, 2014 - Lubomir I. Ivanov wrote: On 18 March 2014 18:29, Anton Lundin gla...@acc.umu.se wrote: On 18 March, 2014 - Lubomir I. Ivanov wrote: On 18 March 2014 18:17, Lubomir I. Ivanov neolit...@gmail.com wrote: On 18 March 2014 17:51, Anton Lundin gla...@acc.umu.se wrote

[PATCH v2] Link to marbledata when building out of tree

2014-03-18 Thread Anton Lundin
When building and running subsurface out of tree, marbledata was inaccessible to subsurface. Signed-off-by: Anton Lundin gla...@acc.umu.se --- subsurface.pro | 4 1 file changed, 4 insertions(+) diff --git a/subsurface.pro b/subsurface.pro index 988161f..98f23b7 100644 --- a/subsurface.pro

[PATCH] Enable posibility to add dives to trip below

2014-03-20 Thread Anton Lundin
When I'm on a dive trip i usually download dives multiple times to start logging them while i still remember them. When i have already created a trip and downloads new dives they needs to be able to be added to the already existing trip, without relying on autogroup. Signed-off-by: Anton Lundin

Re: [PATCH] Fixing ticket #468 Up/Down arrows don't work with tags

2014-03-21 Thread Anton Lundin
and save, the tag/buddy saved becomes Bud. If i choose the right tag with the mouse instead of the arrow keys it does the right thing. //Anton -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi

Re: [PATCH 2/2] esc-key would discard the new tag selection

2014-03-21 Thread Anton Lundin
ends up behind the dropdown when the This dive is being edited blob gets created. If i hit esc to get rid of the dropdown, it removes the Buddy 1 tag, but subsurface haven't noticed that edit on the textbox so when i hit save the tag returns. //Anton -- Anton Lundin+46702-161604

Re: [PATCH] Fixing ticket #468 Up/Down arrows don't work with tags

2014-03-21 Thread Anton Lundin
On 21 March, 2014 - Gehad wrote: On 03/21/2014 12:43 PM, Anton Lundin wrote: On 19 March, 2014 - Gehad wrote: From 07f1ac411771627cfba9eae98511d82bbbcdc17b Mon Sep 17 00:00:00 2001 From: Gehad elrobey gehadelro...@gmail.com Date: Wed, 19 Mar 2014 18:07:41 +0200 Subject: [PATCH] Up/Down

[PATCH] Fix system default font handling

2014-03-21 Thread Anton Lundin
We didn't care about system default fonts and sizes, we just used the Qt default font. Due to how QFont is constructed, there was need to split font and font size. Signed-off-by: Anton Lundin gla...@acc.umu.se --- linux.c | 3 ++- macos.c | 3 ++- pref.h

[PATCH] Enable parts of planner based on define

2014-03-22 Thread Anton Lundin
In bf205726 DEPTH/Switch at was disabled by commenting out that code. This puts it back behind ifdefs Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/diveplanner.cpp | 5 +++-- qt-ui/maintab.cpp | 5 +++-- qt-ui/models.cpp | 22 +++--- qt-ui/models.h

Re: [PATCH] Don't crash if we try to save a empty plan

2014-03-22 Thread Anton Lundin
On 22 March, 2014 - Lakshman wrote: On Sat, Mar 22, 2014 at 9:13 AM, Anton Lundin gla...@acc.umu.se wrote: Just treat it as a cancel instead. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/diveplanner.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qt-ui

Re: Qt5 on subsurface-android

2014-03-25 Thread Anton Lundin
be possible to build a touch friendly ui with Qt5 so i would suggest starting in that end. //Anton 1. https://github.com/glance-/subsurface/blob/android/android.cpp#L17 -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http

[PATCH 3/5] Disable marble on Android

2014-03-26 Thread Anton Lundin
marble uses webkit, and thats not compatible with Android. Signed-off-by: Anton Lundin gla...@acc.umu.se --- subsurface-configure.pri | 3 +++ 1 file changed, 3 insertions(+) diff --git a/subsurface-configure.pri b/subsurface-configure.pri index 84e2599..28c567f 100644 --- a/subsurface

[PATCH 4/5] Remove usermanual when building for Android

2014-03-26 Thread Anton Lundin
Our usermanual is based on webkit, and thats not supported in Qt for Android. We should probably replace it with a Android native webview somehow. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/mainwindow.cpp | 5 + qt-ui/mainwindow.h | 2 +- qt-ui/usermanual.h | 1

[PATCH 2/5] Introduce android specific file

2014-03-26 Thread Anton Lundin
This contains a first stab at Subsurface platform interfacing code for Android, and surrounding parts. Signed-off-by: Anton Lundin gla...@acc.umu.se --- android.cpp| 81 ++ subsurface-install.pri | 3 ++ subsurface.pro | 6

[PATCH 1/5] Introduce NO_MARBLE define, make GlobeGPS a dummy

2014-03-26 Thread Anton Lundin
of the code. Fixes #394 Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/globe.cpp | 10 ++ qt-ui/globe.h| 18 ++ qt-ui/mainwindow.cpp | 4 subsurface-configure.pri | 6 -- 4 files changed, 36 insertions(+), 2 deletions(-) diff

[PATCH 5/5] Remove printing when building for Android

2014-03-26 Thread Anton Lundin
Qt for Android doesn't support printing. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/mainwindow.cpp | 5 + qt-ui/printdialog.h | 1 - subsurface-configure.pri | 2 +- subsurface.pro | 16 4 files changed, 18 insertions(+), 6 deletions

[PATCH v2 4/4] Remove usermanual when building for Android

2014-03-26 Thread Anton Lundin
Our usermanual is based on webkit, and thats not supported in Qt for Android. We should probably replace it with a Android native webview somehow. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/mainwindow.cpp | 8 qt-ui/mainwindow.h | 3 +-- qt-ui/usermanual.h

[PATCH v2 5/5] Remove printing when building for Android

2014-03-26 Thread Anton Lundin
Qt for Android doesn't support printing. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/mainwindow.cpp | 7 +++ qt-ui/printdialog.h | 1 - subsurface-configure.pri | 2 +- subsurface.pro | 16 4 files changed, 20 insertions(+), 6 deletions

Crash after saving to a git repo

2014-03-31 Thread Anton Lundin
-2.19.so) The bug goes away when building against current head of libgit2. I haven't had the time to debug this any further, but the interesting thing is to figure out if we should try to force a libgit2 0.19 or if the bug is somewhere in our code. //Anton -- Braindumping -- Anton Lundin

Re: Crash after saving to a git repo

2014-03-31 Thread Anton Lundin
it to a new branch in a fresh git-repo. I'm kinda confused that I'm seem to be the only one hitting this one, because i can reproduce it to 100%. //Anton -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http

Re: Crash after saving to a git repo

2014-03-31 Thread Anton Lundin
On 31 March, 2014 - Dirk Hohndel wrote: On Mon, 2014-03-31 at 19:57 +0200, Anton Lundin wrote: I trigger this after loading my xml file and then trying to save it to a new branch in a fresh git-repo. I'm kinda confused that I'm seem to be the only one hitting this one, because i can

Re: Crash after saving to a git repo

2014-03-31 Thread Anton Lundin
On 31 March, 2014 - Linus Torvalds wrote: On Mon, Mar 31, 2014 at 1:21 PM, Anton Lundin gla...@acc.umu.se wrote: I managed to figure out that the Ubuntu version is built with -DTHREADSAFE=ON, but the packages both in f19 and f20 is built without threadsafe. Ahh. I think we need

Re: [PATCH] First row visibility fix in Dive List

2014-04-02 Thread Anton Lundin
) ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman

Re: [PATCH] First row visibility fix in Dive List

2014-04-02 Thread Anton Lundin
-48) ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface -- Anton Lundin+46702-161604 -- Anton Lundin+46702-161604

[PATCH] Rely on ENABLE_PLANNER to enable the planner

2014-04-05 Thread Anton Lundin
The removal of the planner menu entry was erroneously commented out. Other parts of the code rely on ENABLE_PLANNER to know if the planner is enabled or not so rely on it here to. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1

Re: Updates to user manual

2014-04-07 Thread Anton Lundin
On 07 April, 2014 - Anton Lundin wrote: On 07 April, 2014 - Willem Ferguson wrote: Recently I submitted a patch with updates to the user manual. Included in that was a section dealing with the dive planner. It now appears that the visibility of the planner was just a glitch and that V4.1

[PATCH 3/3] Qt turns edited locations into null-strings

2014-05-06 Thread Anton Lundin
They aren't null pointers after you touched them, so we can't rely on that to choose if we should use put_string or show_utf8. show_utf8 would not print the tag if it only contains a \0 as body. Fixes #440 Signed-off-by: Anton Lundin gla...@acc.umu.se --- save-xml.c | 2 +- 1 file changed, 1

[PATCH 1/3] Revert Save latitude and longitude on XML even if location not set

2014-05-06 Thread Anton Lundin
This fixes the bug in #440 by accident, and introduces lots of empty attributes and tags in the xml. This reverts commit 6378bfd91ee6c0ad746b072d8a9389e0eba7c614. Signed-off-by: Anton Lundin gla...@acc.umu.se --- save-xml.c | 27 ++- 1 file changed, 18 insertions(+), 9

[PATCH 2/3] Terminate the string before relying on strlen

2014-05-06 Thread Anton Lundin
Its a c-string we put, so it must be null-terminated. Signed-off-by: Anton Lundin gla...@acc.umu.se --- save-xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/save-xml.c b/save-xml.c index 54a0a86..227b952 100644 --- a/save-xml.c +++ b/save-xml.c @@ -191,7 +191,7

[PATCH] Rewrite show_location to use membuffer primitives

2014-05-06 Thread Anton Lundin
This simplifies the logic and doesn't rely on show_utf8 to print empty blocks. Signed-off-by: Anton Lundin gla...@acc.umu.se --- save-xml.c | 58 ++ 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/save-xml.c b/save-xml.c

Re: [PATCH 1/3] Revert Save latitude and longitude on XML even if location not set

2014-05-07 Thread Anton Lundin
On 06 May, 2014 - Linus Torvalds wrote: On Tue, May 6, 2014 at 3:27 PM, Anton Lundin gla...@acc.umu.se wrote: This fixes the bug in #440 by accident, and introduces lots of empty attributes and tags in the xml. + + if (!text) + return; + while (isspace(*text

[PATCH] Only mark location changed when in edit mode

2014-05-07 Thread Anton Lundin
Otherwise the code loading a dive into the field would mark it as changed. This re-adds this code that got removed in a209dfbfd53 (Multi dive edit: don't change location texts until user saves the change) Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/maintab.cpp | 2 ++ 1 file changed

[PATCH] Apply the edit of trip locations

2014-05-07 Thread Anton Lundin
This re-adds this code that got removed in a209dfbfd53 (Multi dive edit: don't change location texts until user saves the change) Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/maintab.cpp | 5 + 1 file changed, 5 insertions(+) diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp

[PATCH] Remove unnecessary include from dive.c

2014-05-08 Thread Anton Lundin
Signed-off-by: Anton Lundin gla...@acc.umu.se --- dive.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dive.c b/dive.c index 4bae245..dbd811a 100644 --- a/dive.c +++ b/dive.c @@ -6,7 +6,6 @@ #include limits.h #include gettext.h #include dive.h -#include planner.h struct tag_entry

[PATCH] Use enum name instead of its int value.

2014-05-08 Thread Anton Lundin
SAMPLE_EVENT_GASCHANGE2 is the libdivecomputer name of the event. Compare with that instead of its int value. Signed-off-by: Anton Lundin gla...@acc.umu.se --- profile.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/profile.c b/profile.c index 373ac8e..8289f68 100644

[PATCH] Use the used flag on cylinders in get_dive_gas

2014-05-08 Thread Anton Lundin
Now when we have a used flag on every cylinder that are set in mark_used_tanks we can use it here. Signed-off-by: Anton Lundin gla...@acc.umu.se --- divelist.c | 39 +++ 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/divelist.c b/divelist.c

Re: [PATCH] CodingStyle to too typo

2014-05-10 Thread Anton Lundin
obviously hard for me. Two spelling errors in tree lines. //Anton - Start writing code with set spell? -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http://lists.hohndel.org/cgi-bin/mailman/listinfo/subsurface

[PATCH] Migrate code to for_each_dive and for_each_dc

2014-05-13 Thread Anton Lundin
--- dive.c | 5 + divecomputer.cpp | 5 ++--- qt-ui/divelistview.cpp | 7 ++- qt-ui/maintab.cpp | 8 save-xml.c | 6 +- statistics.c | 12 +--- uemis-downloader.c | 8 7 files changed, 19

[PATCH] Use get_o2 instead of local version

2014-05-13 Thread Anton Lundin
Signed-off-by: Anton Lundin gla...@acc.umu.se --- divelist.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/divelist.c b/divelist.c index b199710..4724e72 100644 --- a/divelist.c +++ b/divelist.c @@ -154,12 +154,9 @@ int total_weight(struct dive *dive) static int

[PATCH] Fix building with NO_MARBLE, centerOnCurrentDive

2014-05-13 Thread Anton Lundin
2bc76beb65 (Globe: we always center on the current dive) changed GlobeGPS::centerOn to GlobeGPS::centerOnCurrentDive. This patches the dummy in NO_MARBLE to. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/globe.cpp | 2 +- qt-ui/globe.h | 2 +- 2 files changed, 2 insertions(+), 2

[PATCH] Fix building with NO_MARBLE prepareForGetDiveCoordinates

2014-05-13 Thread Anton Lundin
fb82da58a2 (Globe: assume that we are looking at the current_dive) changed the prototype for GlobeGPS::prepareForGetDiveCoordinates. This patches the dummy in NO_MARBLE. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/globe.cpp | 2 +- qt-ui/globe.h | 2 +- 2 files changed, 2

Re: [PATCH] Move mod calculations to a separate helper

2014-05-13 Thread Anton Lundin
Older compilers didn't really like this one, so hold this one for now... On 14 May, 2014 - Anton Lundin wrote: We use mod calculations on multiple places, so make a separate helper from it with proper types. Signed-off-by: Anton Lundin gla...@acc.umu.se --- dive.h| 4

Re: [PATCH] Move mod calculations to a separate helper

2014-05-14 Thread Anton Lundin
On 14 May, 2014 - Robert Helling wrote: On 14.05.2014, at 00:32, Anton Lundin gla...@acc.umu.se wrote: We use mod calculations on multiple places, so make a separate helper from it with proper types. Good idea. Some people like to use different max ppO2’s during bottom time (e.g

[PATCH v2] Move mod calculations to a separate helper

2014-05-25 Thread Anton Lundin
to Tiago and Linus for pointing me in the right direction. Signed-off-by: Anton Lundin gla...@acc.umu.se --- dive.h| 6 ++ profile.c | 3 ++- qt-ui/diveplanner.cpp | 7 +++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dive.h b/dive.h index 05da287

[PATCH] Use gas_mod and fix fpe

2014-05-25 Thread Anton Lundin
When removing o2 from a gas, eg setting it to , air, this code would raise a nice fpe. Fix that by using gas_mod instead. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/downloadfromdivecomputer.cpp | 5 ++--- qt-ui/downloadfromdivecomputer.h | 2 +- qt-ui/models.cpp

Re: [PATCH] Use gas_mod and fix fpe

2014-05-25 Thread Anton Lundin
This is crap. Managed to get some other things included in this commit. I'm going to clean this up and re-send. //Anton On 25 May, 2014 - Anton Lundin wrote: When removing o2 from a gas, eg setting it to , air, this code would raise a nice fpe. Fix that by using gas_mod instead. Signed

[PATCH] Use gas_mod and fix fpe

2014-05-25 Thread Anton Lundin
When removing o2 from a gas, eg setting it to , air, this code would raise a nice fpe. Fix that by using gas_mod instead. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/models.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp

Re: [PATCH] Rework slot to quiet down Qt5 warning

2014-05-26 Thread Anton Lundin
at 12:06:56AM +0200, Anton Lundin wrote: diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp index 681b0d2..71f428b 100644 --- a/qt-ui/downloadfromdivecomputer.cpp +++ b/qt-ui/downloadfromdivecomputer.cpp @@ -72,7 +72,6 @@ DownloadFromDCWidget

[PATCH] Switch to the new gasmix structure in dump_plan

2014-06-05 Thread Anton Lundin
dump_plan wasn't updated when the switch from he/o2 to gasmix was done in the planner code, this makes it compile again. Signed-off-by: Anton Lundin gla...@acc.umu.se --- planner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/planner.c b/planner.c index 438b84c..242fbac

[PATCH] Fix out of tree building without asciidoc

2014-06-08 Thread Anton Lundin
We tried to copy the .html.git file from the out of tree build dir, not from the source dir. Signed-off-by: Anton Lundin gla...@acc.umu.se --- Documentation/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 5ef7c38

[PATCH] Gas was printed in permille, use gasname instead

2014-06-08 Thread Anton Lundin
After the switch to a central event decoder and just return gasmix from that we printed things in permille, eg. EAN1000 and 180/550 which looks kinda strange. This fixes that by using gasname instead to give the gas a name. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/profile

Re: What's missing for 4.2?

2014-06-09 Thread Anton Lundin
. * Summarize gas consumption over multiple dives. After a trip when trying to figure out how much HE/O2 I used, it would be great if we could get a summary from the pressures and gases that i entered into Subsurface. Eg. During this trip i used up 15000L HE and 6000L O2. //Anton -- Anton Lundin

Re: What's missing for 4.2?

2014-06-09 Thread Anton Lundin
On 09 June, 2014 - Jef Driesen wrote: On 09-06-14 17:55, Dirk Hohndel wrote: On Mon, Jun 09, 2014 at 05:03:16PM +0200, Anton Lundin wrote: * When i downloaded the profiles from my Suunto Vyper that was in gauge mode during the trip, i got a Air cylinder added to all the dives

Re: What's missing for 4.2?

2014-06-10 Thread Anton Lundin
On 10 June, 2014 - Jef Driesen wrote: On 2014-06-09 21:39, Anton Lundin wrote: On 09 June, 2014 - Jef Driesen wrote: On 09-06-14 17:55, Dirk Hohndel wrote: On Mon, Jun 09, 2014 at 05:03:16PM +0200, Anton Lundin wrote: * When i downloaded the profiles from my Suunto Vyper that was in gauge

[PATCH] Don't ignore actual diveable mixes

2014-06-10 Thread Anton Lundin
gases too. Signed-off-by: Anton Lundin gla...@acc.umu.se --- libdivecomputer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdivecomputer.c b/libdivecomputer.c index e8a0338..8add6fd 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -116,9 +116,9 @@ static int

Re: What's missing for 4.2?

2014-06-10 Thread Anton Lundin
On 10 June, 2014 - Dirk Hohndel wrote: Let's follow up on this older message... On Mon, Jun 09, 2014 at 08:55:50AM -0700, Dirk Hohndel wrote: On Mon, Jun 09, 2014 at 05:03:16PM +0200, Anton Lundin wrote: A couple of random notes from my last diving trip, some of them to be worked

Re: What's missing for 4.2?

2014-06-10 Thread Anton Lundin
On 10 June, 2014 - Anton Lundin wrote: On 10 June, 2014 - Dirk Hohndel wrote: As discussed, part of this was implemented. The part that's missing seems a tiny bit too user specific. Breaking this down as volume of air + volume of O₂ + volume of He is of course possible, but I'm

Re: What's missing for 4.2?

2014-06-11 Thread Anton Lundin
On 10 June, 2014 - Dirk Hohndel wrote: On Wed, Jun 11, 2014 at 12:30:22AM +0200, Anton Lundin wrote: Quite ugly thing but it kinda works. You hopefully get the idea. //Anton -- Anton Lundin+46702-161604 diff --git i/helpers.h w/helpers.h index 392dcb5..36ceb1e

Quick versions of TTS calculations

2014-06-11 Thread Anton Lundin
stop disabling TTS/NDL when i would like to look at the numbers from my dives. //Anton -- Anton Lundin+46702-161604 diff --git i/profile.c w/profile.c index b40ef62..19bc03e 100644 --- i/profile.c +++ w/profile.c @@ -1070,6 +1070,15 @@ static void calculate_ndl_tts(double tissue_tolerance

[PATCH] Fix CNS math, / vs. *

2014-06-12 Thread Anton Lundin
Back in Fix ATM-vs-bar confusion, e58f54cac, there was a typo that broke CNS calculations. This fixes them again. Signed-off-by: Anton Lundin gla...@acc.umu.se --- divelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/divelist.c b/divelist.c index decc07a..a075838 100644

[PATCH] Fix building with NO_MARBLE again

2014-06-17 Thread Anton Lundin
Back in 708f19830e2a (Planner: New plannerSettingsWidget) the Globe widget handling changed, and this updates the NO_MARBLE build option to work after that. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/mainwindow.cpp | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff

[PATCH] Enable Info box in the planner again.

2014-06-17 Thread Anton Lundin
Its great to be able to see the planned turn pressure, EADD at different points and so on. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/profile/profilewidget2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile

Re: GSoC: iOS Subsurface companion app (week 5)

2014-06-23 Thread Anton Lundin
resolution (largest image that I have found is only 600x600)? http://git.hohndel.org/?p=subsurface.git;a=blob;f=subsurface-icon.svg I think that would suite your needs? //Anton -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface

[PATCH] Fix NO_PRINTING building again

2014-06-23 Thread Anton Lundin
Back in 6699e3ab (Add print button to planner) unconditional printing code was added. This puts that same code behind NO_PRINTING macro. Signed-off-by: Anton Lundin gla...@acc.umu.se --- qt-ui/diveplanner.cpp | 3 +++ qt-ui/mainwindow.cpp | 4 +++- 2 files changed, 6 insertions(+), 1 deletion

Re: [PATCH] Template for subsurface android package

2014-06-24 Thread Anton Lundin
(Leonardo) Custom PID -- +usb-device vendor-id=1027 product-id=63104/ +/resources + Another trailing newline here. The rest of it looks good to me. //Anton -- Anton Lundin+46702-161604 ___ subsurface mailing list subsurface@hohndel.org http

  1   2   3   >