[PATCH] Be much more careful about merging dives

2015-09-22 Thread Linus Torvalds
From: Linus Torvalds Date: Tue, 22 Sep 2015 12:32:27 -0700 Subject: [PATCH] Be much more careful about merging dives This patch changes the dive merging to be much more careful about things, because it turns out that we had several small oddities that caused big

Re: Windows binary saga

2015-09-22 Thread Lubomir I. Ivanov
On 22 September 2015 at 19:05, Dirk Hohndel wrote: > On Tue, Sep 22, 2015 at 06:38:11PM +0300, Lubomir I. Ivanov wrote: >> >> do you wan't me change the patch so that the "if (NO_MARBLE)" is on top? >> i do sort of need this patch to be able to build Marble (i.e. use >>

DiveLocationManagement rewrite

2015-09-22 Thread Tomaz Canabrava
Uffs, so: This patch series completely rewrites the LocationManagement *lineedit + combobox* that we used to have. It is stetically identical to the old one, everything beneath the UI has changed. it currently *doesn't* works ( the line edit + selection *works* , but it doesn't *sets* the dive

Re: [PATCH 2/2] dive merging: make sure that the dive is actually replotted after merging

2015-09-22 Thread Dirk Hohndel
On Tue, Sep 22, 2015 at 07:14:00PM -0700, Linus Torvalds wrote: > > From: Linus Torvalds > Date: Tue, 22 Sep 2015 19:09:49 -0700 > Subject: [PATCH 2/2] dive merging: make sure that the dive is actually > replotted after merging > > This patch is disgusting: we

Re: [PATCH 2/2] dive merging: make sure that the dive is actually replotted after merging

2015-09-22 Thread Linus Torvalds
On Tue, Sep 22, 2015 at 7:19 PM, Dirk Hohndel wrote: > > Would you like me to do this instead of taking this patch? Yes. Or at least perhaps just rename the thing, even if you don't end up restructuring any more. That disgusting hack was because I hoped that Tomaz would say

Re: [PATCH] Be much more careful about merging dives

2015-09-22 Thread Dirk Hohndel
On Tue, Sep 22, 2015 at 12:43:30PM -0700, Linus Torvalds wrote: > + > +/* > + * The end of a dive is actually not trivial, because "duration" > + * is not the duration until the end, but the time we spend under > + * water, which can be very different if there are surface events > + * during the

[PATCH 2/2] dive merging: make sure that the dive is actually replotted after merging

2015-09-22 Thread Linus Torvalds
From: Linus Torvalds Date: Tue, 22 Sep 2015 19:09:49 -0700 Subject: [PATCH 2/2] dive merging: make sure that the dive is actually replotted after merging This patch is disgusting: we call the "planCanceled" method to make sure that the dive profile window is

User manual: Bluetooth UI description

2015-09-22 Thread Willem Ferguson
Claudiu, Andrej, Guido, I added a description of the Bluetooth UI to the user manual (section 5.2.2). You will do me a big favour if you would be prepared to read through this and comment on the accuracy and completeness of the information?? Kind regards, willem

Re: [PATCH] Be much more careful about merging dives

2015-09-22 Thread Linus Torvalds
On Tue, Sep 22, 2015 at 7:35 PM, Dirk Hohndel wrote: > > This gives me a warning when I compile it: > > Declaring dc as > > const struct divecomputer *dc; > > fixes that. Any issues with that? Gaah. I knew about it, and was going to fix it, but then forgot about it. I

[PATCH] User manual: description of Bluetooth interface

2015-09-22 Thread Willem Ferguson
[PATCH] User manual: Bluetooth UI description 1) Insert Bluetooth UI description at end of section dealing with dive download. 2) Delete existing text in appendices that detail pairing a Bluetooth device with the Subsurface computer. One image is added to the manual.

Re: Almost Beta 2 Cloud Storage fails

2015-09-22 Thread Linus Torvalds
On Mon, Sep 21, 2015 at 1:30 PM, Rick Walsh wrote: > > > FWIW, here's the traceroute. > > traceroute to cloud.subsurface-divelog.org (52.25.223.173), 30 hops max, 60 > byte packets > 1 gateway (192.168.1.1) 1.045 ms 1.680 ms 1.775 ms > 2 lo0.bng1.mel4.on.ii.net

Re: Windows binary saga

2015-09-22 Thread Anton Lundin
On 22 September, 2015 - Lubomir I. Ivanov wrote: > On 22 September 2015 at 15:05, Lubomir I. Ivanov wrote: > > > > so apart from NO_DOCS=0, the only thing i'm not building at the moment > > is FTDISUPPORT=1, but that's probably doable as well. > > > > alright, > > so

Re: Windows binary saga

2015-09-22 Thread Dirk Hohndel
In tonights installment of the saga... Lots of progress. I massaged MXE to go from MinGW 5.2.0 back to 4.9.2 (the compiler used in the official Qt5.5 builds). That turned out to be a bit of a pain but hey, I think I have it working. Rebuilt all the libraries. I can now create a Windows

Re: Windows binary saga

2015-09-22 Thread Thiago Macieira
On Tuesday 22 September 2015 20:52:09 you wrote: > I notice that even though this is using Qt5.5 it still identifies itself > as "Windows" not "Windows 10" on my brand new Windows 10 laptop. > Thiago, any idea? You're probably using Qt 5.5.0. This is fixed for 5.5.1:

Re: Windows binary saga

2015-09-22 Thread Robert C. Helling
Hi, > Am 23.09.2015 um 05:52 schrieb Dirk Hohndel : > > if we detect that the local cache is inconsistent and unusable, should > we just delete it? I mean, even if it contained data that wasn't synced to > the server, if libgit2 can't read it I guess it's toast so instead of >

Re: Windows binary saga

2015-09-22 Thread Thiago Macieira
On Tuesday 22 September 2015 21:16:17 Dirk Hohndel wrote: > > On Sep 22, 2015, at 20:56, Thiago Macieira wrote: > >> On Tuesday 22 September 2015 20:52:09 you wrote: > >> I notice that even though this is using Qt5.5 it still identifies itself > >> as "Windows" not "Windows

Re: Windows binary saga

2015-09-22 Thread Dirk Hohndel
On Tue, Sep 22, 2015 at 09:49:43PM -0700, Linus Torvalds wrote: > On Sep 22, 2015 8:52 PM, "Dirk Hohndel" wrote: > > > > b) if we detect that the local cache is inconsistent and unusable, should > > we just delete it? > > Please don't delete it, one of the nice things about the

Re: Windows binary saga

2015-09-22 Thread Dirk Hohndel
> On Sep 22, 2015, at 20:56, Thiago Macieira wrote: > >> On Tuesday 22 September 2015 20:52:09 you wrote: >> I notice that even though this is using Qt5.5 it still identifies itself >> as "Windows" not "Windows 10" on my brand new Windows 10 laptop. >> Thiago, any idea? >

Re: Windows binary saga

2015-09-22 Thread Linus Torvalds
On Sep 22, 2015 8:52 PM, "Dirk Hohndel" wrote: > > b) if we detect that the local cache is inconsistent and unusable, should > we just delete it? Please don't delete it, one of the nice things about the git format is how old history is almost impossible to destroy by mistake.

Re: Windows binary saga

2015-09-22 Thread Dirk Hohndel
On Tue, Sep 22, 2015 at 09:46:52PM -0700, Thiago Macieira wrote: > On Tuesday 22 September 2015 21:16:17 Dirk Hohndel wrote: > > > On Sep 22, 2015, at 20:56, Thiago Macieira wrote: > > >> On Tuesday 22 September 2015 20:52:09 you wrote: > > >> I notice that even though this

Re: Windows binary saga

2015-09-22 Thread Dirk Hohndel
On Tue, Sep 22, 2015 at 06:38:11PM +0300, Lubomir I. Ivanov wrote: > On 22 September 2015 at 17:26, Dirk Hohndel wrote: > > On Tue, Sep 22, 2015 at 03:05:16PM +0300, Lubomir I. Ivanov wrote: > >> > >> update: > >> > >> i was able to get the tests and marble to work. > >>

Re: Windows binary saga

2015-09-22 Thread Lubomir I. Ivanov
On 22 September 2015 at 06:56, Dirk Hohndel wrote: > Just to keep people updated. After a complete A-Z rebuild of every library > and component from source (I literally removed the build directory > including the MXE installation and started from scratch) I am nowhere. > >

RE: Almost Beta 2 Cloud Storage fails

2015-09-22 Thread John Smith
>Sorry, on my phone. You clearly do have connectivity issues with the cloud >server which is actually an AWS instance. >Hmmm >That's annoying. I went with a cloud server because i assumed that would cause >the fewest connectivity issues. Clearly wrong. I don't have the diagnostics ( or the

Re: Windows binary saga

2015-09-22 Thread Lubomir I. Ivanov
On 22 September 2015 at 12:34, Lubomir I. Ivanov wrote: > On 22 September 2015 at 06:56, Dirk Hohndel wrote: > > i'm now downloading Qt5.5 to test it out. and it works - now building natively with qt5.5 and mingw 4.9.2. QtWebKit is pre-built and inlcuded

Re: Windows binary saga

2015-09-22 Thread Dirk Hohndel
I believe you only want that on android -- Sent from my phone > On Sep 22, 2015, at 06:14, Lubomir I. Ivanov wrote: > >> On 22 September 2015 at 15:05, Lubomir I. Ivanov wrote: >> >> so apart from NO_DOCS=0, the only thing i'm not building at the

Re: [PATCH] TestPlan: Add test for repeating dive

2015-09-22 Thread Dirk Hohndel
On Wed, Sep 23, 2015 at 12:32:26AM +1000, Rick Walsh wrote: > If variables were accidentally carried through from a previous calculated > plan, > subsequent plan could be affected. This test aims to detect if this happens. > Commit 8994270 corrected such a bug. If it were reverted, this test

Translation question

2015-09-22 Thread Guillaume Gardet
In Bluetooth related translations, we have : UNPAIRED PAIRED AUTHORIZED_PAIRED Should we translate it? If yes, is it ok to use spaces and special chars (such as 'é')? Guillaume ___ subsurface mailing list

Re: Windows binary saga

2015-09-22 Thread Lubomir I. Ivanov
On 22 September 2015 at 13:36, Lubomir I. Ivanov wrote: > On 22 September 2015 at 12:34, Lubomir I. Ivanov wrote: >> On 22 September 2015 at 06:56, Dirk Hohndel wrote: >> >> i'm now downloading Qt5.5 to test it out. > > and it works -

Re: Windows binary saga

2015-09-22 Thread Lubomir I. Ivanov
On 22 September 2015 at 15:05, Lubomir I. Ivanov wrote: > > so apart from NO_DOCS=0, the only thing i'm not building at the moment > is FTDISUPPORT=1, but that's probably doable as well. > alright, so libftdi builds (without the EEPROM part as i don't want to install the

Re: Windows binary saga

2015-09-22 Thread Dirk Hohndel
On Tue, Sep 22, 2015 at 03:05:16PM +0300, Lubomir I. Ivanov wrote: > > update: > > i was able to get the tests and marble to work. > attached is a patch to add the MARBLE_FROM_PKGCONFIG. i know these > _FROM_PKGCONFIG are mostly for me, but please apply it. No problem. I do have the "if (NOT

[PATCH] TestPlan: Add test for repeating dive

2015-09-22 Thread Rick Walsh
If variables were accidentally carried through from a previous calculated plan, subsequent plan could be affected. This test aims to detect if this happens. Commit 8994270 corrected such a bug. If it were reverted, this test would fail (as it should). Signed-off-by: Rick Walsh

Re: Windows binary saga

2015-09-22 Thread Lubomir I. Ivanov
On 22 September 2015 at 17:26, Dirk Hohndel wrote: > On Tue, Sep 22, 2015 at 03:05:16PM +0300, Lubomir I. Ivanov wrote: >> >> update: >> >> i was able to get the tests and marble to work. >> attached is a patch to add the MARBLE_FROM_PKGCONFIG. i know these >> _FROM_PKGCONFIG

Re: Windows binary saga

2015-09-22 Thread Lubomir I. Ivanov
On 22 September 2015 at 18:38, Lubomir I. Ivanov wrote: > On 22 September 2015 at 17:26, Dirk Hohndel wrote: >> In the meantime (talking about Plan A) I got a lot further last night >> building Qt with debugging enabled. QtWebKit still fails to build, but