On Sun, Jul 12, 2015 at 11:07 AM, Dirk Hohndel d...@hohndel.org wrote:
It's just that I don't know how else to do it and keep the branches
reasonably useful.
So I guess the current model *works*, it just causes nasty problems
occasionally.
The best model is likely one where you have two
Hi Anton,
2015-07-10 0:48 GMT+02:00, Anton Lundin gla...@acc.umu.se:
Looks like the first byte is a version(?) marker to. 0x64 in the old
files in dives/ and 0x65 in the ones posted on the forum.
Yes it's correct, but this byte doesn't seem to be related to the
software tool but to the data
Hello,
Here is a resume about the things I did this week:
- successfully downloaded the dives from 3 different environments
(ArchLinux, Fedora 22, OpenSuse 13.2)
- compiled and tested our custom BT serial implementation with the new Qt
5.5.0
- compiled and tested our custom BT serial
On Sun, Jul 12, 2015 at 03:51:39PM +0200, Henrik Brautaset Aronsen wrote:
On 12 Jul 2015, at 15:45, Dirk Hohndel d...@hohndel.org wrote:
Why would you need -rebase for the libgit2 repository, unless you have
local changes (and I just realize that I need to patch the build script to
From: Henrik Brautaset Aronsen subsurf...@henrik.synth.no
Without rebase, the build script would stop because it
couldn't complete a merge.
---
scripts/build.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/build.sh b/scripts/build.sh
index 7b54bea..cb9b4ad
I've finally been catching up on assigning locations to my last 150 odd
dives in Subsurface. Wow that's a huge effort, but I've got there.
I've been working with the latest master (commit
d8ca04626589221c5f7c178e882cfaa4c095ce2a, Author: Dirk Hohndel
d...@hohndel.org, Date: Fri Jul 10
On Sun, Jul 12, 2015 at 07:19:53PM +1000, Rick Walsh wrote:
I've finally been catching up on assigning locations to my last 150 odd
dives in Subsurface. Wow that's a huge effort, but I've got there.
That is huge - especially as location management right now is not where it
should be. It sort
On 12 Jul 2015, at 15:45, Dirk Hohndel d...@hohndel.org wrote:
Why would you need -rebase for the libgit2 repository, unless you have
local changes (and I just realize that I need to patch the build script to
use a later commit there, anyway, as that one still doesn't work with
proxies).
Henrik,
I'll admit that I think of the build script more as a get started, have
all the pieces in place kinda thing. And then assume that people will
simply update the different packages as needed (which in most cases means
not very often).
Why would you need -rebase for the libgit2 repository,
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 32 +---
1 file changed, 29 insertions(+), 3 deletions(-)
diff --git a/parse-xml.c b/parse-xml.c
index 62eceaa..9d6cb3a 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2869,14 +2869,40 @@ extern int
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 11 +++
1 file changed, 11 insertions(+)
diff --git a/parse-xml.c b/parse-xml.c
index d651fa2..2750b3f 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2885,6 +2885,17 @@ extern int divinglog_profile(void *handle, int
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 61 +
1 file changed, 61 insertions(+)
diff --git a/parse-xml.c b/parse-xml.c
index 9d6cb3a..4e2ead7 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2843,11 +2843,58 @@
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
Do we have a better text for this one than violation?
---
parse-xml.c | 8
1 file changed, 8 insertions(+)
diff --git a/parse-xml.c b/parse-xml.c
index 1aaf8ea..c110481 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2901,6 +2901,14
Generic divelog might come with the .sql extension, thus adding that to
the file filter.
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
qt-ui/mainwindow.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index
On Sun, Jul 12, 2015 at 7:05 AM, Dirk Hohndel d...@hohndel.org wrote:
Thanks for the explanation, Henrik. I read a bit through the git-rebase
manpage and that has not necessarily completely enlightened me on the
wisdom of this changes.
I suspect it ends up working better in practice, although
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/parse-xml.c b/parse-xml.c
index 4e2ead7..d651fa2 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2877,6 +2877,7 @@ extern int divinglog_profile(void *handle, int columns,
char
This parses the basic metadata of a dive when importing Divinglog
database. (Discarding deleted dives is my best guess as I do not have
that in my sample dive.)
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
dive.h | 1 +
file.c | 9 +
parse-xml.c | 59
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 8
1 file changed, 8 insertions(+)
diff --git a/parse-xml.c b/parse-xml.c
index 2750b3f..1aaf8ea 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2893,6 +2893,14 @@ extern int divinglog_profile(void *handle, int columns,
Since mapping cylinders requires use of dive ID, we might as well use
the ID to map the profile also.
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/parse-xml.c b/parse-xml.c
index 97e3785..bca7345
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 28 +---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/parse-xml.c b/parse-xml.c
index 37f08cc..7d1f312 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2846,8 +2846,8 @@ int
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 48 ++--
1 file changed, 46 insertions(+), 2 deletions(-)
diff --git a/parse-xml.c b/parse-xml.c
index 7d1f312..97e3785 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2843,6 +2843,40
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parse-xml.c b/parse-xml.c
index 7f00294..62eceaa 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2890,7 +2890,7 @@ int parse_divinglog_buffer(sqlite3 *handle,
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/parse-xml.c b/parse-xml.c
index 974906e..991b1e9 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2882,7 +2882,7 @@ extern int divinglog_profile(void *handle,
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 21 +
1 file changed, 21 insertions(+)
diff --git a/parse-xml.c b/parse-xml.c
index 991b1e9..fb01d4d 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2883,6 +2883,7 @@ extern int divinglog_profile(void
Cylinder 0 is stored on the Logbook table along with other dive metadata
(not in Tank table).
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/parse-xml.c b/parse-xml.c
index bca7345..974906e 100644
---
file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/file.c b/file.c
index e6b0a3f..085c333 100644
--- a/file.c
+++ b/file.c
@@ -448,7 +448,7 @@ int parse_file(const char *filename)
}
fmt = strrchr(filename, '.');
- if (fmt (!strcasecmp(fmt + 1,
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c | 8
1 file changed, 8 insertions(+)
diff --git a/parse-xml.c b/parse-xml.c
index c110481..37f08cc 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2909,6 +2909,14 @@ extern int divinglog_profile(void *handle, int columns,
- Introduce an exit point to cowardly run away from the file if
something goes wrong (undefined dc family, inconsistent family/model
pair, etc), without crashing subsurface.
- Simplifies (user point of view) and makes translatables the error
messages shown in the status bar.
- Modifies
HW introduced some changes in dc's data structures with FROG and OSTC3
families (types 0x22 and 0x23 in HW's terms) that I didn't take into
account as we lacked of .dive files to test.
BTW I previously set the model to 0 as it was not stored in the file
but wasn't relevant for the data parsing in
29 matches
Mail list logo
