Re: Problems compiling latest master with option (SMARTTRAK_IMPORT) = ON

[Robert C. Helling]

Pedro,

> Am 15.06.2016 um 00:52 schrieb Pedro Neves :
> 
>> On 14-06-2016 21:57, Dirk Hohndel wrote:
>> Just change it to include "core/dive.c"
>> -- 
> 
> Hi:
> Following Dirk's pointer, I've ended up having to make a few more changes in 
> files: smartrak.c and smrtk2ssrfc_window.cpp
> 
> However, now I get the error: 
> 
> [ 66%] Building CXX object 
> smtk-import/CMakeFiles/smtk_import.dir/smrtk2ssrfc_window.cpp.o
> /home/X/Diveapps/subsurface/smtk-import/smrtk2ssrfc_window.cpp:2:35: 
> fatal error: ui_smrtk2ssrfc_window.h: No such file or directory
>  #include "ui_smrtk2ssrfc_window.h"
> 
> This file does not exist on my system. I do have a file called: 
> smrtk2ssrfc_window.ui... Should this be it?

The .h should be generated from the .ui during the build process. I would try 
to do

make clean

and try again. If that is not enough, remove all ui_*.h and maybe run cmake or 
the build script again. 

Best
Robert___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: Problems compiling latest master with option (SMARTTRAK_IMPORT) = ON

[Pedro Neves]

On 14-06-2016 21:57, Dirk Hohndel wrote:

Just change it to include "core/dive.c"
--


Hi:
Following Dirk's pointer, I've ended up having to make a few more 
changes in files: smartrak.c and smrtk2ssrfc_window.cpp


However, now I get the error:

[ 66%] Building CXX object 
smtk-import/CMakeFiles/smtk_import.dir/smrtk2ssrfc_window.cpp.o
/home/X/Diveapps/subsurface/smtk-import/smrtk2ssrfc_window.cpp:2:35: 
fatal error: ui_smrtk2ssrfc_window.h: No such file or directory

 #include "ui_smrtk2ssrfc_window.h"

This file does not exist on my system. I do have a file called: 
smrtk2ssrfc_window.ui... Should this be it?


Sorry for the trouble...

Cheers:

Pedro
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: Problems compiling latest master with option (SMARTTRAK_IMPORT) = ON

[Dirk Hohndel]

Just change it to include "core/dive.c"
-- 
Sent from my phone

On June 14, 2016 1:42:48 PM PDT, Pedro Neves  wrote:
>Hi all:
>
>
>I'm getting an error while trying to compile the latest master on my 
>Arch system with the option (SMARTTRAK_IMPORT) turned ON.
>
>Seems like i'm missing "dive.h":
>
>
>[ 65%] Built target subsurface_corelib
>Scanning dependencies of target smtk_import
>[ 66%] Building C object
>smtk-import/CMakeFiles/smtk_import.dir/smartrak.c.o
>/home/XXX/Diveapps/subsurface/smtk-import/smartrak.c:31:18: fatal 
>error: dive.h: No such file or directory
>  #include "dive.h"
>
>However I have "dive.h" in /subsurface/core/
>
>Any hints?
>
>
>Cheers:
>
>Pedro
>
>
>
>
>
>___
>subsurface mailing list
>subsurface@subsurface-divelog.org
>http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Problems compiling latest master with option (SMARTTRAK_IMPORT) = ON

[Pedro Neves]

Hi all:


I'm getting an error while trying to compile the latest master on my 
Arch system with the option (SMARTTRAK_IMPORT) turned ON.


Seems like i'm missing "dive.h":


[ 65%] Built target subsurface_corelib
Scanning dependencies of target smtk_import
[ 66%] Building C object smtk-import/CMakeFiles/smtk_import.dir/smartrak.c.o
/home/XXX/Diveapps/subsurface/smtk-import/smartrak.c:31:18: fatal 
error: dive.h: No such file or directory

 #include "dive.h"

However I have "dive.h" in /subsurface/core/

Any hints?


Cheers:

Pedro

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Testing the latest version

[martin]

Hi guys,

The empty dive list looks fine now, so does the cloud credentials page. After 
entering the first dive, I get the following screen, I think the fox for the 
screen size messed things up a little bit.

The first dive is to high up, because of this it disappears behind the top of 
the screen.

Met vriendelijke groeten,

Martin de Weger
E: mar...@reef-it.nl
T:+ 31 6 10 48 63 58(tel:+%2031%206%2010%2048%2063%2058)

___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: OC and CCR examples computer logs

[Robert Helling]

Steve,

> Am 14.06.2016 um 15:50 schrieb Steve :
> 
> Here is an export of some the different computers attached.
> Also take note of the surface pressure of the iX3M computer in both OC and 
> CCR logs, looks like the decimal point is in the wrong place.


thanks a lot. I found a bug that explains why the OC couldn’t be saved as OC. 
That should be fixed. But when I open you log file and set the three dives to 
CCR (and always of course confirm the change and then save the dive, it saves 
perfectly fine as CCR, so I cannot reproduce that bug.

Regarding the surface pressure (10bar is indeed a bit too much), I have no idea 
where that comes from. Do you get this value directly after downloading from 
the dive computer?

Best
Robert


signature.asc
Description: Message signed with OpenPGP using GPGMail
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

[PATCH] Only non-zero set point changes are valid

[Robert Helling]

From c67eacf179af07706cf219ca678577cb5e0d917b Mon Sep 17 00:00:00 2001
From: "Robert C. Helling" 
Date: Tue, 14 Jun 2016 17:12:57 +0200
Subject: [PATCH] Only setpoint changes with non-zero SP indicate a CCR dive
To: subsurface@subsurface-divelog.org

There might be some spurious setpoint changes at t=0 without
an actual value (I have no idea where those come from). In
any case, those do not indicate that the dive is a CCR dive.

Signed-off-by: Robert C. Helling 
---
 core/load-git.c  | 2 +-
 core/parse-xml.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/load-git.c b/core/load-git.c
index be7fac7..9ae4795 100644
--- a/core/load-git.c
+++ b/core/load-git.c
@@ -762,7 +762,7 @@ static void parse_dc_event(char *line, struct membuffer 
*str, void *_dc)
 * Better to mark them being CCR on import so no need for special 
treatments elsewhere on
 * the code.
 */
-   if (ev && event.time.seconds == 0 && event.type == SAMPLE_EVENT_PO2 && 
dc->divemode==OC) {
+   if (ev && event.time.seconds == 0 && event.type == SAMPLE_EVENT_PO2 && 
event.value && xdc->divemode==OC) {
dc->divemode = CCR;
}
 
diff --git a/core/parse-xml.c b/core/parse-xml.c
index c79d7a9..3b5a2d7 100644
--- a/core/parse-xml.c
+++ b/core/parse-xml.c
@@ -1663,7 +1663,7 @@ static void event_end(void)
 * Older logs might mark the dive to be CCR by having an "SP 
change" event at time 0:00. Better
 * to mark them being CCR on import so no need for special 
treatments elsewhere on the code.
 */
-   if (ev && cur_event.time.seconds == 0 && cur_event.type == 
SAMPLE_EVENT_PO2 && dc->divemode==OC) {
+   if (ev && cur_event.time.seconds == 0 && cur_event.type == 
SAMPLE_EVENT_PO2 && cur_event.value && dc->divemode==OC) {
dc->divemode = CCR;
}
 
-- 
2.7.4 (Apple Git-66)



This should fix a bug reported in the forum that one cannot change a dive to 
type OC.

Best
Robert


signature.asc
Description: Message signed with OpenPGP using GPGMail
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

[PATCH] Re: TestFlight feedback for Subsurface-mobile.

[Robert Helling]

Hi,Am 14.06.2016 um 06:40 schrieb Jürgen Frank :Also still some text is cut when using portrait orientation. From c8226cb8b67ec522e25b2bc36ba5cf92e9af17be Mon Sep 17 00:00:00 2001
From: "Robert C. Helling" 
Date: Tue, 14 Jun 2016 09:42:37 +0200
Subject: [PATCH] Not giving wrap info improves dive details on narrow screens
To: subsurface@subsurface-divelog.org

This prevents label text from overlapping.

Signed-off-by: Robert C. Helling 
---
 mobile-widgets/qml/DiveDetailsView.qml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mobile-widgets/qml/DiveDetailsView.qml 
b/mobile-widgets/qml/DiveDetailsView.qml
index 5e9fd5b..fda0db9 100644
--- a/mobile-widgets/qml/DiveDetailsView.qml
+++ b/mobile-widgets/qml/DiveDetailsView.qml
@@ -183,7 +183,6 @@ Item {
 
Kirigami.Label {
text: qsTr("Water Temp:")
-   wrapMode: Text.WrapAtWordBoundaryOrAnywhere
opacity: 0.6
width: detailsView.col3Width
Layout.alignment: Qt.AlignRight
@@ -197,7 +196,6 @@ Item {
 
Kirigami.Label {
text: qsTr("Dive Master:")
-   wrapMode: Text.WrapAtWordBoundaryOrAnywhere
opacity: 0.6
width: detailsView.col1Width
Layout.alignment: Qt.AlignRight
-- 
2.7.4 (Apple Git-66)

This patch seems to improve things for me. Please try.BestRobert

signature.asc
Description: Message signed with OpenPGP using GPGMail
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface