Re: CCR mode and our implementation of the setpoint

2015-02-07 Thread Benjamin
On 8 Feb 2015 08:40, "Robert C. Helling" wrote: > > Benjamin, > > > > > Am 08.02.2015 um 07:08 schrieb Benjamin : > > > > maybe have a drop box in the download dialog where this can be set and then store it for future dives with the given computer? > > We already have such a combobox, it's not in

Re: CCR mode and our implementation of the setpoint

2015-02-07 Thread Robert C. Helling
Benjamin, > Am 08.02.2015 um 07:08 schrieb Benjamin : > > maybe have a drop box in the download dialog where this can be set and then > store it for future dives with the given computer? We already have such a combobox, it's not in the download dialog but on the main tab. But that is not the

Re: CCR mode and our implementation of the setpoint

2015-02-07 Thread Benjamin
On 7 Feb 2015 22:10, "Robert C. Helling" wrote: > > Dirk, > >> On 07 Feb 2015, at 17:10, Dirk Hohndel wrote: >> >> I have a draft patch that does that but wanted to talk to you about it. >> This is a non-reversible change. So if the user has a dive that includes >> pO₂ values in the samples, we s

Re: ssrf-version.h and rebuilding

2015-02-07 Thread Lubomir I. Ivanov
On 7 February 2015 at 21:23, Dirk Hohndel wrote: >> > Also, Lubomir, I have asked Thiago to look at the qmake patch you sent and >> > he promised to do so this weekend. I'm waiting to hear his feedback before >> > pulling that (I assume this patch here would depend on that other patch?) >> >> ok.

Re: CCR mode and our implementation of the setpoint

2015-02-07 Thread Robert C. Helling
Dirk,On 07 Feb 2015, at 17:10, Dirk Hohndel wrote:I have a draft patch that does that but wanted to talk to you about it.This is a non-reversible change. So if the user has a dive that includespO₂ values in the samples, we show that dive as CCR. If the user thenswitches to OC we

Re: ssrf-version.h and rebuilding

2015-02-07 Thread Dirk Hohndel
On Sat, Feb 07, 2015 at 08:33:52PM +0200, Lubomir I. Ivanov wrote: > > > So I'll take a patch that uses either approach. > > which approach should we pick? Let's use functions as you proposed. But mark them as inline. > > Also, Lubomir, I have asked Thiago to look at the qmake patch you sent an

Re: ssrf-version.h and rebuilding

2015-02-07 Thread Lubomir I. Ivanov
On 7 February 2015 at 20:05, Dirk Hohndel wrote: > On Sat, Feb 07, 2015 at 06:26:38PM +0100, Anton Lundin wrote: >> On 06 February, 2015 - Lubomir I. Ivanov wrote: >> > >> > in terms of our current scheme for updating ssrf-version.h, with each >> > git HEAD change one potential small issue is pres

Re: ssrf-version.h and rebuilding

2015-02-07 Thread Dirk Hohndel
On Sat, Feb 07, 2015 at 06:26:38PM +0100, Anton Lundin wrote: > On 06 February, 2015 - Lubomir I. Ivanov wrote: > > > > in terms of our current scheme for updating ssrf-version.h, with each > > git HEAD change one potential small issue is present where the macros > > from the file itself are used

Re: ssrf-version.h and rebuilding

2015-02-07 Thread Anton Lundin
On 06 February, 2015 - Lubomir I. Ivanov wrote: > hello, > > in terms of our current scheme for updating ssrf-version.h, with each > git HEAD change one potential small issue is present where the macros > from the file itself are used on compile time by a number of files. > this forces recompilat

Re: CCR mode and our implementation of the setpoint

2015-02-07 Thread Dirk Hohndel
On Sat, Feb 07, 2015 at 08:10:36AM -0800, Dirk Hohndel wrote: > > What about old logs? We could delete all those pO2 values if the dive > > computer is a Predator and the user selects OC as dive mode? > > I have a draft patch that does that but wanted to talk to you about it. > This is a non-rever

Re: CCR mode and our implementation of the setpoint

2015-02-07 Thread Dirk Hohndel
On Sat, Feb 07, 2015 at 10:12:21AM +0100, Robert C. Helling wrote: > > Have one header file where we define our own subsurface events (in > addition to the libdivecomputer name space). We already have one for > images. Currently it is not clear to me, if amongst the ldc events there > is one that

Re: CCR mode and our implementation of the setpoint

2015-02-07 Thread Dirk Hohndel
On Sat, Feb 07, 2015 at 02:46:56PM +0100, Robert C. Helling wrote: > > On 06 Feb 2015, at 22:54, Dirk Hohndel wrote: > > > > But a bug report from an OC diver forced me to dig into this and what I > > think I'm beginning to understand doesn't make me happy. > > Double use of the event is not nic

Re: DM3 import

2015-02-07 Thread Willem Ferguson
On 07/02/2015 16:38, Miika Turkia wrote: Willem, do you care to write something about importing DM3 logs to Subsurface, utilizing Uploader from divelogs.de ? A bit more info in https://groups.google.com/forum/#!category-topic/subsurface-divelog/ccUACNKv6AQ

[PATCH 2/2] Select the known import for APD automatically

2015-02-07 Thread Miika Turkia
If the filename has extension of .apd, then set the known import automatically. Signed-off-by: Miika Turkia --- qt-ui/divelogimportdialog.cpp | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp index ca3a2be..b

[PATCH 1/2] Add the .apd file extension to be treated as CSV file

2015-02-07 Thread Miika Turkia
Adding support for importing .apd files (APD Log Viewer). They are CSV files and already supported in CSV import, but the file extension .apd is added here. Signed-off-by: Miika Turkia --- qt-ui/mainwindow.cpp | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qt-ui/mainwi

DM3 import

2015-02-07 Thread Miika Turkia
Willem, do you care to write something about importing DM3 logs to Subsurface, utilizing Uploader from divelogs.de? A bit more info in https://groups.google.com/forum/#!category-topic/subsurface-divelog/ccUACNKv6AQ Of course, the SDE import is still an option, but the cylinder pressures are lost t

Re: CCR mode and our implementation of the setpoint

2015-02-07 Thread Robert C. Helling
Hi, now, I have done some reading, both in the source and in trac (I should have done this earlier): > On 06 Feb 2015, at 22:54, Dirk Hohndel wrote: > > But a bug report from an OC diver forced me to dig into this and what I > think I'm beginning to understand doesn't make me happy. Double us

Re: CCR dive logs for APD

2015-02-07 Thread Willem Ferguson
On 07/02/2015 10:28, Miika Turkia wrote: I would like to go to the direction that is most beneficial for the users. Importing both computers in one go the way we currently download from multiple dive computers should be very easy to implement. I actually think this to be even easier than lett

Re: CCR mode and our implementation of the setpoint

2015-02-07 Thread Robert C. Helling
Hi, > On 07 Feb 2015, at 06:08, Willem Ferguson > wrote: > > As far as the dive logging of CCR dives is concerned, all the information is > kept in the sample structures (for the moment, forget about the plot_info > structure that only lives when a dive is being displayed on-screen). The > s

Re: Managing photos within Subsurface

2015-02-07 Thread Miika Turkia
On Sat, Feb 7, 2015 at 8:52 AM, Willem Ferguson < willemfergu...@zoology.up.ac.za> wrote: > Currently the facilities for managing the photos accessible to Subsurface > are fairly crude. One can do a batch import using the "Load Images" context > menu item on the dive list. This shows all the photo

Re: CCR dive logs for APD

2015-02-07 Thread Miika Turkia
On Sat, Feb 7, 2015 at 8:11 AM, Willem Ferguson < willemfergu...@zoology.up.ac.za> wrote: > Hallo Miika, > > I started a discussion earlier about catering for APD equipment. The APD > dive logs are classical CSV files that can import into the existing CCR > code straight-out without any modificati