Fwd: Re: Dive planner MG, TP and FC

[Willem Ferguson]

Ivan, Robert,

I think I understand the request.

On 14/10/2015 14:21, Ivan Wagner wrote:

Dear list,

I was taking a look at the dive planner feature within subsurface and I
see some useful features that could be added:

- Minimum gas (based on a scenario of an out-of-gas event and and ascent
respecting ascent rates, deep stops etc)


The planning takes into account all gas available and subtracts the
amounts required for gas sharing as well as a 'residual' amount that
needs to remain. If one requires 50 bar for buddy-sharing (calculated by
the planner automatically) and another 30 bar residual was requested on
the dive planner form, the minimum gas use at the end of the dive is
start-pressure minus 80 bar. So the concept of minimum gas required is
not really relevant here, at least for recreational dives.


- Turn pressure based on gas rule such as all usable, half usable or
rule of thirds


This is the gas pressure in the cylinder at the start of the ascent
phase? This is a meaningful request but would require another selection
to be made in the planner (gas turn rule). This is something that I use
all the time in dive planning.


- Fractional consumption at depth with 5 minutes interval.


There is a continuous trace of the gas pressure throughout the dive and
the precise pressure can actually be read from the profile information
box (the moving black box on the profile panel). Would fractional gas
information really give one more useful insight?


This is something I use on a daily basis not only for technical dives
but also recreational dives.

Could this be interesting for you? I could implement something.

Let me know,

ivan



Kind regards,
willem



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

Error when executing on Ubuntu

[Willem Ferguson]

I still get a single error message when running Subsurface in Ubuntu 
15.04. It seems this relates to some of the changes discussed during the 
last week. Is this due to the code or due to my specific setup? Thank 
you for solving the long list of errors and warnings generated until now!


willem:~/src/subsurface/build$ ./subsurface
QInotifyFileSystemWatcherEngine::addPaths: inotify_add_watch failed: No 
such file or directory

willem:~/src/subsurface/build$

SHA 2111943

Kind regards,
willem

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

User manual status

[Willem Ferguson]

The user manual is, as far as I can see, ready for release with V4.5. 
There are a few small items but this will be followed up after the release.


This message is to:
1) the  **translators**  to indicate that the last patch to update the 
manual was "User manual update: Facebook". Many images were replaced but 
I cannot now think of any new images created during the last week.
2) to the wider world out there in case there is something that is 
important enough to need addressing now.


Kind regards,
willem


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

Re: [PATCH] usermanual.cpp: use default QWidget theme colors for text selections

[Willem Ferguson]

On 13/10/2015 17:06, Lubomir I. Ivanov wrote:

From: "Lubomir I. Ivanov" 

The default selection text/background colors (also when seaching)
are black/light-grey in QWebView, for some reason.

To solve the issue we pass a stylesheet that makes use of the
default palette's highlight() and highlightedText() from QWidget.

Fixes #797

Signed-off-by: Lubomir I. Ivanov 


Lubomir,

The one drawback that usermanual.cpp has is that one cannot (as far as I
know) go back to the previous screen. With the cross-referencing in the
text, I find a conventional browser much more helpful because I can use the
arrow button to go to the previous place in the text I was at. Is there any
cure for this in Qt?

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

[PATCH] User manual: last-minute changes before V4.5

[Willem Ferguson]

[PATCH] User manual: last changes before V4.5

1) Run a spell checker through the user manual. Only three
   outright typos found!!
2) Correct sentence about reverse name lookup that results in
   dive site name reported in tags field, not in Location field.
   (Sergey, thank you!)

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
From 2c971cd3b8068925b66e4f65fc87e1c50fd97b5d Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Tue, 13 Oct 2015 17:39:07 +0200
Subject: [PATCH] [PATCH] User manual: last changes before V4.5

1) Run a spell checker through the user manual. Only three
   outright typos found!!
2) Correct sentence about reverse name lookup that results in
   dive site name reported in tags field, not in Location field.
   (Sergey, thank you!)

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---
 Documentation/user-manual.txt | 51 +--
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index dce7181..e378120 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -184,7 +184,7 @@ in the following sections.
  dive and a large amount of additional information can be accessed. These dives
  can be imported from:
 
- - The divecomputer itself. See: xref:S_ImportDiveComputer[Importing new dive information from a Dive Computer] or
+ - The dive computer itself. See: xref:S_ImportDiveComputer[Importing new dive information from a Dive Computer] or
 
  - Proprietary software distributed by manufacturers of dive computers. Refer
  to: xref:S_ImportingAlienDiveLogs[Importing dive information from other digital data sources or other data formats].
@@ -333,7 +333,7 @@ image::images/DC_import_f20.jpg["FIGURE: Download dialogue 1",align="center"]
 
 Dive computers tend to keep a certain number of dives in their memory, even
 though these dives have already been imported to _Subsurface_. For that reason, if
-the divecomputer allows this,
+the dive computer allows this,
 _Subsurface_ only imports dives that have not been uploaded before. This makes
 the download process faster on most dive computers and also saves battery power
 of the dive computer (at least for those not charging while connected via USB).
@@ -389,7 +389,7 @@ of the dive computer (at least for those not charging while connected via USB).
progress information could be inaccurate as we cannot determine how much
downloadable data there is until all data have been downloaded). After successful download, Dialogue *B*
in the figure above appears.
-   After the dives have been downloaded, they appear in a tabular format on the righthand
+   After the dives have been downloaded, they appear in a tabular format on the right-hand
side of the dialogue (see image *B*, above). Each dive comprises a row in the table, with the date, duration
and depth shown. Next to each dive is a checkbox: check all the dives that need to
be transferred to the *Dive List*. In the case of the image above, the last six dives are
@@ -489,7 +489,7 @@ check box labelled _"Choose Bluetooth download mode"_, the dialogue below appear
 image::images/DC_import_Bluetooth.jpg["FIGURE: Download Bluetooth",align="center"]
 
 On the _Linux_ or _MacOS_ platforms the name
-of the _Subsurface_ computer and its Bluetooth address are shown on the righthand side, On the lefthand side, if the
+of the _Subsurface_ computer and its Bluetooth address are shown on the right-hand side, On the lefthand side, if the
 computer has connected more than one local Bluetooth devices the user can use
 the list box to indicate which one needs to connect to _Subsurface_.
 The power state (on/off) of the Bluetooth adapter is shown below
@@ -552,7 +552,7 @@ check that the Bluetooth device on the _Subsurface_ computer is turned on.
 The pairing step is checked and done automatically during
 the download process. If the devices have never been paired the system will ask
 for your permissions and put a message on the right side of the screen: _Add a
-device, Tap to setup your DC device_. Always allow this pairing. After a
+device, Tap to set up your DC device_. Always allow this pairing. After a
 discovered item is selected, select the _Save_ button.
 Finally select the _Download_ button on the _Download_ dialogue and wait for the process to complete.
 
@@ -631,7 +631,7 @@ The *Time* field reflects the date and time of the dive. By clicking
 the date, a calendar is displayed from which
 one can choose the correct date. Press ESC to close the calendar.
 The time values (hour and minutes) can also be
-edited directly by clicking on each of them in the text box and by overtyping the
+edited directly by clicking on each of them in the text box and by over-typing the
 information displayed.
 
 

Fwd: Re: [PATCH] User manual: last-minute changes before V4.5

[Willem Ferguson]

 Forwarded Message 
From:   12 2015 <>
X-Mozilla-Status:   0001
X-Mozilla-Status2:  0080
X-Mozilla-Keys: 
Reply-To:   willemfergu...@zoology.up.ac.za
Subject:Re: [PATCH] User manual: last-minute changes before V4.5
References: 

Updates to user manual: need for help

[Willem Ferguson]

I have done the most important changes needed to the manual. But I am
convinced there are many inadequacies. If you know of any issue, please let
me know !

One issue that I noticed is that the image for a Facebook connection still
contains a fb
icon on the bottom right of the notes panel. This has changed.  If a fb
connection is currently
live, how is this currently indicated in the _Subsurface_ window?
Kind regards,
willem
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Dive Site Problem: nearby sites

[Willem Ferguson]

I want to make some changes to the user manual pertaining to the 
management of coordinates. So I create an hypothetical dive as follows:


Create a new dive:  Log -> Add dive
Specify a location that I have dived on several occasions. (In my case 
Aliwal Shoal: Cathedral)

Image 'Divesite1.png', attached, appears.
Now I am assuming that I am diving a different part of the Cathedral, 
NOT represented by any existing coordinates. So I doubleclick the 
highlighted option in Divesite1.png.

I hit the button "Apply changes". Now the dive information has been saved.
Then I hit the globe button to the right of the Location text box. I 
want to provide the coordinates.

Image Divesite2.png, attached appears.
But in the bottom list box there are no other locations of Aliwal Shoal: 
Cathedral


I would have expected all my previous dive locations at the Cathedral to 
be listed here.


Typing the coordinates of the new dive site at this stage does not make 
a difference. Neither using the existing coordinates for Cathedral, nor 
by changing the coordinates very slightly to refer to a site not exactly 
similar to any of the existing dives at Cathedral.


Am I misunderstanding the UI?

Kind regards,
willem




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

Re: Problem with printing dives

[Willem Ferguson]

On 10/10/2015 23:05, Lubomir I. Ivanov wrote:
2) a test: can you try the attached patch (and perhaps you WIllem too) 
and see if it solves the line widths when printing? 


thanks. lubomir -- 


Lubomir,
Yes, it solves the print problem on my system too.
Thank you for your time!
Kind regards,
willem

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

Re: [PATCH] Problem with printing dives

[Willem Ferguson]

On 11/10/2015 14:29, Willem Ferguson wrote:

On 11/10/2015 13:28, Lubomir I. Ivanov wrote:

On 11 October 2015 at 13:46, Willem Ferguson
<willemfergu...@zoology.up.ac.za> wrote:

Yes, it solves the print problem on my system too.
Thank you for your time!

Willem and Joakim,

i have just sent two official patches to the mailing list, namely:
[PATCH 1/2] profilewidget2: add resetZoom()
fixes the badly zoomed profile when printing. this bug i can 
reproduce locally.


[PATCH 2/2] profilewidget2: fix line width when printing on OSX and 
Linux


i need your ACKS or tests (Acked-by: or Tested-by:) on this one as the
bug does not happen on my setup. it differs from the last patch
(_patch.diff) as it now keeps the grid width to a sane, visible
pleasant value on the screen, while *only* when printing forces a
"hairline" / cosmetic / 0-valued-width grid. the previous patch sets
the grid to "hairline" at all times.

thanks
lubomir
--



ACK

Attached an image of the result of the above patch for printing to the 
PDF printer. This is on Ubuntu 15.04.


Kind regards,
willem



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

Segfault upon exit from coordinates specification

[Willem Ferguson]

I do the following:
Create new dive using log->Add dive
I provide name for an existing dive site and hit Apply changes
Edit coordinates in dive site info panel by hitting the globe button 
(these happen to be existing coordinates)

Type existing coordinates (this generates some warnings in the terminal)
Hit Discard changes: do not accept the information
Exit Subsurface.
Subsurface gives segfault.
Here is the terminal output:

Setting a New dive site
Setting the dive site id on the dive: 304245814
Warning, two different dive sites with same name have a different id 
2893376900 and 304245814
Warning, two different dive sites with same name have a different id 
2893376900 and 304245814
Warning, two different dive sites with same name have a different id 
2893376900 and 304245814
Warning, two different dive sites with same name have a different id 
2893376900 and 304245814
Warning, two different dive sites with same name have a different id 
2893376900 and 304245814
Warning, two different dive sites with same name have a different id 
2893376900 and 304245814
Warning, two different dive sites with same name have a different id 
2893376900 and 304245814
Warning, two different dive sites with same name have a different id 
2893376900 and 304245814

cannot open "/home/willem/subsurface/hashes"
*** Error in `./subsurface': double free or corruption (fasttop): 
0x025be950 ***

Aborted (core dumped)

Kind regards,
willem

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

Preferences storage and recovery

[Willem Ferguson]

The last two builds loses the preferences on my Ubuntu box. Every time I 
start up Subsurface, the default values are back. Most obvious is that 
it does not remember the dive log file name. Does anyone else have that 
issue?

Kind regards,
willem

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

Problem with printing dives

[Willem Ferguson]

This is an old problem that I assume we would want to correct. Attached 
image showing printwork of a dive. The white lines are so wide that they 
obscure numbers on the Y axis. This applies both to physical printouts 
and when printing to PDF. Necessary to file a bug?

SHA gbfaf57e1ec2f on Ubuntu.

Kind regards,
willem

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

Re: [PATCH 2/3] User manual spelling fixes and tidy-up

[Willem Ferguson]

On 09/10/2015 22:08, sergey.staro...@gmail.com wrote:

From: Sergey Starosek 

Signed-off-by: Sergey Starosek 
---
  Documentation/user-manual.txt | 91 ++-
  1 file changed, 46 insertions(+), 45 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 1ac4d5f..9c27635 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1,4 +1,4 @@
-// Subsurface 4.5 User Manual
+// Subsurface 4.5 User Manual
  // ==
  // :author: Manual authors: Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
  // Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Willem
@@ -392,8 +392,8 @@ of the dive computer (at least for those not charging while 
connected via USB).
 After the dives have been downloaded, they appear in a tabular format on 
the righthand
 side of the dialogue (see image *B*, above). Each dive comprises a row in 
the table, with the date, duration
 and depth shown. Next to each dive is a checkbox: check all the dives that 
need to
-   be transfered to the *Dive List*. In the case of the image above, the last 
six dives are
-   checked and will be transfered to the *Dive List*. Then
+   be transferred to the *Dive List*. In the case of the image above, the last 
six dives are
+   checked and will be transferred to the *Dive List*. Then
 click the _OK_ button at the bottom of the dialogue. All the imported 
dives appear
 in the *Dive List*, sorted by date and time. Disconnect and
 switch off the dive
@@ -402,7 +402,7 @@ of the dive computer (at least for those not charging while 
connected via USB).
  
  


Thank you very much, Sergey.
Kind regards,
willem
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

User manual: reverse geo-lookup and dive site specification

[Willem Ferguson]

On 09/10/2015 01:50, Dirk Hohndel wrote:

Why the heck is this going to the user forum?
This absolutely is NOT stuff we should discuss on the user forum.
/D

As far as I am aware this correspondence was never addressed to the user
forum.
It was addressed only to subsurf...@subsurface-divelog.com

A. No, that's not what we do just yet.
> So far all we do is the opposite direction (hence "reverese").
> If you HAVE a GPS location, then clicking on the globe will give you
> country / town / (and often, but not always) body of water.
>

Ferguson is a bit slow to understand. Apologies for unnecessary discourse.

 On 09/10/2015 01:50, Dirk Hohndel wrote:
> Typing in a name and selecting it (with mouse or keyboard - I don't
> understand why you need to double click) gets you a new dive site, but
> some information of the current dive site are retained - the explanation
> in each of the options should be fairly straight forward.
>

I was concerned that the + button has no function. But I now realise it is
*not* a clickable button at all but only an indicator. Problem solved.

That match is by name, not by distance. I'm a bit confused what you are
> doing, frankly.
>

See the attached image. The list at the bottom has no relation to the dive
site. My only point was that this is probably not helpful at all and
extremely confusing to the general user. This is
compounded by the heading that says: Dive sites at same coordinates. I
would expect
that this list would only include other previous dive sites at Durban??

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

[no subject]

[Willem Ferguson]

Hallo Robert,

/* Willem,

On 09.09.2015, at 07:57, Willem Ferguson <willemfergu...@zoology.up.ac.za>
wrote:

As far as the dive planner UI is concerned, it is only the VPM-B that is
new and that needs documentation. Is this correct?


the recreational mode is also new in this version but you have already
written about it. Since then, the UI layout changed a bit, so you might
want to update the text for recreational mode as well (the structure of the
buttons changed).

Best
Robert */

It looks to me like the section on recreational diving is more or less ok?
Am I missing something?

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

User manual: reverse geo-lookup and dive site specification

[Willem Ferguson]

Three issues:

Firstly:
I add a dive manually, type in the location text box a town like Durban.
Then I say Apply Changes.
Then I hit the globe on the right of the Coordinates text box. Dive
location panel opens.

Given the existing dive site of Durban, then I try a reverse lookup by
again hitting the globe  button:
and I get:

no reverse geo lookup; geonames returned
 "{"geonames":[]}"
no reverse geo lookup; geonames returned
 "{"geonames":[]}"

Setting the dive site id on the dive: 4245881241
no reverse geo lookup; geonames returned
 "{"geonames":[]}"
no reverse geo lookup; geonames returned
 "{"geonames":[]}"

In addition, it gives a red message bar at the bottom of the screen hat
says:

Geonames.orgt did not supply reverse lookup information.

I see geonames.org in my browser and the towns or cities (e.g. Durban) I
use are listed on geonames.org.

I am at a loss about what to do or write for the manual.


Secondly:
When I manually add a dive and type a town name, several similar-looking
town names are listed. I select one by double-clicking on the appropriate
option in the dropdown list of town names. BUT: what is the function of the
black button with the +? In theory, if I single-click on it, it should
insert the appropriate town name in the dive site text box. But this does
not work. A double click is required. In addition, sometimes, more than one
option has a + button on the right. How is the interface supposed to
function? See attached image.

Thirdly:
If I add a dive manually, add a dive site, Apply this information, then hit
the globe button to open the dive site dialogue, there is a text box  with
Dive sites on same coordinates. But this list of dive sites lists just
about all the dive sites I have dived at. I know that coordinates have not
been provided yet, and how can Subsurface know which sites are close to
Durban without knowing Durban's coordinates? My feeling is that this text
box should be empty until coordinates have been provided.

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

Trip header format in dive list

[Willem Ferguson]

On Sun, Oct 04, 2015 at 05:00:02AM -0700, Giorgio Marzano wrote:

Hi, all

could someone please explain me the workflow to propose, discuss and
implement a change?

I'd strongly suggest doing that on the developer mailing list, not in the
user forum.


Let's say I have a change to propose: to improve readability I would like
the trips with duration < 1 day to be displayed in the form "Month Day Year
(dives)" instead of  "Month Year (dives)"



Please, please do not make this a USA-specific format. Any normal European
will scream at you.
Kind regards,
willem
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: Marble problem (was Coordinates and dive mapping)

[Willem Ferguson]

Rick,
Thanks very much.

Currently I have
/home/willem/src/subsurface/marbledata/maps/earth/googlesat/googlesat.dgml

My subsurface directory does not contain a:
build/marble/data/earth/googlesat/

Do you imply that I should create a directory:
/home/willem/src/subsurface/build/marble/data/earth/googlesat   ??

Within a wider context I think this motivates to, if possible, do the final
of Subsurface installation in usr/share as in the bad old qmake days so
that all the files are in a standardised place.

Kind regards, and thanks for your time.
willem



On Sun, Oct 4, 2015 at 12:15 PM, Rick Walsh <rickmwa...@gmail.com> wrote:

> Hi Willem,
>
> On 3 October 2015 at 07:22, Willem Ferguson <
> willemfergu...@zoology.up.ac.za> wrote:
>
>> |
>> |   I'd say so - assuming you are building in ~*/src/*...
>> |
>>
>> Yes, I build in ~/src/
>>
>> willem~ cd src
>> willem~/src$ ls
>> build.log  grantlee  install-root  libdivecomputer  libgit2  marble-source  
>> subsurface
>> willem~/src$
>>
>> Any other ideas to understand what causes marble panel to be black?
>>
>> I've had a similar issue with a clean build, using build.sh and running
> from the build dir.  The problem is that it can't find the file
> googlesat.dgml.  It *should* be in
> build/marble/data/earth/googlesat/googlesat.dgml, but it isn't.  For some
> reason, the marbledata directory isn't being copied into the build dir by
> the make scripts.
>
> As a workaround, I've copied the marbledata directory into the build
> directory, and the globe is displaying fine now.  It should be fixed
> properly but I don't know how.
>
> Cheers,
>
> Rick
>
> ___
> 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

Marble problem (was Coordinates and dive mapping)

[Willem Ferguson]

|
|   I'd say so - assuming you are building in ~*/src/*...
|

Yes, I build in ~/src/

willem~ cd src
willem~/src$ ls
build.log  grantlee  install-root  libdivecomputer  libgit2
marble-source  subsurface
willem~/src$

Any other ideas to understand what causes marble panel to be black?

The cursor for my marble is a hand. However, there is an area at the
centre top where the cursor changes to an arrow. Depending on the
proximity to the edge of this area, the arrow points left, right or
upwards. See attached image. This suggests that the cursor is
globe-aware but there no globe shown.

Kind regards,

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

Coordinates and dive mapping

[Willem Ferguson]

I have three issues with a very recent git master (SHA c4eb957).

1) Entering coordinates by hand.
When I enter GPS coordinates by hand, Subsurface often loses some of these,
even though they were shown correctly before closing down Subsurface and I
exited Subsurface with a Save divelog command. Inspecting the XML shows
that several divesite location entries were created, typically with
identical names and identical uuids, both WITHOUT GPS coordinates; and then
a third entry with exactly the same name as the previous two but WITH the
GPS coordinates. Here is an example:





Eliminating the two 'bogus' entries by hand solves all the coordinates
problems and all dives then show the appropriate coordinates. There are two
issues here. My feeling is that, when a dive location is saved with
coordinates, it should first check if already-existing sites have exactly
that same dive site name (case insensitive) and then follow a standard rule
on how to deal with this situation. But creating yet another location is
clearly inappropriate. Maybe, (1) when entering coordinates by hand, the
user needs to understand the rules Subsurface uses when entering this info
by hand. (2) or it is user error because I mostly enter the dive site name
into the appropriate text box then save the change (because clicking the
orange bar with the new location name does not do anything), then provide
the coordinates in the dive site panel then save again. So every time I
save, it creates a new location. In this case it is user ignorance. But
then we need to specify the appropriate procedure explicitly in the manual.
I would prefer automatic overwrite of duplicate dive site names. However, I
am not sure what the most appropriate way forwards with this is. It would
be nice if V4.5 had this solved.

2) After everything is shown correctly by editing of the XML, and I wish to
inspect the present location information by clicking the globe icon the the
right of the dive location name, the location panel is not opened. It is
not possible to review this information.

3) For several recent versions of Subsurface, the marble panel is
black/blank. When highlighting dives that used to be shown perfectly on the
map, there is nothing now. I build the above version from scratch by
creating an empty src directory, cloning the subsurface git master and
rebuilding. Stll no solution.

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

[PATCH] user manual: Bluetooth douwnload

[Willem Ferguson]

[PATCH] user manual: Bluetooth douwnload

Clean up the text on the above issue. Many thanks, Claudiu.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
From 57532cc1130bb447d16cd22440d17ec982674bfb Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Sun, 27 Sep 2015 04:15:05 +0200
Subject: [PATCH 5/5] [PATCH] user manual: Bluetooth douwnload

Clean up the text on the above issue. Many thanks, Claudiu.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---
 Documentation/user-manual.txt | 72 ---
 1 file changed, 33 insertions(+), 39 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 81a2e1e..1ac4d5f 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -469,8 +469,8 @@ as well as contextual information about the dives recorded on the dive computer.
  Connecting _Subsurface_ to a Bluetooth-enabled dive computer
 [icon="images/icons/bluetooth.jpg"]
 
-Bluetooth is becoming a more common way of communication between dive computer
-and _Subsurface_. For instance, this mechanism is used by the Shearwater Petrel
+Bluetooth is becoming a more common way of communication between dive computers
+and _Subsurface_, for instance, the Shearwater Petrel
 Mk2 and the OSTC Mk3. _Subsurface_ provides a largely operating system independent
 Bluetooth interface. Setting up _Subsurface_ for Bluetooth communication requires
 four steps:
@@ -480,7 +480,7 @@ four steps:
 - Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in PC upload mode.
 - Ensure that _Subsurface_ is paired with the Bluetooth-enabled dive computer.
 
-Select
+Select the Download dialogue by selecting
 _Import -> Import from dive computer_ from the *Main Menu*. If one checks the
 check box labelled _"Choose Bluetooth download mode"_, the dialogue below appears.
 
@@ -488,18 +488,17 @@ check box labelled _"Choose Bluetooth download mode"_, the dialogue below appear
 
 image::images/DC_import_Bluetooth.jpg["FIGURE: Download Bluetooth",align="center"]
 
-On _Linux_ or _MacOS_ platforms there are displayed some details about the
-Bluetooth adapter of the _Subsurface_ computer. On the righthand side, the name
-of the _Subsurface_ computer and its Bluetooth address are shown. Also if the
-computer has connected more than one local Bluetooth adapters the user can select
-from the combobox which one he wants to use.
-Moreover the power state (on/off) of the Bluetooth adapter is displayed below
-the address and can be changed by pressing the _Turn ON/OFF_ button.
+On the _Linux_ or _MacOS_ platforms the name
+of the _Subsurface_ computer and its Bluetooth address are shown on the righthand side, On the lefthand side, if the
+computer has connected more than one local Bluetooth devices the user can use
+the list box to indicate which one needs to connect to _Subsurface_.
+The power state (on/off) of the Bluetooth adapter is shown below
+the address and can be changed by checking the _Turn on/off_ check box.
 
 If the Bluetooth address is not shown, then _Subsurface_ does not see the local
 Bluetooth device. Ensure that the Bluetooth driver is installed correctly on the
-_Subsurface_ computer and check if it can be used on other Bluetooth utilities like
-_bluetoothctl_, _bluemoon_ or others. This achieves the first two steps above.
+_Subsurface_ computer and check if it can be used by other Bluetooth utilities like
+_bluetoothctl_ or _bluemoon_. This achieves the first two steps above.
 
 Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and that it
 is discoverable by other Bluetooth devices. Consult the manual of the dive
@@ -510,21 +509,21 @@ searching for a small amount of time, the dive computer should be listed
 (perhaps as one of a number of Bluetooth devices) in the main list box on the
 lefthand side of the dialogue (see image above). If this is not achieved, select
 the _Clear_ button and then scan again for Bluetooth devices using the _Scan_
-button. After performing these actions _Subsurface_ sees the dive computer.
+button. After performing these actions _Subsurface_ should see the dive computer.
 The label of the discovered dive computer contains the name of the device, its
 address and its pairing status. If the device is not paired and has a red
-background color, a context menu can be opened by selecting the item and pressing
-right-click. An option for pairing the devices will be available in the context menu.
-Press the _Pair_ button and wait for task completion.
+background color, a context menu can be opened by selecting the item with a
+right-click.
+Select the the _Pair_ option and wait for the task to complete.
 
 
 [icon="images/icons/important.png"]
 [IMPORTANT]
-Be aware that currently _Subsurface_ doesn't support Bluetoo

[PATCH] User manual update: Put back manual Bluetooth procedures

[Willem Ferguson]

  [PATCH] User manual update: Put back manual Bluetooth procedures

Put back the procedures for manually achieving a Bluetooth connection
into APPENDIX A.
Refer to the manual procedures from the text that described the new
built-in Subsurface Bluetooth interface.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
From 87666415cc92a845e4e625c2159f8f4cecbc49ac Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Thu, 24 Sep 2015 16:14:29 +0200
Subject: [PATCH] [PATCH] User manual update: Put back manual Bluetooth
 procedures

Put back the procedures for manually achieving a Bluetooth connection
into APPENDIX A.
Refer to the manual procedures from the text that described the new
built-in Subsurface Bluetooth interface.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---
 Documentation/user-manual.txt | 213 +-
 1 file changed, 211 insertions(+), 2 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index a7fdeab..9ebd828 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4,7 +4,7 @@
 // Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Willem
 // Ferguson, Salvador Cuñat, Pedro Neves
 // :revnumber: 4.5
-// :revdate: September 2015
+// :revdate: October 2015
 :icons:
 :toc:
 :toc-placement: manual
@@ -507,6 +507,11 @@ Select the _Save_ button of the dialogue. This closes the Bluetooth dialogue. No
 _Download_ in the _Download from  dive computer_ dialogue which should still be open.
 The downloaded dives are shown on the righthand side of the download dialogue.
 
+*IN CASE OF PROBLEMS*: When encountering problems with
+Bluetooth download, xref:S_HowFindBluetoothDeviceName[_Appendix A_] contains
+information for manually setting up and inspecting the Bluetooth connection
+with _Subsurface_.
+
 
 [[S_DeviceNames]]
  Changing the name of a dive computer
@@ -3284,7 +3289,7 @@ dealing with the appropriate operations.
   clear all dive information.
 - _Open logbook_ - This opens the file manager in order to select a dive
   logbook to open.
-- _Open cloud storage_ - Open the log book previously saved in <<S_Cloud_storage,_Cloud storage_>>.
+- _Open cloud storage_ - Open the dive log previously saved in <<S_Cloud_storage,_Cloud storage_>>.
 - _Save_ - Save the dive logbook that is currently open.
 - _Save to cloud storage_ - Save the current dive log to <<S_Cloud_storage,_Cloud storage_>>.
 - _Save as_ - Save the current logbook under a different file name.
@@ -3457,6 +3462,210 @@ to the USB
 port, the dive computer interface can connect and one should be able to import
 dives.
 
+
+[[S_HowFindBluetoothDeviceName]]
+=== Manually setting up Bluetooth enabled devices
+[icon="images/icons/bluetooth.jpg"]
+[NOTE]
+For dive computers communicating through bluetooth like the Heinrichs
+Weikamp Frog or the Shearwater Predator and Petrel there is a
+different procedure to get the devices name to communicate with
+_Subsurface_. Follow these steps:
+
+ * *For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*
+
+For Bluetooth pairing of the dive computer, refer to the
+manufacturer's user guide. When using a Shearwater Predator/Petrel, select
+_Dive Log ->  Upload Log_ and wait for the _Wait PC_ message.
+
+ * *Pair the _Subsurface_ computer with the dive computer.*
+
+ On Windows:
+
+Bluetooth is most likely already enabled. For pairing with the dive computer choose
+_Control Panel ->  Bluetooth Devices ->  Add Wireless Device_.
+This should bring up a dialog showing your dive computer (which should be in Bluetooth mode) and
+allowing pairing. Right click on it and choose _Properties->  COM
+Ports_ to identify the port used for your dive computer. If there are several
+ports listed, use the one saying "Outgoing" instead of "Incoming".
+
+For downloading to _Subsurface_, the _Subsurface_ drop-down list should contain
+this COM port already. If not, enter it manually.
+
+Note: If there are issues afterwards when downloading from the dive computer using
+other software, remove the existing pairing with the dive computer.
+
+ On MacOS:
+
+Click on the Bluetooth symbol in the menu bar and select _Set up
+Bluetooth Device..._. The dive computer should then show up in the list of devices. Select it and go
+through the pairing process. This step should only be needed once for
+initial setup.
+
+Once the pairing is completed the correct device is shown in the
+'Device or Mount Point' drop-down in the _Subsurface_ *Import* dialog.
+
+ On Linux
+Ensure Bluetooth is enabled on the _Subsurface_ computer.
+On most common distributions this should be true out of the box and
+pairing should be straight forward. For instance, Gnome3 shows a
+Bluetooth icon on the right of the toolbar at the top of the sc

[PATCH] User manual systematic update (Part 4)

[Willem Ferguson]

[PATCH] User manual systematic review (Part 4)

1) Delete section on mobile application
2) Update Preferences and Menu options sections

Only the text is updated, no images are added or replaced.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
From 0bda2a70a4bb1cf88facbe25c9e55b09071c830e Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Thu, 24 Sep 2015 02:23:38 +0200
Subject: [PATCH 2/2] [PATCH] User manual systematic review (Part 4)

1) Delete section on mobile application
2) Update Preferences and Menu options sections

No images are added or replaced.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---
 Documentation/user-manual.txt | 148 --
 1 file changed, 84 insertions(+), 64 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 2340f41..e88baa0 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2557,6 +2557,7 @@ functional even if used while disconnected to the Internet. _Subsurface_ simply
 data with the cloud server the next time ithe program is used while the computer is
 connected to the Internet.
 
+[[S_Cloud_storage]]
 === Web access to _Subsurface cloud storage_
 
 One of the nice side benefits of using _Subsurface cloud storage_ is that
@@ -2731,17 +2732,22 @@ image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page",align="center"]
   ** *Lists and tables*: Here one can specify the font type and font size of the
  *Dive Table* panel. By decreasing the font size of the *Dive Table*, users can see more dives on a screen.
 
-  ** *Dives*: For the _Default Dive File_ one need to specify the directory and
+  ** *Dives*: For the _Default Dive File_ one needs to specify the directory and
  file name of one's
- electronic dive log book. This is a file with filename extension .xml. When
- launched, _Subsurface_ will automatically load the specified dive log book.
+ electronic dive log book. This is a file with filename extension of either _.xml_ or _ssrf_. When
+ launched, _Subsurface_ will automatically load the specified dive log book. There are three options:
+ - _No default file_: When checked, _Subsurface_ does not automatically load a dive log at startup.
+ - _Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk
+   as descibed above.
+ - _Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud
+   device that was initialised using the *Preferences* _Network_ tab (see below). 
 
   ** *Display invalid*:  Dives can be marked as invalid (when a user wishes to hide
  dives that he/she don't consider valid dives, e.g. pool dives, but still want to
  keep them in the dive log). This controls whether those dives are displayed in
  the dive list.
 
-  ** *Default cylinder*: Here users can specify the default cylinder listed in
+  ** *Default cylinder*: Specify the default cylinder listed in
  the *Equipment* tab of the *Notes* panel.
 
   ** *Animations*: Some actions in showing the dive profile are performed using
@@ -2749,14 +2755,9 @@ image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page",align="center"]
  dive. When viewing a different dive, these changes in axis characteristics do not
  happen instantaneously, but are animated. The _Speed_ of animations can be controlled
  by setting this slider
- with faster animation speed to the left, with a 0 value representing no animation
+ with faster animation speed to the left, and a 0 value representing no animation
  at all.
 
-  ** *Subsurface web service*: When one subscribes to the <<S_Companion,Subsurface web service>>, a very
- long and hard-to-remember userID is issued. This is the place to save that userID. By
- checking the option _Save User ID locally?_, one ensures that a local copy of that userID
- is saved.
-
   ** *Clear all settings*: As indicated in the button below this heading, all settings are
  cleared and set to default values.
 
@@ -2767,7 +2768,13 @@ Here user can choose between metric and imperial units of depth, pressure,
 volume, temperature and mass. By selecting the Metric or Imperial radio button
 at the top, users can specify that all units are in the chosen measurement system.
 Alternatively, if one selects the *Personalise* radio button, units can be selected
-independently, with some units in the metric system and others in imperial.
+independently, with some units in the metric system and others in imperial. 
+
+Irrespective
+of the above settings, dive time measurements can be either in seconds or minutes.
+Choose the appropriate option. GPS coordinates can be represented either as
+traditionla coordinates (degrees, minutes, seco

User manual: Bluetooth UI description

[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
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

[PATCH] User manual: description of Bluetooth interface

[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.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
From 35da12623052b77d813c644f76a828e0d929cdfd Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Wed, 23 Sep 2015 04:01:48 +0200
Subject: [PATCH] [PATCH] User manual: Bluetooth UI description

1) Inser 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.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---
 Documentation/images/DC_import_Bluetooth.jpg | Bin 0 -> 24388 bytes
 Documentation/user-manual.txt| 262 +--
 2 files changed, 47 insertions(+), 215 deletions(-)
 create mode 100644 Documentation/images/DC_import_Bluetooth.jpg

diff --git a/Documentation/images/DC_import_Bluetooth.jpg b/Documentation/images/DC_import_Bluetooth.jpg
new file mode 100644
index ..c4ff5fc61e696dfd251f1f02ea1413e3420cf31a
GIT binary patch
literal 24388
zcmdSB1wb9WwlF#ycXzh}#i3X!P~4%oyA_ur#ogWAp}0E~in|o|QoKk7D6VhQ&+VLZ
z?|<KW_s?W!mPJ;wB9qyf`-S^808L6vQValrK!85@0`BhsOyO512974iWUtK~(+h
zW##Xe0bu|V0^-4g9TeC@!$CtsK|v$H!ot8IAs`_kA|N6nqhO#RqoAW8BBJ4-p<`lU
zV`C$s;^N_8;bCB5V?87Sf&|Bbf`*5NhQ~riM8^6ryZdec9S-yqbOH%N2O!Wvkm#WM
zUVsPy0T7T6I{fM&+1PK(KINE+Lrlllzqmf`EjAfrh<b0+1lVQPCjL004B0%dqyV
z#2<iH<}=bg8tz<XtzRS^>}NDSH)zyOnd$v=9D4?g1fUbEY3ZV6Yh$w0h0?y_hR?
zuF%W(ry$r8=V07+aU~KboBZpD8l;_Qy{nEQj_4Q@s(J7w6VYak+
zH{QmJ^Ek4-45n9Fyl)NcnVzk`qn%V)6MCuKZSHM89AAREA?w;Ho=fIBF=B
zF)On3m?S-80-PzgtlWF9&1{t;MRQm=HY0lr$*6>Oe(4oHY`5d4?Gu#~Lp5qXC4T(wCr@3=kH6VQ%P^}yySVK?S^YMS|H<3vf_aapd@0k_;>mPL
zB(_1hW`D^^I$Xj4XO@$Z$C^|{`^zVC|2{P|(v++pEM7I)s-)xG*n{a(A1D*(WY
z@%f1aFEfs*R5!MuVe>NqOh!+;`6x%y^t8po%@#@}sj?=DqiNN3`5Dd+5s)xfPr%IQ
z@6I?{Ibh+R9F%DX*R(Gk)Bf<#3f<$K!&}!cM{gSq%Fm_+ehAF(tl6byX4!O)IQ|?1
ze2bXh0T%@gYwafz$h3lpy69zkb?t}WWGFc<-(@T!HEUZf^)@JO9H;j!<Ly}%G1~H{
z-(}Q4otsmhOLkrAPkVMd0?rEN?LU<*G=w0zh%n<ysbVah*D_+2b7^eVy<(c@tNX6o
ztI1EgOz#OM9s74Q6Q>Ag0f6JO`R|M31He#|{Zu;0=_h|%4d7Py$;HqTlD5P!eP`jK
zK7zqG%39)tUrV+)0igVCWeWfhY%L6e>eAGO`0o}og)voOQ|m1B-Aoco0Z_Mvv+G+#
z#s_2i$w55POWy?m7YP6$$$B8cy_frkWFa9o03guI>Gc7zRyOIIRZouV0j>8sOg;cT
z?K;OZ-VcFE;FNxLApEMa69AwmA^C{_IXyK5a@ZVB@QIG3LKnO|6~cjmGvhJ
z{LIiK@JkE;Zp_Oz=U42ZMry|v7XM^^zlj6jhA>L6{j*K@{FVZ^iw$s@n6&;z5wra6
z`5OlOljZ#?@=sOqi@-m&!7l=kpMssO{)LjL>7;_3f9@~8uci0X%{qV67Qdtq`hId?
z-Gu)O3LY?7euDvz+h>6bRN$@z0PHQ|B}`UlRuvD3>M-`h?Ptf2$a?lJX_bTQ0na76
zJA$K{O{BA@_f-&34@mNAo#<vfeq$Y2ir}}KRNYfJL7?3UT1c|^(JjB
z%?FIon;<;ges-j=sn>xsLHb}6QiULsB{Eyi{oRjdL5uhKSq6NA?V

FB transfers

[Willem Ferguson]

I set my Preferences on the FB tab, provide userID & password. Subsurface
replies "To disconnect Subsurface... use the button below". Then I
select Apply.
However, the FB icon does not appear in the Notes tab of Subsurface. Am I
doing something wrong? Or has the UI changed?
Kind regards,
willem
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

[PATCH] Systematic update of user manual (Part 3)

[Willem Ferguson]

   [PATCH] Systematic user manual update (Part 3)

From DiveList section to printing section

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
From eece15530730fbb6bcdc8d74e0bae2abeaecde67 Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Mon, 21 Sep 2015 02:23:09 +0200
Subject: [PATCH 2/2] [PATCH] Systematic user manual update (Part 3)

From DiveList section to printing section

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---
 Documentation/user-manual.txt | 80 +++
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 5f483b2..339dac9 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -18,7 +18,7 @@ image::images/Subsurface4Banner.jpg["Banner",align="center"]
 *Manual authors*: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
 Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves
 
-[blue]#_Version 4.5,  September 2015_#
+[blue]#_Version 4.5, October 2015_#
 
 
 Welcome as a user of _Subsurface_, an advanced dive logging program with
@@ -2155,11 +2155,11 @@ during a dive is indicated on the right hand side of the above figure for a dive
 Several actions on either a single dive or a group of dives can be performed using the Dive List
 Context Menu, found by selecting either a single dive or a group of dives and then right-clicking.
 
-image::images/ContextMenu.jpg["Figure: Context Menu",align="center"]
+image::images/ContextMenu.jpg["Figure: Context Menu",align="center"] # NEEDS REPLACEMENT
 
 The context menu is used in many manipulations described below.
 
- Customising the information showed in the *Dive List* panel
+ Customising the columns showed in the *Dive List* panel
 
 image::images/DiveListOptions.jpg["Example: Dive list info options",align="center"]
 
@@ -2167,15 +2167,8 @@ The default information in the *Dive List* includes, for each dive, Dive_number,
 Dive_duration and Dive_location. This information can be controlled and changed by right-clicking on the
 header bar of the *Dive List*. For instance, a right-click on the 'Date' header brings up a list of items
 that can be shown in the dive list (see above). Select an item to be shown in the *Dive List* or to be
-deleted from the dive list, and the list is immediately updated accordingly. Preferences for information
-shown in the *Dive List* is saved and used when _Subsurface_ is re-opened.
-
- Selecting dives from a particular dive site
-
-Many divers have long dive lists and it may be difficult to locate all the dives at a particular site.
-By pressing _Ctl-F_ on the keyboard, a text box is opened at the top left hand of the *Dive List*.
-Type the name of a dive site in this text box and the *Dive List* is immediately filtered to
-show only the dives for that site.
+deleted from the dive list (reflected by the check symbols) and the list is immediately updated. Preferences for information
+shown in the *Dive List* are saved and used when _Subsurface_ is re-opened.
 
 [[S_Renumber]]
 === Renumbering the dives
@@ -2218,13 +2211,13 @@ now shows only the titles for the trips.
 Normally, in the dive list, minimal information is included in the trip title.
 More information about a trip can be added by selecting its trip title from
 the *Dive List*. This shows a *Trip Notes* tab in the *Notes* panel. Here
-users can add or edit information about the date/time, the trip location and any
+one can add or edit information about the date/time, the trip location and any
 other general comments about the trip as a whole (e.g. the dive company that was
 dived with, the general weather and surface conditions during the trip, etc.).
 After entering this
-information, users should select *Save* from the buttons at the top right
+information, select *Save* from the buttons at the top right
 of the *Trip Notes*
-tab. The trip title in the *Dive List* panel should now reflect some of the
+tab. The trip title in the *Dive List* panel should now reflect the
 edited information.
 
  Viewing the dives during a particular trip
@@ -2237,14 +2230,13 @@ the selected trip, revealing the individual dives performed during the trip.
 
 After selecting a particular trip in the dive list, the
 context menu allows several possibilities to expand or collapse dives
-within trips. This includes expanding all trips, collapsing all trips and
-collapsing all trips except the selected one.
+within trips. This includes expanding all trips and collapsing all trips.
 
  Merging dives from more than one trip into a single trip
 
 After selecting a trip title, the context menu allows the merging
 of trips by either merging the selected trip with the trip below or with the
-trip above.(Merge

Subsurface Screenshots

[Willem Ferguson]

-- Forwarded message --
From: "Willem Ferguson" <willemfergu...@zoology.up.ac.za>
Date: 19 Sep 2015 13:15
Subject: Subsurface Screenshots
To: <subsurf...@subsurface-divelog.com>
Cc:

I am looking at the user manual text and its images. However I am away from
> home and my Fedora VM has started acting up. Is there anyone who runs
> Fedora who is prepared to help me out with a few screenshots? It currently
> concerns the context menu in the Dive List panel. I need three shots at the
> moment, involving the context menu.
> Kind regards,
> Willem
>
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Subsurface companion app

[Willem Ferguson]

I am looking at the user manual text for the companion app. If one wishes
to save single points instead of a continuous stream of points, it looks
like there is not a simple way. As far as I can see one needs to select
Start Service" to record single points. But it also initiates the streaming
of locations. This generates automatically-generated points in the location
list. If Start Service is not selected and one hits the + button to add a
single location, the companion app hang with a message "Waiting for
data..."?

Am I using the software wrongly?

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

[PATCH] User manual updates

[Willem Ferguson]

[PATCH] Updates: user manual review (part 1)

Systematic review of existing text (part 1)

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

[PATCH] user manual WITH attachment

[Willem Ferguson]

Here is attachment
wf
From 6d9f15eddf808176ebdad4010d6d7adcea5437fa Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Wed, 16 Sep 2015 16:00:22 +0200
Subject: [PATCH 2/2] [PATCH] Updates: user manual review (part 1)

Systematic review of existing text (part 1)

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---
 Documentation/user-manual.txt | 55 ---
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 2c24155..8ddd188 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -42,6 +42,8 @@ software solutions:
downloading and analysing your dive logs on other operating systems.
  - Do you need an intuitive graphical dive planner that integrates with and takes
into account the dives that have already been logged?
+ - Do you need a way of storing or backing up your dive log on the Internet, allowing
+   you to view your dive log from anywhere, using an Internet browser?
 
 _Subsurface_ binaries are available for Windows PCs (Win XP or later), Intel
 based Macs (OS/X) and many Linux distributions. _Subsurface_ can be built for
@@ -114,10 +116,10 @@ the panels. _Subsurface_ remembers the position of the dividers, so the next
 time _Subsurface_ starts it uses the positions of the dividers from when the program
 was last used.
 
-If a dive is selected in the *Dive List*, the dive location, detailed information
+If a single dive is selected in the *Dive List*, the dive location, detailed information
 and profile of
 the _selected dive_ are shown in the respective panels. On the other hand, if
-one highlights more than one dive the last highlighted dive is the _selected
+several dives are selected, the last highlighted dive is the _selected
 dive_, but summary data of all _highlighted dives_ are shown in the *Stats* tab
 of the *Info* panel (maximum, minimum and average depths, durations, water
 temperatures and SAC; total time and number of dives selected).
@@ -210,7 +212,7 @@ in the figure below. Each of these tabs will now be explained for data entry.
 image::images/AddDive1_f22.jpg["FIGURE: Add dive",align="center"]
 
 When one edits a field in Notes or Equipment panels, _Subsurface_ enters *Editing Mode*,
-indicated by the message in the blue box at the top of the _Notes_ panel (see the image below). This message is
+indicated by the message in the blue box at the top of the *Notes* panel (see the image below). This message is
 displayed in all the panels under Notes and Equipment when in *Editing Mode*.
 
 image::images/BlueEditBar_f22.jpg["Blue edit bar",align="center"]
@@ -233,9 +235,9 @@ dive being described:
 image::images/DiveProfile1_f20.jpg["FIGURE: Initial dive profile",align="center"]
 
 _Modifying the dive profile_: When the cursor is moved around the dive profile,
-its position is indicated by two coloured lines (red and green) as shown below.
-The depth and time
-that the cursor represents are indicated at the top of the black information box
+its position is indicated by two right-angled red lines as shown below.
+The time and depth
+represented by the cursor are indicated at the top of the black information box
 (@ and D). The units (metric/imperial) on the axes are determined by the
 *Preference* settings. The dive profile itself comprises several
 line segments demarcated by waypoints (white dots on the profile, as shown
@@ -244,9 +246,9 @@ If the dive depth was 20 m then the user needs to drag the appropriate waypoints
 downwards to represent 20 m. To add a waypoint, double-click on
 any line segment. To move an additional waypoint, drag it.
 To remove this waypoint, right-click on it and choose "Remove this point" from the
-context menu. The user needs to drag the waypoints to represent an
+context menu. Drag the waypoints to represent an
 accurate
-time duration for the dive. Below is a dive profile that represents a dive
+time duration for the dive. Below is a dive profile for a dive
 to 20 m for 30 min, followed by a 5 minute safety stop at 5 m.
 
 image::images/DiveProfile2_f20.jpg["FIGURE: Edited dive profile",align="center"]
@@ -254,14 +256,13 @@ image::images/DiveProfile2_f20.jpg["FIGURE: Edited dive profile",align="center"]
 _Specifying the gas composition:_ The gas composition used is clearly indicated
 along the line segments of the dive profile. This defaults to the first gas
 mixture specified in the *Equipment* tab, which was air in the case of the
-profile illustrated above. The gas mixtures of segments of the dive profile can
+profile above. The gas mixtures of segments of the dive profile can
 be edited. This is done by right-clicking on the particular
 waypoint and selecting the appropriate gas from the context menu. Changing
 the gas for a waypoint

User manual: information required

[Willem Ferguson]

There was a patch to make the format of typing in geographical coordinates
more flexible. I cannot find that patch. Please look at paragraph 5.2.4 of
the user manual to see if I have missed something?

Companion service: The web-service URL is currently:
api.hohndel.org
Is this still valid or has the URL also changed to
api.subsurface-divelog.org?

Robert:
The automated calculation of fingerprints for pre-existing photographs in a
collection that is mapped to Subsurface dives: has this happened already or
is code still under development?

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

[PATCH] user manual systematic review (part 2)

[Willem Ferguson]

[PATCH] user manual systematic review (part 2)

As the title says.

Kind regards,
willem
From 3c68a54e877903fd33bfe9b19f74df4cacadef76 Mon Sep 17 00:00:00 2001
From: Willem Ferguson <willemfergu...@zoology.up.ac.za>
Date: Thu, 17 Sep 2015 04:37:29 +0200
Subject: [PATCH 2/2] [PATCH] User manual: Systematic review (part 2)

As the title says.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---
 Documentation/user-manual.txt | 194 ++
 1 file changed, 101 insertions(+), 93 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 8ddd188..da5bd23 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -473,7 +473,7 @@ upload dive logs to _Subsurface_. For instance if one's partner's dive computer
 same make and model as one's own and dive logs are uploaded from both dive computers
 to the same _Subsurface_ computer, then
 one would perhaps like to call one dc "Alice's Suunto D4" and the other one
-"Bob's Suunto D4". Alternatively, perhaps a technical diver dives with two or more
+"Bob's Suunto D4". Alternatively, consider a technical diver dives with two or more
 dive computers of the same model, the logs of both (or all) being uploaded.
 In this case it might be prudent to call one of them
 "Suunto D4 (1)" and another one "Suunto D4 (2)". This is easily done in _Subsurface_.
@@ -493,16 +493,16 @@ the *Notes* and the *Equipment* tabs on the top left hand of the
 _Subsurface_ window should be used.
 
 [[S_Notes_dc]]
- Notes
+= Notes
 
-The user needs to add
-additional information by hand in order to have a more complete dive record. The information
-below is almost identical for hand-entered dives and for dives downloaded from a dive computer.
+To have a more complete dive record the user needs to add
+additional information by hand. The procedure
+below is virtually identical for hand-entered dives and for dives downloaded from a dive computer.
 
 In some cases,
 one has to provide the date and time of the dive, e.g. when entering a dive by hand or when a
 dive computer does not privide the date and time of the dive.
-(Often, the date and time of the dive, gas mixture and water temperature are usually
+(Usually the date and time of the dive, gas mixture and water temperature are
 shown as obtained from the dive computer)
 If the contents of the *Notes tab* is changed or edited in any way, the message in a blue box at
 the top of the panel indicates that the dive is being edited. If one
@@ -520,14 +520,14 @@ edited directly by clicking on each of them in the text box and by overtyping th
 information displayed.
 
 *Air/water temperatures*: Air and water temperatures during the dive are shown
-in these fields to the right of the Start time. Many dive computers supply water
-temperature information and this field may therefore contain information obtained from the dive computer.
+in text boxes to the right of the Start time. Many dive computers supply water
+temperature information and this box may therefore contain information.
 If air temperature is not provided by the dive computer, the first temperature reading
 might be used for the air temperature. Generally this is close enough to the real air temperature as
 the change in the temperature sensor reading is quite slow to follow the changes in the environment.
 If editing is required, only a value is required, the units of temperature will be
 automatically supplied by
-_Subsurface_ (according to the _Preferences_, metric or imperial units will
+_Subsurface_ (following the _Preferences_, metric or imperial units will
 be used).
 
 *Location*: Here the name of the dive site can be entered, e.g. "Tihany, Lake
@@ -537,9 +537,9 @@ performed at the same location, the information is re-used without requiring
 full dive site information again. Existing dive location information
 can be edited at any time by selecting (on the *Dive List* panel) a dive performed at that site
 and by opening the location information by clicking the globe button on the
-right of the location name (see image on the right above). When entering a dive location name, auto completion of
-location names makes it easy to select a dive site that already exists in the dive log
-(i.e. when typing in the name of a dive site,
+right of the location name (see image on the righ, above). When entering a dive location name, auto location of
+dive site names makes it easy to select a dive site that already exists in the dive log
+(i.e. when typing the name of a dive site,
 a dropdown list appears showing all sites with similar names). If the dive
 site has been used before, click on the already-existing name.
 
@@ -584,29 +584,29 @@ dives have the same location and try to keep their GPS coordinates the
 same).
 
 Enter any other textual information about the dive site (Description and Notes),
-the

Bluetooth interface questions and a UI suggestion

[Willem Ferguson]

I have a question about the Bluetooth download interface.

When selecting import -> Import from dive computer, there are two 
possibilities:


1) In the MountPoint textbox of the Download panel,  the address of the 
Bluetooth device is shown. It looks like this happens automatically when 
selecting Shearwater and Petrel from the list of supported DCs. Then one 
needs to check the checkbox marked "Choose Bluetooth" and hit the 
Download button to start downloading.


2) When selecting the "Choose Bluetooth" check box, a new panel opens 
with the full details of the Bluetooth interface, allowing activation of 
local Bluetooth and scanning for remote Bluetooth devices.


What determines which of these two routes of action is taken? I suspect 
it is determined, amongst others, by the state of the local Bluetooth 
interface. If it is switched on, then the Bluetooth address is shown in 
the MountPoint text box. is this correct? Is it also determined by the 
DC selected? I suspect some of this information is also stored so that 
when a download is done, the previous Bluetooth connection device names 
and setting are used?


Here is a suggestion: In the dropdown list of mount points, add a 
Bluetooth item. If the Bluetooth item is selected from this dropdown 
box, it switches on the local Bluetooth device and opens the Bluetooth 
panel referred to in 2) above. This allows one to do away with the 
checkbox "Choose Bleutooth".


Kind regards,
willem

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

Bluetooth blues

[Willem Ferguson]

I was trying to document the Bluetooth interface using a Shearwater 
Petrel. Below is the console output of the three attempts. I had three 
sessions:


1) Ubuntu 15.04
2) Fedora 22
3) Fedora 22

On Ubuntu, the first four of 37 dives were downloaded. On Fedora it 
resulted in a segfault both times without any upload. I hope the text 
below helps to find the problem. My procedure: Download -> from Dive 
computer; set DC type to Shearwater Petrel;  Check Bluetooth checkbox; 
internal computer (Dell M4700) Bluetooth interface is seen and displayed 
on right hand side of dialogue showing internal Bluetooth is switched 
on; Scan for Bluetooth devices; Petrel shows on list; right-click on 
Petrel line and select 'Pair';  Select 'save';  On download panel select 
Download.



UBUNTU:

qt.bluetooth.bluez: void QBluetoothSocketPrivate::_q_readNotify() 25 
error: -1 "Resource temporarily unavailable"

Connection on channel 1 failed. Trying on channel number 5.
Failed to connect to device  00:13:43:0D:1E:F5 . Device state 
QBluetoothSocket::UnconnectedState . Error: 
QBluetoothSocket::UnknownSocketError
[4.829207] ERROR: No such file or directory (2) [in serial_posix.c:159 
(serial_open)]
[4.829225] ERROR: Failed to open the serial port. [in custom_serial.c:69 
(dc_serial_native_open)]
[4.829235] ERROR: Failed to open the serial port. [in 
shearwater_common.c:47 (shearwater_common_open)]

Set the current dive site: 0
qt.bluetooth.bluez: void QBluetoothSocketPrivate::_q_readNotify() 26 
error: -1 "Resource temporarily unavailable"

Connection on channel 1 failed. Trying on channel number 5.
Failed to connect to device  00:13:43:0D:1E:F5 . Device state 
QBluetoothSocket::UnconnectedState . Error: 
QBluetoothSocket::UnknownSocketError
[5.347340] ERROR: No such file or directory (2) [in serial_posix.c:159 
(serial_open)]
[5.347363] ERROR: Failed to open the serial port. [in custom_serial.c:69 
(dc_serial_native_open)]
[5.347381] ERROR: Failed to open the serial port. [in 
shearwater_common.c:47 (shearwater_common_open)]

Set the current dive site: 0
The connection on RFCOMM channel number 1 took more than expected. Wait 
another 15 seconds.
qt.bluetooth.bluez: void QBluetoothSocketPrivate::_q_readNotify() 27 
error: -1 "Resource temporarily unavailable"
Failed to connect to device  00:13:43:0D:1E:F5 . Device state 
QBluetoothSocket::UnconnectedState . Error: 
QBluetoothSocket::UnknownSocketError
[7.030518] ERROR: No such file or directory (2) [in serial_posix.c:159 
(serial_open)]
[7.030530] ERROR: Failed to open the serial port. [in custom_serial.c:69 
(dc_serial_native_open)]
[7.030537] ERROR: Failed to open the serial port. [in 
shearwater_common.c:47 (shearwater_common_open)]

Set the current dive site: 0

FEDORA 22:
===
[willem@localhost build]$ ./subsurface
pci id for fd 10: 80ee:beef, driver (null)
libGL error: core dri or dri2 extension not found
libGL error: failed to load driver: vboxvideo
Map theme file does not exist: ""
QInotifyFileSystemWatcherEngine::addPaths: inotify_add_watch failed: No 
such file or directory

QFSFileEngine::open: No file name specified
QFSFileEngine::open: No file name specified
QFSFileEngine::open: No file name specified
QFSFileEngine::open: No file name specified
QFSFileEngine::open: No file name specified
QFSFileEngine::open: No file name specified
QFSFileEngine::open: No file name specified
QFSFileEngine::open: No file name specified
QFSFileEngine::open: No file name specified
qt.bluetooth.bluez: Bluez 5 detected.
qt.bluetooth.bluez: Creating QtBluezDiscoveryManager
qt.bluetooth.bluez: Discovered:  "B8:D9:CE:F2:A0:63" "Willem Ferguson 
(GT-I9" Num UUIDs 13 total device 0 cached RSSI 0 Class 5898764
qt.bluetooth.bluez: Discovered:  "00:13:43:0D:1E:F5" "Petrel" Num UUIDs 
1 total device 1 cached RSSI -63 Class 0

qt.bluetooth.bluez: Initiating direct pair to "00:13:43:0D:1E:F5"
qt.bluetooth.bluez: Sending pairing request to "00:13:43:0D:1E:F5"
qt.bluetooth.bluez: void QBluetoothDeviceDiscoveryAgentPrivate::stop()
qt.bluetooth.bluez: void QBluetoothSocketPrivate::_q_readNotify() 11 
error: -1 "Resource temporarily unavailable"
qt.bluetooth.bluez: void QBluetoothSocketPrivate::_q_readNotify() 11 
error: -1 "Resource temporarily unavailable"
[10.261356] ERROR: No such file or directory (2) [in serial_posix.c:159 
(serial_open)]
[10.261365] ERROR: Failed to open the serial port. [in 
custom_serial.c:69 (dc_serial_native_open)]

Segmentation fault (core dumped)

FEDORA 22:
===
[willem@localhost build]$ ./subsurface
pci id for fd 10: 80ee:beef, driver (null)
libGL error: core dri or dri2 extension not found
libGL error: failed to load driver: vboxvideo
Map theme file does not exist: ""
QInotifyFileSystemWatcherEngine::addPaths: inotify_add_watch failed: No 
such file or directory

QFSFileEngine::open: No file name specifie

Re: Bluetooth blues

[Willem Ferguson]

On 09/09/2015 16:56, Claudiu Olteanu wrote:

Hi there,

It seems that it doesn't use our custom implementation for the open 
method.

It should use *shearwater_common_custom_open *to open the device.
This means that your libdivecomputer version is incorrect or the
SSRF_CUSTOM_SERIAL wasn't cached correctly.

After commit [1] it shouldn't show the Bluetooth option if the 
SSRF_CUSTOM_SERIAL

macro is undefined.

Also the commit [2] should fix some problems with the Shearwater 
devices which lead to SEGV.


Let me know if you encounter the same problems using the latest 
versions of Subsurface and libdc.


Cheers,
Claudiu

[1] - 
https://github.com/torvalds/subsurface/commit/a0e33bec7116f6848c8fdc618ee1ef1e2641ecd9
[2] - 
http://git.subsurface-divelog.org/index.cgi?p=libdc.git;a=commit;h=8932b2a936a237284e0bffcea562c406551ab433


Claudio my SHA is pretty recent,  cb1aac0c4d9c, from this morning, it is 
the commit AFTER the commit of your patch a0e33be.
I will keep an eye on this. I am on my way to the USA right now, so I 
may possibly only get an opportunity to test again in a month's time. 
Sorry for that, but I will keep this pretty high on my priority list. I 
hope to be able to work with the latest daily builds while there.


Kind regards,
willem

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

[PATCH] user manual update: Location management

[Willem Ferguson]

Subject: [PATCH] [PATCH] User manual update: Location management

1) Add text to cover location management
2) Delete duplicate text for entering dives manually
   and entering dives from a dive computer. The sections dealing
   with location, cylinders, weights, and other items on the Info tab
   were duplicated for these two types of data entry into Subsurface.
   This duplication is now removed.

Signed-off-by: Willem Ferguson <willemfergu...@zoology.up.ac.za>
---


There are three issues with this patch:

1) I did not mention that I replaced five images to reflect the latest UI

2) DIRK, please look through the patch file carefully to see what makes 
sense. I did not change the Spanish translation at all. I am very scared 
of data corruption. If you would like me to do anything with this, 
please issue an instruction and I will oblige.


3) Please check the text about location management under data logging 
from a dive computer (should be point 5.2.4). It seems like a 
rediculously short explanation for a very labour intensive addition to 
the UI.


Kind regards,
willem

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

Re: Fwd: [PATCH] user manual update: Location management WITH attachment

[Willem Ferguson]

On 08/09/2015 21:26, Salvador Cuñat wrote:

Good evening.

2015-09-08 19:03 GMT+02:00 Dirk Hohndel <d...@hohndel.org 
<mailto:d...@hohndel.org>>:


On Tue, Sep 08, 2015 at 01:06:57PM +0200, Willem Ferguson wrote:
>
> 2) DIRK, please look through the patch file carefully to see
what makes
> sense. I did not change the Spanish translation at all. I am
very scared
> of data corruption. If you would like me to do anything with this,
> please issue an instruction and I will oblige.

Please, Willem, feel free to change wathever you think is convnient in 
the spanish manual.  I review it periodically, so if anything goes 
wrong we can fix it fast enough.
No, the commit somehow touched the Spanish translation. I did not change 
the Spanish. Wish I understood Spanish.




It would be nice to then go in and change the references to those
pictures
in the translations, but I'd say that's optional - as long as you
mention
this in the commit message I'm sure the translators will be happy
to track
this.

This should be unnecesary.  As far as I could see there are two 
different situations with the pictures, sometimes Willem changes the 
picture keeping the same file name, so no need to change the reference 
here; other times the file name changes and the reference needs to be 
updated.  No problem with this second situation, I update the 
translation in a git diff base, so I *usually* catch Willem's changes 
and update them on  the fly, and probably the other translators work 
in a similar way.  Most failures in pictures in user-manual_es that 
I've seen has been due to typos on my side or new lines breaking 
references.
What I do is to standardise on a fixed name but with a name end that 
reflects the OS on which the image was taken. Taking into account that 
we have standardised on Fedora/plasma, I think it is really unnecessary 
to have a file ending of _f22 since it actually does not have useful 
information with respect to Subsurface. Salva, do you have any 
suggestions about making it easier for you? I think the easiest is just 
not to change the file names.


Kind regards,
willem




Regards.

Salva.


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

Location management issues

[Willem Ferguson]

Tomaz,

I am busy with documentation of the location management infrastructure. 
two questions:


1) In the panel where one specifies the coordinates of a dive site there 
is a globe button on the right hand side of the coordinates text box. 
What is the function of that button? (see attached image)


2) On my Subsurface (SHA f3f4cf), if I double-click on marble to specify 
a location, the coordinates are indeed copied into the coordinates text 
box. However, the brownish message on marble does not disappear. (i.e. 
the message that says: "Move the map and double-click."). Is this a bug?


Kind regards,
willem



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

Re: Problems building Subsurface on Ubuntu and Fedora

[Willem Ferguson]

On 05/09/2015 18:35, Miika Turkia wrote:


cd subsurface/build
ccmake .

Make sure the Grantlee5_DIR variable points to correct locaiton. I
suppose LIBGRANTLEE_FROM_PKGCONFIG should also be OFF (or at least it
is on my build).

miika


Miika, Dirk, Tomaz,

I appreciate your time with me. Thanks. The problem was, as suggested 
above, that the Grantlee5_DIR variable was not set. Building ok now.


May I ask a very stupid question?
The variables like Grantlee5_DIR: are they Linux environmental variables 
or cmake variables? I ask this because I had to hardcode the location of 
the Grantlee configuration file into the CMakecache.txt file. I could 
not get it from Linux so that cmake could see the environmental 
variable. I used /etc/environment to set the variable but it looked like 
CMakeCache.txt did not see this setting.


Kind regards,
willem




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

Problems building Subsurface on Ubuntu and Fedora

[Willem Ferguson]

Dirk, Miika,

I cannot build the latest version (downloaded around 09h00 WCT, I assume 
it is SHA f9c32a58). I have identical symptoms on two independent 
machines (Fedora and Ubuntu).


I could build Subsurface reliably on Ubuntu at least until SHA 
2c4ae23ccc5d but it appears that something has changed, either with 
respect to dependencies or with respect to the cmake make file. 
Presently I get:


Linking CXX executable subsurface
/usr/bin/ld: cannot find -lGrantlee5::Templates
collect2: error: ld returned 1 exit status
CMakeFiles/subsurface.dir/build.make:285: recipe for target 'subsurface' 
failed

make[2]: *** [subsurface] Error 1
CMakeFiles/Makefile2:710: recipe for target 
'CMakeFiles/subsurface.dir/all' failed

make[1]: *** [CMakeFiles/subsurface.dir/all] Error 2
Makefile:126: recipe for target 'all' failed
make: *** [all] Error 2

Here are the grantlee shared objects in src/install-root/lib:

drwxr-xr-x 3 root root4096 Sep  5 16:24 grantlee
lrwxrwxrwx 1 root root  26 Sep  5 16:24 libGrantlee_Templates.so -> 
libGrantlee_Templates.so.5
lrwxrwxrwx 1 root root  30 Sep  5 16:24 libGrantlee_Templates.so.5 
-> libGrantlee_Templates.so.5.0.0

-rw-r--r-- 1 root root  606320 Sep  5 16:53 libGrantlee_Templates.so.5.0.0
lrwxrwxrwx 1 root root  29 Sep  5 16:24 libGrantlee_TextDocument.so 
-> libGrantlee_TextDocument.so.5
lrwxrwxrwx 1 root root  33 Sep  5 16:24 
libGrantlee_TextDocument.so.5 -> libGrantlee_TextDocument.so.5.0.0
-rw-r--r-- 1 root root  184184 Sep  5 16:24 
libGrantlee_TextDocument.so.5.0.0


and in src/install-root/lib/grantlee/5.0:

-rw-r--r-- 1 root root 216968 Sep  5 16:53 grantlee_defaultfilters.so
-rw-r--r-- 1 root root 293696 Sep  5 16:53 grantlee_defaulttags.so
-rw-r--r-- 1 root root 147952 Sep  5 16:53 grantlee_i18ntags.so
-rw-r--r-- 1 root root 103008 Sep  5 16:53 grantlee_loadertags.so

Miika, are you building normally?

I deleted the grantlee folder to have this rebuilt by build.sh, but this 
had no effect.  :-(((


The same resulted when performing a totally complete and new build from 
scratch in src.


Any ideas?

Kind regards,
willem



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

Fwd: Re: count down to Beta 1

[Willem Ferguson]

On 01/09/2015 07:58, Dirk Hohndel wrote:

Hi there,

So I think I have received all the fixes that I was waiting for. What's
left to do is testing and more testing. I am thinking of doing Beta 1
around the end of this week, assuming no show stoppers come up.

Tomaz did some more work on the dive site management, including adding a
way to merge dive sites with identical GPS locations. I'm thinking that it
might be neat to allow a slightly fuzzy search (like a 20m radius or
something), but that's really not a requirement, certainly not for Beta 1).

I also merged all the latest patches for the deco work, Grace's Android
updates and anything else that I saw pending.

If your patch isn't in yet, please resend because I missed it.

Here are the things that I'm aware of that we need to get done at some
point during the Beta cycle (but not necessarily for Beta 1)

- Uemis downloader. Guido is working on that code
- Printing. As usual, Miika can crash things in hard to reproduce ways
- Android app. This needs a good bit of UI love
- Documentation
- Translations


 Do not forget the installation of the final build of Subsurface into the
systems space. There is some contextual dependencies. Just moving the
executable from subsurface/build/ to a different directory destroys the
marble functionality on my machine.


For the translations it would be great if people could check for
consistency. Are all relevant strings marked for translation? Are we
following our guideline of capitalizing the first word and havinging the
rest lower case.

The documentation will in large chunks need to be written, proof-read,
translated. That's a HUGE pile of work. Mind you, I expect about 4-6 weeks
of beta cycle, so there is some time.


I will get to the manual during the next week.

Kind regards,
willem



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

Re: Fwd: Re: count down to Beta 1

[Willem Ferguson]

On 01/09/2015 15:15, Dirk Hohndel wrote:

On Tue, Sep 01, 2015 at 12:17:31PM +0200, Willem Ferguson wrote:

  Do not forget the installation of the final build of Subsurface into the
systems space. There is some contextual dependencies. Just moving the
executable from subsurface/build/ to a different directory destroys the
marble functionality on my machine.

Can you be more specific? Which OS?


Ubuntu



On Mac OS you simply move the Subsurface.app and this works
On Windows you need to build an installer
On Linux "make install" should do the right thing

willem:~/src$ sudo make install
make: *** No rule to make target 'install'.  Stop.

willem:~/src/subsurface$ sudo make install
make: *** No rule to make target 'install'.  Stop.

willem:~/src/subsurface/build$ sudo make install
[sudo] password for willem:
[  0%] Built target documentationLink
[  0%] Built target documentation
[  0%] Built target link_marble_data
[  0%] Built target printing_templatesLink
[  1%] Automatic moc and uic for target subsurface_statistics
AUTOGEN: warning: 
/home/willem/src/subsurface/qt-ui/statistics/yearstatistics.cpp: file is 
empty


AUTOGEN: warning: 
/home/willem/src/subsurface/qt-ui/statistics/statisticsbar.cpp: file is 
empty


AUTOGEN: warning: 
/home/willem/src/subsurface/qt-ui/statistics/monthstatistics.cpp: file 
is empty


[  1%] Built target subsurface_statistics_automoc
[  1%] Built target version
[  2%] Automatic moc and uic for target subsurface_generated_ui
[  2%] Built target subsurface_generated_ui_automoc
[ 18%] Built target subsurface_generated_ui
[ 20%] Built target subsurface_statistics
[ 20%] Automatic moc and uic for target subsurface
[ 20%] Built target subsurface_automoc
[ 20%] Automatic moc and uic for target subsurface_corelib
[ 20%] Built target subsurface_corelib_automoc
[ 45%] Built target subsurface_corelib
[ 46%] Automatic moc and uic for target subsurface_interface
[ 46%] Built target subsurface_interface_automoc
[ 66%] Built target subsurface_interface
[ 66%] Automatic moc and uic for target subsurface_models
[ 66%] Built target subsurface_models_automoc
[ 77%] Built target subsurface_models
[ 77%] Automatic moc and uic for target subsurface_profile
[ 77%] Built target subsurface_profile_automoc
[ 84%] Built target subsurface_profile
[ 87%] Built target subsurface
[ 87%] Built target themeLink
[100%] Built target translations
Install the project...
-- Install configuration: "Debug"
-- Up-to-date: /home/willem/src/install-root/share/subsurface/data/maps

...  ...  etc  etc

-- Up-to-date: /home/willem/src/install-root/bin/subsurface
willem:~/src/subsurface/build$

NOW:
If I now run Subsurface from the console (in my Home directory) and 
click Help -> About Subsurface

 I get V4.4.2 - 1330  (The last Ubuntu binary I downloaded some weeks ago)
Which certainly is not the binary I built from git (SHA g2c4ae23)

Ferguson's finger trouble? (quite possibly, he is quite known for that)

Kind regards,
wf

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

Re: at some point we need to release Subsurface 4.5

[Willem Ferguson]

On 17/08/2015 15:16, Dirk Hohndel wrote:

I've been saying this for a while now. But I'd like to actually try and
make this happen sooner rather than later...

So here's what I can remember of the top of my head...

Location management
===

The location management work turned into an utter disaster of many
attempts that no one liked but I think we are getting closer there. What's
missing before this is ready for actual users?

Davide, are you back? Henrik, any chance you can help provide a todo list
of what's needed before we can use this in a release? What I'm looking for
is a TODO list...


TODO:

I currently manage my dive sites by hand-editing the XML. At present, if 
I enter Times Square as a dive site and tell Subsurface to create a new 
site, it happily does so without also creating the coordinates. So, two 
things:

1) Allow coordinate selection from marble, as previously.
2) Allow text entry of coordinates as previously.

Currently, when I enter Times Square, it says create a dive site with 
a + to the right. If the + is chosen, then a panel should open as 
suggested in the *attached image*. If Enter coordinates from world map 
is chosen, then the orange bar at the top of the globe is activated, 
allowing a click on the globe to be saved. If text is used, there is a 
suitable text box. For me, it would mean a lot if there is a clear 
indication whether the text coordinates have (not) been accepted. 
Clicking the Apply or the Cancel button (or a click on the globe) closes 
the panel. I assume that import from the Companion Ap would follow the 
usual dialogue, not involved here. The above would be mostly the 
existing code base with minimal new programming.



User manual
===

That needs massive work for all the amazing features that we have added.
Willem, will you be able to do that?
Absolutely. I will be in the US from Sept 11-Oct 9th but I am available 
most of that time.

Once we have agreed on a feature set for the Android app, that needs a
separate user manual as well. Volunteers?

WHAT ELSE?
==

I'm sure there are other areas that I'm forgetting...

/D




A smaller addition is the work that Miika has put into reading text APD 
CCR dive log dumps into Subsurface.



Kind regards,
willem

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

Re: [PATCH] Parse erroneous sample time for MK6

[Willem Ferguson]

On 15/08/2015 13:57, Dirk Hohndel wrote:

On Wed, Aug 12, 2015 at 06:33:02PM +0300, Miika Turkia wrote:

Sometimes MKVI records sample time erroneously and we have to fix the
time. The 2 samples (from single DC) I have seen suffering this issue
can be corrected by subtracting 65528 from the sample time.

Fixes #916

Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
  file.c | 9 -
  1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/file.c b/file.c
index 8522b2e..5afc91c 100644
--- a/file.c
+++ b/file.c
@@ -651,7 +651,14 @@ int parse_txt_file(const char *filename, const char *csv)
has_setpoint = false;
has_ndl = false;
sample = prepare_sample(dc);
-   sample-time.seconds = cur_sampletime;
+
+   /*
+* Sometimes MKVI records sample time erroneously and we have to 
fix the
+* time. The 2 samples (from single DC) I have seen 
suffering this issue can
+* be corrected by subtracting 65528 from the sample 
time.
+*/
+
+   sample-time.seconds = cur_sampletime  65000 ? 
cur_sampletime - 65528 : cur_sampletime;

This looks so totally random to me... what happens when you consider these
as signed numbers. Do they make any sense then? So is the the MKVI somehow
recording a negative delta to signify something?

/D

Miika,
We need to consider the possibility that this not a bug, but a feature 
we have not come across yet. I say this because there are also now data 
codes 42 and 43 in the log, not seen before during code development. I 
will see if I can make contact with Søren Reinke who did most of the 
decoding of Poseidon. I suspect this is a software upgrade to also make 
provision for the Poseidon Se7en. It would be very helpful if Subsurface 
writes to stdout to indicate totally invalid time data in the file, 
possibly with line numbers in the log file.

Kind regards,
willem

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

Building Subsurface/libdivecomputer

[Willem Ferguson]

I want to ask a silly question on how to build Subsurface. Currently the 
only critical code required is the build.sh script that invokes git to 
check out pull whatever is required. Currently I pull the Subsurface 
repository to get the latest build.sh script. But I am sure there is a 
much more simple way to get hold of the script than invoking the git 
repository?


Secondly, it appears there may be a problem with the libdivecomputer 
repository?? I get (using Ubuntu 14.04):

Usrc/suunto_eonsteel_parser.c
Msrc/uwatec_smart_parser.c
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm file'
as appropriate to mark resolution, or use 'git commit -a'.
error: you need to resolve your current index first
include/libdivecomputer/shearwater_petrel.h: needs merge
src/suunto_eonsteel_parser.c: needs merge
can't check out the Subsurface-testing branch of libdivecomputer -- 
giving up


Is anyone getting a similar error message?
Kind regards,
willem


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

[PATCH] Add libcurl to the default library downloads for Debian/Ubuntu

[Willem Ferguson]

Subject: [PATCH 4/4] Add libcurl to the default library dowloads for
 debian/ubuntu

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za

From 8c19b961589c61d5829e5d2b6fedc85c49785d8d Mon Sep 17 00:00:00 2001
From: willem ferguson willemfergu...@zoology.up.ac.za
Date: Sat, 13 Jun 2015 07:33:13 +0200
Subject: [PATCH 4/4] Add libcurl to the default library dowloads for
 debian/ubuntu

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 INSTALL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/INSTALL b/INSTALL
index 192a542..fc6cd3e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -78,7 +78,7 @@ sudo apt-get install git g++ make autoconf libtool cmake pkg-config \
 	libusb-1.0-0-dev libgit2-dev \
 	qt5-default qt5-qmake qtchooser qttools5-dev-tools libqt5svg5-dev \
 	libqt5webkit5-dev libqt5qml5 libqt5quick5 libqt5declarative5 \
-	qtscript5-dev libssh2-1-dev qtpositioning5-dev
+	qtscript5-dev libssh2-1-dev qtpositioning5-dev libcurl4-openssl-dev
 
 On PCLinuxOS you appear to need the following packages
 
-- 
1.9.1

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

Re: Cloud storage

[Willem Ferguson]

On 10/06/2015 04:55, Dirk Hohndel wrote:

New dailies are up (only Mac is missing, still fighting a build problem
there). Besides a few fixes for importing GPS coordinates from the
Subsurface web service the big new change is the first early, early draft
of connecting to the cloud storage.

The back end is not running on my main server but on an AWS instance, just
in case I got something terribly wrong and it blows up. :-)

Here's the workflow:

Go to preferences and enter an email address and a password.
Those two items are securely transmitted to the cloud storage backend.
The server sends an email to the address you entered with a PIN number.
At the same time a new field shows up in the preferences to enter that
PIN. Once you do that (and hit Apply or Done) the storage pool for you is
created on the server.

Unfortunately you cannot store anything to it from Subsurface since we
don't have push support for remote git storage. But you should be able to
access it from the command line

Store things locally to a git repository with branch name as the email
address you provided earlier.
Go to that folder and do
git remote add cloud https://cloud.subsurface-divelog.org/git/your email
You should now be able to push to that remote.
git push cloud your email address

In theory Subsurface should be able to open that repository but when I
just tried it I realized that this appears to be broken. I need to dig
into this a bit more to figure out where it goes wrong.

As I said, very early code, but I figured I show people what I've been
working on for the last couple of weeks.

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

Dirk,

Regarding cloud access I am a bit confused with the workflow. Please 
explain in a bit more detail?


In the preferences panel, should I enter my own email address and an 
arbitrary password? The pin gets

sent to my own email address?
If this is so, where does one use ssrft...@hohndel.org and the password 
associated with that email address?

Kind regards,
willlem


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

cmake problem - libssh2

[Willem Ferguson]

During build:
-- checking for module 'libssh2'
--   package 'libssh2' not found

Any user action required?
Kind regards,
willem
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Re: cmake problem - libssh2

[Willem Ferguson]

On 11/06/2015 20:10, Tomaz Canabrava wrote:



On Thu, Jun 11, 2015 at 3:06 PM, Willem Ferguson 
willemfergu...@zoology.up.ac.za 
mailto:willemfergu...@zoology.up.ac.za wrote:


During build:
-- checking for module 'libssh2'
--   package 'libssh2' not found

Any user action required?


how did you tried to compile?
manually, via configure script?


Kind regards,
willem
___
subsurface mailing list
subsurface@subsurface-divelog.org
mailto:subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface



src  sh subsurface/scripts/build.sh
wf

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

Re: location management code

[Willem Ferguson]

On 08/06/2015 16:18, Dirk wrote:

We very much rely on the testers here on this list to take Subsurface
through its paces, to simulate your normal work flow and to help us
pinpoint the areas that we broke. I'm quite certain that there are still
a bunch of issues with the new location management code.


The lack of feedback is probably because location management is actually 
a workable tool now. I cannot crash it (SHA gd9801). I have tried adding 
coordinates by hand in several formats and it appears quite ok. I also 
added coordinates from Marble and it looks ok. All the coordinates are 
stored against the correct dives as far as I can see, no scrambling of 
coordinates. Tomaz you are fantastic. I also messed around with dive 
site coordinates, replacing the present dive site with another existing 
dive site. All appears ok. Thanks to the work by Robert and others there 
is now quite a bit of freedom in the way Subsurface accepts hand-entered 
coordinates. This really helps.


I have two gripes:
1) One needs a facility to check, and if necessary, edit the coordinates 
of a dive site. Once a dive site is successfully entered, there is no 
way to view, rename a site or edit the coordinates or to delete the dive 
site from the database. When cliking the + next to an existing dive 
site, it does not give the info for that dive site. It gives blank form.


2) Coordinates of the form 30.67°E 27.87°S are parsed as in the northern 
hemisphere. If they are entered in the form 30.67°S 27.87°E they are 
parsed correctly as being in the southern hemisphere. So order is 
important. I hope to do some diving a week from now and will test 
coordinate upload using the companion app.

Kind regards,
willem




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

Re: build script problem

[Willem Ferguson]

On 04/06/2015 18:38, Cristian Ionescu-Idbohrn wrote:

Now, really...  Why do you state that?  _That's_ silly.  `man 1 bash':

,
| BUGS
|   It's too big and too slow.
|
|   There are some subtle differences between bash and traditional
|   versions of sh, mostly because of the POSIX specification.
|
|   Aliases are confusing in some uses.
|
|   Shell builtin commands and functions are not stoppable/restartable.
|
|   Compound commands and command sequences of the form `a ; b ; c' are
|   not handled gracefully when process suspension is attempted.  When a
|   process is stopped, the shell immediately executes the next command
|   in the sequence. It suffices to place the sequence of commands between
|   parentheses to force it into a subshell, which may be stopped as a
|   unit.
|
|   Array variables may not (yet) be exported.
|
|   There may be only one active coprocess at a time.
`

You stuck bash on the shebang line.  Such error can only happen if
/bin/bash is a symlink to some other shell, I guess.  Is that the
case?


Cheers,

I have not quite managed to isolate this problem. It is some 
context-specific thing because all my other bash scripts that I tested 
run quite ok. I am not ruling out the possibility that this is an Ubuntu 
quirk. My Ubuntu is 14.04, a little aged and, as I indicated, I get some 
system error messages. Maybe time for update. Your discussion is 
interesting. Thanks.

Kind regards,
willem


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

build script problem

[Willem Ferguson]

I get this:

src$ sh subsurface/scripts/build.sh
exec 1 (tee build.log) 21
subsurface/scripts/build.sh: 21: subsurface/scripts/build.sh: Syntax 
error: redirection unexpected


Am I only half awake again? (Arrived from Tanzania at 3 am this morning, 
so only 2 brain cells firing)


Kind regards,
willem

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

Re: Dive Site Management

[Willem Ferguson]

Dirk, Tomaz,

When you feel that the dive site management interface is more or less 
finalised, please let me know?


I will go through it with a fine tooth comb. I do not want to send bug 
reports on small issues at the moment because I know you are actively 
working on that.


One question: The three buttons on the Manage panel (add, delete, 
penguin). What do they mean and how is one supposed to use them? I have 
a good idea but I need to get the real facts from you, rather than 
trusting my intuition. I suspect they are not yet active?


Kind regards,
willem

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

Fwd: Re: Dive Site Management - request for feedback

[Willem Ferguson]

   On 27/05/2015 05:35, Benjamin wrote:


The idea of a ( non editable? ) combobox on the info tab for
choosing the active dive site sounds like a simpler idea.
As it is now, I can't get the thing to work. I've resorted to
adding dives without a site and then adding the site id manually
in the XML file. Otherwise, no matter what I've tried, I simply
can't add a site.


On Wed, 27 May 2015 06:08 Tomaz Canabrava tcanabr...@kde.org
mailto:tcanabr...@kde.org wrote:

It's up to the discussion actually. Dirk wants it to do both
things, I think it should do just one thing ( manage the dive
site )  and that changing the dive site should be done on a
combobox in the info menu, or a mix of  both.




   I did quite a bit of testing with the new dive site management system.

   1) Define an existing dive site: Create a new dive, then type the
   first letter of a dive site in the dive site name field in the Notes
   panel (i.e. without opening Manage). A list of possible sites
   starting with that letter appears. I select a dive site and save the
   dive. Kein Problem überhaupt. Now, trying to define a new site:

   2) I create a new dive. The original blue message that said
   something like Move to the divespot and double-click the site is
   not there any more. If I double-click the dive spot on marble, then
   I get a segmentation fault.

   3) I create  a dive, then go to Manage, type the first letter of a
   dive site. Segmentation fault. On one or two occasions, no crash,
   but in  90% of attempts a crash. It it does not crash:

   4) Create a dive, open Manage, fill in dive site name. Blue bar
   appears on marble. double-click marble. Seg fault.

   5) I create a dive, open Manage, put cursor on coordinates field.
   Now the blue message appears on marble. I double-click marble.
   Segmentation fault.

   Looks like probably still not possible to add a new dive.

   I agree that if manage cannot be used to define the current dive
   site, then it should move outside of the Notes panel dealing with
   the present dive. But, big problem: to be honest, there is not a
   logical alternative place for this button within the Notes panel. So
   let's keep it where it is.

   Oh yes, SHA gc6783739

   Kind regards,
   willem


   Thanks, Benjamin.



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

Re: Subsurface ans Dropbox

[Willem Ferguson]

On 27/05/2015 17:26, Edi Anderson wrote:
Hi everybody, Tomas and i talked about the Subsurface and he suggested 
include the possibility of perform download and upload of files in 
dropbox. I will start today, some suggestion?.


It is so easy already, just drag the .xm dive log file into the dropbox 
folder. I do that regularly. What might pehaps be useful is a slightly 
more complicated facility that does auto-backup of the xml dive log onto 
dropbox, given a user-specified interval between backups. There are some 
security issues that would need to be thought through, though. It 
rudimentary to write a bash/rsync script to do exactly this if one 
already runs the dropbox application but it may be nice to have it built-in.

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

Re: Dive Site Management - request for feedback

[Willem Ferguson]

I have been messing around with the dive site facility quite a bit and I 
cannot manage to crash it :(. In general it is a bit rough round the 
edges but as far I can see, it is fully functional. I did the following 
type of dive records:
1) Adding dive and using an existing dive site from the Notes panel. 
Perfect.
2) Adding dive and adding location from marble from within the Notes 
panel. This automatically puts you into the dive site management panel 
where info is added which is then finally attributed to the present dive 
too. Pretty good. The blue bar at the top of the marble panel is a bit 
inconsistent in when it appears and when not.
3) Adding a dive, going straight into manage, adding  a dive site by 
clicking marble, save location and go back to Notes panel. Problem in 
that the newly created site is not always transfered to the Notes panel.
4) Adding a dive, going straight to manage, adding coordinates by 
typing, save location and go back to Notes panel. Looks ok.


There are two problems that I picked up.
a) After specifying a new site, sometimes the dive site of to topmost or 
second-from-top dive in the dive list gets changed to that of the 
newly-created dive site. Still workable if one knows about the problem, 
but inconvenient.
b) Sometimes a newly-created dive site is not immediately visible on the 
dropdown list of the dive site text box in the Notes tab. Can be a bit 
confusing.


In short, miles better than editing a huge xml file by text editor that 
always makes me very nervous. As far as I can see one can confidently 
add a new dive site from the GUI.


There are a few tiny things about consistency of ACCEPT or CANCEL 
buttons in the dive site manager panel, but that that can, I assume, 
easily be fixed up when all the other aspects of this has been 
completed. Tomaz and Dirk, you are wizards, I really mean this.


One question that I keep on forgetting to ask: The 3 buttons in the dive 
site manager (add, delete, penguin) are the functiona and how is one 
supposed to use them?

Kind regards,
willem



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

[PATCH] User manual: Bluetooth-based imports of dives.

[Willem Ferguson]

Subject: [PATCH] User manual: update section on Bluetooth

User manual: update section dealing with Bluetooth communication
to reflect Rick Walsh's recent contribution. Some editing of the text
was performed to conform to Manual style. This section looks MUCH better 
now.


Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---


From 9bb7ade613ecfc8acd53b87bcb0e060fdb904f2c Mon Sep 17 00:00:00 2001
From: willem ferguson willemfergu...@zoology.up.ac.za
Date: Sat, 23 May 2015 20:55:48 +0200
Subject: [PATCH] User manual: update section on Bluetooth

User manual: update section dealing with Bluetooth communication
to reflect Rick's recent contribution. Some editing of the text
was performed to conform to Manual style. This section looks MUCH better now.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 Documentation/user-manual.txt | 189 ++
 1 file changed, 154 insertions(+), 35 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index bcfb7d8..1a92921 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3469,12 +3469,12 @@ _Dive Log -  Upload Log_ and wait for the _Wait PC_ message.
 
  * *Pair the _Subsurface_ computer with the dive computer.*
 
-.On Windows:
+ On Windows:
 
 Bluetooth is most likely already enabled. For pairing with the dive computer choose
 _Control Panel -  Bluetooth Devices -  Add Wireless Device_.
-This should bring up a dialog showing your dive computer (in Bluetooth mode) and
-allowing pairing. Right click on it and choose _Propertie s-  COM
+This should bring up a dialog showing your dive computer (which should be in Bluetooth mode) and
+allowing pairing. Right click on it and choose _Properties-  COM 
 Ports_ to identify the port used for your dive computer. If there are several
 ports listed, use the one saying Outgoing instead of Incoming.
 
@@ -3484,7 +3484,7 @@ this COM port already. If not, enter it manually.
 Note: If there are issues afterwards when downloading from the dive computer using
 other software, remove the existing pairing with the dive computer.
 
-.On MacOS:
+ On MacOS:
 
 Click on the Bluetooth symbol in the menu bar and select _Set up
 Bluetooth Device..._. The dive computer should then show up in the list of devices. Select it and go
@@ -3494,48 +3494,163 @@ initial setup.
 Once the pairing is completed the correct device is shown in the
 'Device or Mount Point' drop-down in the _Subsurface_ *Import* dialog.
 
-.On Linux
+ On Linux
 Ensure Bluetooth is enabled on the _Subsurface_ computer.
 On most common distributions this should be true out of the box and
 pairing should be straight forward. For instance, Gnome3 shows a
-Bluetooth icon in the upper right corner of the desktop where one selects 'Set
-up New Device'. This should show a dialog where one can select the
-dive computer (which already should be in Bluetooth mode) and pair it.
-If a PIN is required, try manually setting ''.
+Bluetooth icon on the right of the toolbar at the top of the screen.
+Users have reported difficulties with some Bluetooth controllers.  If you have an onboard controller,
+try that first.  It is simplest if you remove any USB Bluetooth dongles.  If you have a USB dongle that 
+came with your dive computer, try that before any others.
+
+Setting up a connection to download dives from your Bluetooth-enabled device, such as the
+_Shearwater Petrel_, is not yet an automated process and will generally require the command prompt.
+It is essentially a three step process.
+
+ - Enable the Bluetooth controller and pair your dive computer/li
+ - Establish an RFCOMM connection
+ - Download the dives with Subsurface
+
+Ensure the dive computer is in upload mode. On the _Shearwater Petrel_ and _Petrel 2_,
+cycle through the menu, select 'Dive Log', then 'Upload Log'.  The display will read 'Initializing', then
+'Wait PC 3:00' and will countdown.  Once the connection is established, the display reads 'Wait CMD ...'
+and the countdown continues. When downloading the dive from Subsurface, the display reads 'Sending' then
+'Sent Dive'.
+
+To establish the connection, establish root access through +sudo+ or +su+. 
+The correct permission is required to download the dives in the computer. On most Linux systems this means becoming
+a member of the dialout group (This is identical as for many dive computers using a Linux USB port, descibed
+in the previous section). On the command terminal, enter:
+
++sudo usermod -a -G dialout username+
+
+Then log out and log in for the change to take effect.
+
+= Enabling the Bluetooth controller and pairing your dive computer
+
+Attempt to set up the Bluetooth controller and pair your dive computer using the graphical
+environment of the operating system. After setting the dive computer to upload mode, click the Bluetooth icon in the system tray
+and select 'Add new device'. The dive computer should

Re: Petrel 2 Download - user manual

[Willem Ferguson]

On 20/05/2015 13:40, Rick Walsh wrote:


Willem, there's now a solution/workaround that works for me, but
unfortunately it's a bit messy and I'm not sure if it will work the
same on other systems.  I'll play around a bit more, testing my
different bluetooth dongles (and onboard device) and perhaps different
distros.  I'll see if I can write something for the manual this
weekend or next week.

Thank you so much, Rick!

Rick


Rick, Anton,

I am trying to get to a more general description for the user manual 
that may cover Bluetooth in general. If you were prepared to think about 
this, I would greatly appreciate it.


The information in the user manual for connecting Bluetooth devices is 
virtually nonexistent. If you are prepared to briefly describe some 
general procedures of connecting DCs that use Bluetooth (I am only aware 
of OSTC and Shearwater). Are there some devices that connect easily? 
What about the other OSs (Win  Mac)? What would a 'standard' way of 
connection be on each OS? (I suspect there is no such thing as a 
'standard' way)  Is the procedure for connecting Shearwater similar to 
that of connecting OSTC? Are there similar problems with the OSTC?


You can give it to me in any way you wish to, telegram style is ok. I 
will try and reformat the info in terms closer to layman's language 
where possible and send it back to you for comment.


Kind regards,
willem

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

Re: Subsurface interface with libdivecomputer

[Willem Ferguson]

On 18/05/2015 15:31, Dirk Hohndel wrote:

On Mon, May 18, 2015 at 01:35:01PM +0200, Willem Ferguson wrote:

The gas changes from my galileo dive computer are not automatically read
into Subsurface. As far as I can see, gas changes are logged and
interpreted by libdivecomputer. For instance, there is a
parser_sample_event_t type of SAMPLE_EVENT_GASCHANGE in libdivecomputer. In
fact there is a general lack of dive events being transfered from dc to
Subsurface. Would Subsurface notice these events if they were within the
libdivecomputer memory structures or is this something that still needs
implementation on the Subsurface side?

We automatically read and interpret all events that libdivecomputer
decodes - so I'm not sure how what you are reporting would be possible.

Do you have access to that Galileo dive computer? Can you run the
universal tool from libdivecomputer to dump a libdivecomputer dive.xml
file? I'd be very surprised if that included a gas change event that
wasn't present in Subsurface after you imported the same dive directly
from Subsurface

/D

Dirk you are absolutely correct. I ran universal after your last mail, 
above, and the events are not shown in the xml, even though I see them 
clearly in the binary dump. So the problem is on the libdivecomputer 
side. At least I have eliminated Subsurface as the cause of the problem. 
I should have run universal earlier.

Kind regards,
willem

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

[PATCH] small changes to user manual

[Willem Ferguson]

A few small changes to the user manual:

1) Descriptions of main menu items.
2) Windows drivers for the galileo dive computer.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za

From f85543339d1d746607cc014b68ef2dc60d9c0c85 Mon Sep 17 00:00:00 2001
From: willem ferguson willemfergu...@zoology.up.ac.za
Date: Mon, 18 May 2015 15:38:37 +0200
Subject: [PATCH] A few small changes to the user manual:

1) Descriptions of main menu items.
2) Windows drivers for the galileo dive computer.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 Documentation/user-manual.txt | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 0e068f2..2aa5f92 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1643,7 +1643,7 @@ program only shows a small white dot where each photo should be on the dive prof
 In addition the _Photos_ tab only shows the file names of the photos. This is normal behaviour.
 If, later, the external drive with the photos is connected again, the photos can be seen in the normal way.
 
-[[Moving_images]]
+[[S_FindMovedImages]]
  Moving photographs among directories, hard disks or computers
 
 After a photograph has been loaded into _Subsurface_ and associated with a specific dive, the directory
@@ -3294,6 +3294,8 @@ dealing with the appropriate operations.
 - S_ExportLog,_Export_ -  Export the currently open dive logbook (or
   the selected dives in the logbook) to one of several formats.
 - S_PrintDivelog,_Print_ -  Print the currently open logbook.
+- S_FindMovedImages, _Find moved images_ - If photos taken during dives have been moved to
+  a different disk or directory, locate them and link them to the appropriate dives.
 - S_Preferences,_Preferences_ -  Set the _Subsurface_ preferences.
 - S_Configure,_Configure dive computer_ - Edit the configuration of a dive computer.
 - _Quit_ - Quit _Subsurface_.
@@ -3310,8 +3312,9 @@ dealing with the appropriate operations.
 
 === Log
 - S_EnterData,_Add Dive_ - Manually add a new dive to the *Dive List* panel.
+- _Edit dive_ - Edit a dive of which the profile was entered by hande and not from a dive computer.
 - S_DivePlanner,_Plan Dive_ - This feature allows the planning of dives.
-- S_Replan,_Re-plan dive_ - Edit a dive plan that has been saved into the *Dive List*.
+- S_Replan,_Edit dive in planner_ - Edit a dive plan that has been saved into the *Dive List*.
 - S_CopyComponents,_Copy dive components_ - By selecting this option, one can copy information
   from several fields of a dive log onto the clipboard.
 - _Paste dive components_ - Paste, into the selected dives in the *Dive List*,
@@ -3597,7 +3600,9 @@ dive computer and download dive information.
 
 Under Windows, a similar situation exists. Drivers for the MCS7780 are
 available from some Internet web sites e.g.
-http://www.drivers-download.com/Drv/MosChip/MCS7780/[www.drivers-download.com].
+http://www.drivers-download.com/Drv/MosChip/MCS7780/[www.drivers-download.com]. Windows-based IrDA
+drivers for the Uwatec can also be downloaded from the ScubaPro web site, drivers being located on
+the download page for the ScubaPro SmartTrak software.
 
 For the Apple Mac, IrDA communication via the MCS7780 link is not
 available for OSX 10.6 or higher.
-- 
1.9.1

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

Subsurface interface with libdivecomputer

[Willem Ferguson]

The gas changes from my galileo dive computer are not automatically read 
into Subsurface. As far as I can see, gas changes are logged and  
interpreted by libdivecomputer. For instance, there is a 
parser_sample_event_t type of SAMPLE_EVENT_GASCHANGE in libdivecomputer. 
In fact there is a general lack of dive events being transfered from dc 
to Subsurface. Would Subsurface notice these events if they were within 
the libdivecomputer memory structures or is this something that still 
needs implementation on the Subsurface side?

Kind regards,
willem


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

Re: tags and multi dive edit

[Willem Ferguson]

On 02/05/2015 23:08, Dirk Hohndel wrote:

I thought I had fixed this a while ago but I just had made it a little
less broken...
This morning I tried to figure out what semantics SHOULD be and then
implemented just that.

So you select multiple dives that have potentiall different tags. What
does it mean if you then edit the one dive that is shown? I figured the
most intuitive behavior would be this:
- if the user adds a tag to the existing tags of the displayed dive, then
   that tag should be added to the tags of all the selected dives
- if the user removes a tag from the existing tags of the displayed dive,
   then likelways that tag should be removed (if present) from the tags of
   all other selected dives

Two requests:
a) is that indeed the correct semantic for this operation?
b) could you test that what I implemented in master actually does this?

Thanks

/D

PS: daily builds are up for those who can't build from source...
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

I did some tests of this feature with the latest git master. (Ubuntu 14.04)

After selecting dives from a trip I added a tag. No problem it was added 
to all selected dives.
After selecting dives from a trip I deleted this new tag. No problem it 
was deleted from all selected dives.
After selecting dives from more than one trip, I added a tag. No problem 
it was added to all selected dives.
After selecting dives from more than one trip, I deleted a tag. No 
problem it was deleted from all selected dives.
After adding a tag that was not present in the displayed tag, but which 
existed in some of the other selected dives,

there was no duplication of tags.

The other fields with tag-like characteristics (dive master, buddy) did 
not work in this way at all. Behaviour was unpredictable.


Kind regards,
willem





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

OSTC Tools support

[Willem Ferguson]

When we say Subsurface supports OSTC Tools, what exactly does this mean? 
Is OTC Tools the regular download
software for OSTC? I see its divided into 3 parts with separate 
functions, some of it overlapping with Subsurface.


I am trying to figure out what should go into the user manual with 
respect to this topic.


Currently the only vaguely relevant text is in section 11 of the manual 
(Configuring your dive computer).


Is there anyone with an OSTC who can help?
Kind regards,
willem

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

Re: OSTC Tools support

[Willem Ferguson]

On 01/05/2015 19:44, Salvador Cuñat wrote:

Hi Willem.

2015-05-01 17:23 GMT+02:00 Willem Ferguson 
willemfergu...@zoology.up.ac.za 
mailto:willemfergu...@zoology.up.ac.za:


When we say Subsurface supports OSTC Tools, what exactly does this
mean? Is OTC Tools the regular download
software for OSTC? I see its divided into 3 parts with separate
functions, some of it overlapping with Subsurface.


OSTCTools is a set of tools windows based.  HW didn't developed 
software for their devices, except a little bootloader for firmware 
updates.   While Subsurface and other softwares which support OSTC 
devices tend to be universal, OSTCTools only supports OSTC computers.
One of the tools is used download dives from the computer and store 
them in individual files one dive per file.  It just do that, almost 
raw downloaded data,  no gear, no notes ...  It's not a true diving log.


What Subsurface does is just import this files into its own regular 
format, so a user can import to subsurface any dive he had previously 
downloaded with this software, but, off course, the user will need to 
add data to the import as the OSTCTools files only have computer 
related data.


In the manual, I think, this should only be mentioned as another file 
format supported for import with a warning about the information 
limitations, and, may be, a recomendation about selecting every file 
to import in a single operation instead of picking them one by one.


Is there anyone with an OSTC who can help?

Well, I'm proud owner of a OSTC-2N   };-)

If you want to try it,  there are two samples in the dives directory 
the *.dive files.


Regards.

Salva.


Salva,
Thank you for your kind response. I know nothing at all about the HW 
dive computers.


It looks like the OSTC2 has a miniUSB port. I would assume, with 
Subsurface, as with other dive computers, one selects Import - Import 
from dive computer. Then, in the download panel, one selects Heinrichs 
Weikamp and (in your case) OSTC 2N. I am not sure if Subsurface 
automatically sets the correct mount point. Then, If one selects 
Download, the profile is loaded into Subsurface. Until here, it is more 
or less the standard procedure with most dive computers. The profile is 
shown.


Now, if you say there are more than one file that needs downloading, 
exactly what do you mean? Are there many files, one for each dive? What 
do you mean by import in a single operation?. Or do you mean importing 
the dive files NOT from the OSTC2 but from a file on disk or some other 
media? When I import the sample file, there is no HW option in the 
dropdown list at the left bottom of the import dialogue. I need to 
select All file formats and then I can see the file and the import 
goes smoothly. The imported file has a lable Imported from OSCTS Tools.


A few specific questions:
1) I assume one can download dives directly from the OSTC without 
involving OSTC Tools. Is this correct?
2) Is it normal to import dives from OSTC Tools? It looks to me that the 
OSCTC tools route becomes relevant if one wants to import a whole dive 
log comprising many dives that were downloaded from the dive computer 
onto some other disk or computer. Is this correct?
3) Then I deduce that the OSTC Tools divelog on disk comprises mare than 
one file? Is this correct?
4) If so, do they represent different dives? Or do they represent 
different data (perhaps profile on one file, other dive information in 
another file?)
5) How does one tell Subsurface to load all the files in a single 
option? With a simple selection of several files in the file selection 
panel using Ctl-click or Shift-click?


I tried opening one of the OSTC dive logs with a text editor and it 
appears to be binary data. But it looks like Subsurface immediately 
recognises the file as OCTC.


We really need a OSTC item on the dropdown list of the file import panel.

I apologise I sound so really stupid, but I am not close to anyone with 
this equipment.

Kind regards, and thank you again for your time.
willem

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

[PATCH] User manual: recreational dive planning

[Willem Ferguson]

Resend of patch that appears to have gone missing.
Kind regards,
willem


 Forwarded Message 
Subject:[PATCH] User manual: recreational dive planning
Date:   Tue, 28 Apr 2015 10:29:16 +0200
From:   Willem Ferguson willemfergu...@zoology.up.ac.za
Reply-To:   willemfergu...@zoology.up.ac.za
Organization:   University of Pretoria
To: Subsurface Mailing List subsurface@subsurface-divelog.org



Add text to user manual: Recreational dive planning
One figure has been added

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za




From 06de96964ac734ad5cf0f804c6ca2dab666aeb0e Mon Sep 17 00:00:00 2001
From: willem ferguson willemfergu...@zoology.up.ac.za
Date: Tue, 28 Apr 2015 10:25:42 +0200
Subject: [PATCH 2/2] Add text to user manual: Recreational dive planning One
 figure has been added

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 Documentation/images/rec_diveplan.jpg | Bin 0 - 43447 bytes
 Documentation/user-manual.txt | 105 +++---
 2 files changed, 84 insertions(+), 21 deletions(-)
 create mode 100644 Documentation/images/rec_diveplan.jpg

diff --git a/Documentation/images/rec_diveplan.jpg b/Documentation/images/rec_diveplan.jpg
new file mode 100644
index ..c09a9c2b165a6bec8411c0d64db509ec1e20f5ca
GIT binary patch
literal 43447
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

Moving Subsurface photos between directories

[Willem Ferguson]

Robert,


Please look through the following paragraph for the user manual, will you?

Your system provides pretty sophisticated image management. None of the 
image management software that I use includes such automatic remapping 
of image locations. Its impressive.


Three suggestions to make the management of images using hash sums more 
smooth:


1) If I understand it correctly there is a problem in calculating hashes 
for each photo already associated with a dive in Subsurface. That is, to 
update the existing dive log so that all photos have valid hash sums in 
XML. It appears to me that, in order to do this, one has to force 
Subsurface to save a dive while the photos are shown for that dive. In 
large photo collections over large numbers of dives this may be a very 
tedious and somewhat risky job: Open each dive individually, Do some 
changes to dive details, save update for that dive. IF I AM CORRECT, I 
think there is a big need for a facility that determines whether a) 
there is an existing XML hash attribute for each image, b) if so, 
whether the XML hash sum for each image is a valid hash sum, c) if there 
is no hash sum or an invalid hash sum (e.g. ), then to calculate the 
hash sum for the image and write that into the XML.  Is my understanding 
of this correct? Because this is a once-of type of activity, such a 
facility should probably be activated by a command line option, not from 
within the GUI.


2) The option Hash images in the main menu is a bit cryptic for 
non-technical users. I would suggest Find moved images or something 
similar ??


3) Any way of reusing the same bottom blue bar shown while converting a 
XML dive log to the new XML format? Some type of visual feedback while 
doing the hash sum calculations and updating for all images is crucial.


Kind regards,
willem

[[Moving_images]]
 Moving photographs among directories, hard disks or computers

After a photograph has been loaded into _Subsurface_ and associated with 
a specific dive, the directory
 where the photo lies is stored, allowing _Subsurface_ to find the 
photograph when the dive is
 opened again. If the photo or the whole photo collection is moved to 
another drive or to a different
 machine, it is unlikely that the directory structure will remain 
identical to that of the original uploaded
 photo. When this happens, _Subsurface_ looks for the photos at their 
original location before they were moved,
 cannot find them and therefore cannot display them. Because, after 
moving photos, large numbers of photos
 may need to be deleted and re-imported from the new location, 
_Subsurface_ has a mechanism that eases the
 process of updating the directory information for each photo: 
automatic updates using fingerprints.


When a photo is loaded into _Subsurface_, a fingerprint for the image is 
calculated and stored with the
 other reference information for that photo. After moving a photo 
collection (that has already been loaded
 into _Subsurface_) to a different directory, disk or computer, 
_Subsurface_ can  perform the

 following steps:

- look through a particular directory (and all its subdirectories 
recursively) where photos have been moved

 to,

- calculate fingerprints for all photos in this directory, and

- if there is a match between a calculated fingerprint and the one 
originally calculated when a photo was
 loaded into _Subsurface_ (even if the original file name has changed), 
to automatically update the
 directory information so that _Subsurface_ can find the photo in the 
new moved directory.


This is achieved by selecting from the Main Menu: _File  -  Hash 
images_. This brings up a window within
 which the NEW directory of the photos needs to be specified. Select 
the appropriate directory and click
 the _Scan_ button towards the bottom right of the panel. The process 
may require several minutes to
 complete, after which _subsurface_ will show the appropriate 
photographs when a particular dive is opened.



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

[PATCH] User manual: recreational dive planning

[Willem Ferguson]

Add text to user manual: Recreational dive planning
One figure has been added

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za

From 06de96964ac734ad5cf0f804c6ca2dab666aeb0e Mon Sep 17 00:00:00 2001
From: willem ferguson willemfergu...@zoology.up.ac.za
Date: Tue, 28 Apr 2015 10:25:42 +0200
Subject: [PATCH 2/2] Add text to user manual: Recreational dive planning One
 figure has been added

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 Documentation/images/rec_diveplan.jpg | Bin 0 - 43447 bytes
 Documentation/user-manual.txt | 105 +++---
 2 files changed, 84 insertions(+), 21 deletions(-)
 create mode 100644 Documentation/images/rec_diveplan.jpg

diff --git a/Documentation/images/rec_diveplan.jpg b/Documentation/images/rec_diveplan.jpg
new file mode 100644
index ..c09a9c2b165a6bec8411c0d64db509ec1e20f5ca
GIT binary patch
literal 43447
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

[PATCH] Usermanual text dealing with dive list context menu

[Willem Ferguson]

Subject: [PATCH] Update of user manual text dealing with dive list 
context menu


As the title says above

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za

From d1be6b2b00f25f91121d5dcec634b35f6a7622ec Mon Sep 17 00:00:00 2001
From: willem ferguson willemfergu...@zoology.up.ac.za
Date: Sat, 25 Apr 2015 16:56:55 +0200
Subject: [PATCH] Update of user manual text dealing with dive list context
 menu

As the title says above

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 Documentation/user-manual.txt | 54 ++-
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 5bbb6ee..771960d 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -89,7 +89,7 @@ Start Using the Program
 ---
 
 The _Subsurface_ window is usually divided into four panels with a *Main
-Menu* (File Import Log View Filter Help) at the top of the window (for Windows
+Menu* (File Import Log View Help) at the top of the window (for Windows
 and Linux) or the top of the screen (for Mac and Ubuntu Unity). The four panels are:
 
 1. The *Dive List* to the bottom left containing a list of all the dives in the
@@ -2240,9 +2240,8 @@ during a dive is indicated on the right hand side of the above figure for a dive
 
 === The Dive List context menu
 
-Many actions within _Subsurface_ are dependent on a context menu used
-mostly to manipulate  groups of dives. The context menu is found by selecting
-a dive or a group of dives and then right-clicking.
+Several actions on either a single dive or a group of dives can be performed using the Dive List
+Context Menu, found by selecting either a single dive or a group of dives and then right-clicking.
 
 image::images/ContextMenu.jpg[Figure: Context Menu,align=center]
 
@@ -2280,12 +2279,17 @@ given a choice with respect to the lowest sequence number to be used.
 Completing this operation results in new sequence numbers (based on date/time)
 for the dives in the *Dive List* panel.
 
+One can also renumber a few selected dives in the dive list. Select the dives that
+need renumbering. Right-click on the selected list and use the Dive List Context Menu
+to perform the renumbering. A popup window appears requiring the user to specify
+the starting number for the renumbering process.
+
 [[S_Group]]
 === Grouping dives into trips and manipulating trips
 
 For regular divers, the dive list can rapidly become very long. _Subsurface_
 can group dives into _trips_. It performs this by grouping dives that have
-date/times that are not separated in time by more than two days, thus creating
+date/times not separated in time by more than two days, thus creating
 a single heading for each diving trip represented in the dive log. Below is an
 ungrouped dive list (*A*, on the left) as well as the corresponding grouped dive
 list comprising five dive trips (*B*, on the right):
@@ -2294,7 +2298,7 @@ image::images/Group2.jpg[Figure: Grouping dives,align=center]
 
 Grouping into trips allows a rapid way of accessing individual dives without
 having to scan a long lists of dives. In order to group the dives in a dive list,
-(from the Main Menu) users must select _Log -  Autogroup_. The *Dive List* panel
+(from the Main Menu) select _Log -  Autogroup_. The *Dive List* panel
 now shows only the titles for the trips.
 
  Editing the title and associated information for a particular trip
@@ -2319,16 +2323,16 @@ the selected trip, revealing the individual dives performed during the trip.
 
  Collapsing or expanding dive information for different trips
 
-If a user right-clicks after selecting a particular trip in the dive list, the
-resulting context menu allows several possibilities to expand or collapse dives
+After selecting a particular trip in the dive list, the
+context menu allows several possibilities to expand or collapse dives
 within trips. This includes expanding all trips, collapsing all trips and
 collapsing all trips except the selected one.
 
  Merging dives from more than one trip into a single trip
 
-By right-clicking on a selected trip title in the *Dive List* panel, a
-context menu shows up that allows the merging of trips by either merging of the selected trip
-with the trip below or with the trip above.
+After selecting a trip title, the context menu allows the merging
+of trips by either merging the selected trip with the trip below or with the
+trip above.(Merge trip with trip below; Merge trip with trip above)
 
  Splitting a single trip into more than one trip
 
@@ -2358,16 +2362,14 @@ calibration dives of the dive computer or dives of extremely short duration.
 Users can unlink dives from the trip to which they belong. In order to do this,
 select and right-click
 the relevant dives to bring up the context menu. Then select the option *Remove dive(s)
-from trip*. The dive(s) now appear immediately

Adding images from the Internet

[Willem Ferguson]

Robert,

When adding images from the Internet, what type of images can be added 
(GIF? TIF?). I suspect this is OS-dependent depending on viewer(s) 
available?


Are the metadata checked (if available) for date-time consistency?

I suspect Internet-based images can only be added one image at a time 
and one dive at a time? What happens when more than one dive are selected?


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

[PATCH] Modify wording of dive list context menu

[Willem Ferguson]

Subject: [PATCH] Modify wording of dive list context menu

Dive context menu:
After the addition of the item Add image(s) from web the item
immediately above is Add images. It is proper to specify now:
Add image(s) from file(s) to make the distinction clear. I also
change Shift times to Shift dive times.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za

From 35b0a4e6a1981d83b1cba2024f1cb09c0d537291 Mon Sep 17 00:00:00 2001
From: willem ferguson willemfergu...@zoology.up.ac.za
Date: Sat, 25 Apr 2015 13:08:16 +0200
Subject: [PATCH] Modify wording of dive list context menu

Dive context menu:
After the addition of the item Add image(s) from web the item
immediately above is Add images. It is proper to specify now:
Add image(s) from file(s) to make the distinction clear. I also
change Shift times to Shift dive times.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 qt-ui/divelistview.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
index fda170c..93454dd 100644
--- a/qt-ui/divelistview.cpp
+++ b/qt-ui/divelistview.cpp
@@ -836,8 +836,8 @@ void DiveListView::contextMenuEvent(QContextMenuEvent *event)
 		popup.addAction(tr(Merge selected dives), this, SLOT(mergeDives()));
 	if (amount_selected = 1) {
 		popup.addAction(tr(Renumber dive(s)), this, SLOT(renumberDives()));
-		popup.addAction(tr(Shift times), this, SLOT(shiftTimes()));
-		popup.addAction(tr(Load images), this, SLOT(loadImages()));
+		popup.addAction(tr(Shift dive times), this, SLOT(shiftTimes()));
+		popup.addAction(tr(Load image(s) from file(s)), this, SLOT(loadImages()));
 		popup.addAction(tr(Load image(s) from web), this, SLOT(loadWebImages()));
 	}
 
-- 
1.9.1

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

User manual changes for 4.5

[Willem Ferguson]

I will fix up the manual this week end. I need to know what the final 
configuration of the manual will be like. Can I assume that the 
directory structure will be as previously, i.e. more or less as follows?


Documentation directory containing usermanual.txt
Images
Icons

This means the Documentation folder in the build directory is not 
relevant for building the user manual ?? But where do the HTM user 
manuals in build/Documentation get their images from? I probably sound 
brainless but I do not yet totally understand the process.


On the other hand if there are changes, then the URLs to images within 
the user-manual need to point somewhere else, so this is an important 
thing to know about.


Also, if there are any new developments with respect to location 
coordinate handling, please make it explicit to me?? At the moment it is 
just the actions associated with selecting the manage button under the 
Location heading. If there is anything that I may overlook, I would 
appreciate being reminded.


The other issue is recreational dive planning. Robert are you prepared 
at all to give me some telegram-style comments on rec planning that may 
not be overtly obvious?


Kind regards,
willem

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

cmake and user manual

[Willem Ferguson]

I see that there is a bit of work to be done with the with respect to 
the user manual after using cmake. Currently the Build/Documentation 
directory containd html versions of the user manual but does not include 
the appropriate subdirectories containing the icons and images used in 
the user manual. Also, the existing directory system is a bit different 
from that of what it was for the different language versions. On the 
other hand, the src/subsurface/Documentation folder contains all the 
goodies to build a manual. I assume the html output of this make process 
goes to src/subsurface/build/Documentation? Also, as far as I can 
remember, the icons were not in a subdirectory of the images directory.


Once a full build is done, where should the final executable reside? I 
have previously often used an official release or some dot version for 
the system installation and kept experimental builds in a 
home/subsurface directory. I assume that I would now keep experimental 
builds in src/subsurface/build?? The final location of the executable 
will determine where the documentation lies, I suppose.


Does the present build also do a system installation of the software?

Kind regards,
willem




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

Re: cmake of Subsurface: link errors

[Willem Ferguson]

On 20/04/2015 22:15, Tomaz Canabrava wrote:



On Mon, Apr 20, 2015 at 4:53 PM, Willem Ferguson 
willemfergu...@zoology.up.ac.za 
mailto:willemfergu...@zoology.up.ac.za wrote:



Thanks very much to those who commented to help me get Subsurface to
build on Ubuntu.

My build g82ff9f does not show marble. Is this normal? If I select
View-All it does not show all.


not normail.
can you look at cmakecache.txt to see if NO_MARBLE was set to true?


Kind regards,
willem



Thank you, Tomaz.
Here is the reason:

//The directory containing a CMake configuration file for MARBLE.
MARBLE_DIR:PATH=MARBLE_DIR-NOTFOUND

//disable the marble widget
NO_MARBLE:BOOL=OFF

I have no idea how to react to this.
Kind regards,
willem

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

Re: cmake of Subsurface: link errors

[Willem Ferguson]

On 19/04/2015 22:08, Robert C. Helling wrote:

Willem,

On 19 Apr 2015, at 20:24, Willem Ferguson 
willemfergu...@zoology.up.ac.za 
mailto:willemfergu...@zoology.up.ac.za wrote:


Anything I could do now?
I know there is currently a lot of activity to get the build to run 
smoothly.


with git grep I get the impression this is once more a problem with 
the version of libgit2 (has to be quite recent). I would have thought 
the build script does download that but I would investigate the 
version installed on your system.


Best
Robert

I had libgit2 v0.19 in my system and v0.22 in the src directory. I 
removed v0.19 from the system, leaving only the version in the src 
directory.


It aborts two steps earlier in the process with a slightly different 
error message. Looks like libgit2 is a real obstacle.


[ 23%] Built target subsurface_corelib
make[2]: *** No rule to make target 
`/usr/lib/x86_64-linux-gnu/libgit2.a', needed by `TestGpsCoords'. Stop.

make[1]: *** [CMakeFiles/TestGpsCoords.dir/all] Error 2
make: *** [all] Error 2
willem@dive:~/src$

I am not clear on what build.sh does with libigit2. I would have 
expected that the install instruction (line 55 in build.sh) installs 
libgit2 in the appropriate system folder. But a locate command on 
libgit2 on my machine now only shows files in the home/src directory, 
not in /lib/ or a similar directory. From what I can see from the error 
message, the make process aborts while trying to make use of libgit2 to 
build Subsurface. This means that a valid object file for libgit2 exists??


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

Re: cmake of Subsurface: link errors

[Willem Ferguson]

Thanks very much to those who commented to help me get Subsurface to
build on Ubuntu.

My build g82ff9f does not show marble. Is this normal? If I select
View-All it does not show all.
Kind regards,
willem



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

Re: dive profile points

[Willem Ferguson]

On 12/03/2015 08:39, Miika Turkia wrote:
On Thu, Mar 12, 2015 at 12:25 AM, Lubomir I. Ivanov 
neolit...@gmail.com mailto:neolit...@gmail.com wrote:


hey Miika,


The bug was not really deterministic. When moving a divepoint around 
and releasing it, it was occationally possible to drop the point so it 
was not on the profile. Bug 784 might give a better idea of how to 
reproduce, even though it was not that obvious.



miika


Here is a procedure for replicating this reliably on my linux box.
1) Add-dive This gives last part of default profile as in attached 
image: initial.png.
2) Slowly drag the last point og the bottom section of the profile to 
the right, past the end of the profile. Point separates from profile. 
See attached image: outsidepoint.png. Now there are 3 points towards the 
right end of the bottom section of the profile
3) Delete the leftmost of the above three points. It disappears. See 
image: delete_1.png.
4) Now delete the middle of the original 3 points. It disappears, but 
point #1 that has been deleted re-appears. See delete_2.png

One can go on ad infinitum trying to delete these points.

Another issue that may be important: In the dive profile at the top 
lefthand corner is what appears to be a point. See origin.png. I cannot 
drag it. What gives?


I am so glad this issue is addressed now because this is exactly the 
sort of stuff that strongly discourages a first-time user of Subsurface.

Kind regards,
willem





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

HTML export patches

[Willem Ferguson]

Gehad,
As far as I can see all three of the patches on the HTML export work 100%.
Thank you so much for your time.
Kind regards,
willem

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

Re: Images with HTML export

[Willem Ferguson]

On 11/03/2015 11:47, Gehad Elrobey wrote:

On Sat, Feb 28, 2015 at 11:29 AM, Willem Ferguson
willemfergu...@zoology.up.ac.za wrote:

Gehad,

I cannot get the HTML export NOT to export the photos with the HTML. Here is
the link to the HTML export of a single dive.

https://www.dropbox.com/sh/0o2x4t5me8d5lit/AACWLDiwtEueDRuKGb6dlmQ9a?dl=0

The toolbar button that enables showing images in Subsurface has been
switched off.
The external drive containing the photos has been disconnected from the
computer (as in detached from the desktop, the USB plug pulled out and
Subsurface restarted).

The export still shows the images, even though the images are, of course,
empty.

Sorry I think I have missed this mail.
So there must be an option in the export menu to select whether to
export photos or not, right?

and also must check if the photos exist before viewing the corrupted links.


Gehad,
Your suggestion is probably the best solution.
You are doing excellent work, thank you very much.
Kind regards,
willem

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

[PATCH 2/2] Ticket #831 Fix

[Willem Ferguson]

Dirk and Tomaz,
How easy would it be to implement reordering the cylinders in the
equipment tab after they have been copy-and- pasted from another dive,
that is, without having to delete and re-type all the information for a
cylinder? The present setup is not very user-friendly for divers using
more than one cylinder because a cylinder is always added at the end of
the list. So if cylinder position is important, one often has to erase
all but one of the existing cylinders and manually re-do the remaining
cylinders.
Kind regards,
willem


On 10/03/2015 11:19, Davide DB wrote:

On Tue, Mar 10, 2015 at 6:52 AM, Joakim Bygdell j.bygd...@gmail.com wrote:

The default cylinder setup is more suited to people that do not dive the way 
you do, since the way you describe it you rarely start a dive on backgas.
It's just a way to make it convenient for people that doesn't have as complex 
setup.

I see, but I'm nearly sure that the whole procedure was ok until few
releases ago.
I remeber Dirk had a brilliant idea and modified how the cylinder table works.
Maybe the introduction of the tank index put some strict constraints
again or maybe I was doing exactly the same sequence each time. Now
that I have convinced several friends to use Subsurface, my phone
keeps ringing and ringing :)


In my above example:

I made a formal gas change at the surface switching to a 35/25
At 30m I switched to my bottom mix: 16/60 on a AL80 [**]
Deco was performed on 35/25, 50/20 and 100%
My backgas was a D8,5L on 16/60 (that is set as default tank in
Subsurface). It's my bailout reserve, my main tank.

[**] I could have more f this.

Should I remove the default cylinder to be able to switch at 0@0?
If I had a proper DC managing all of this and I forget to press a
button, could I fix all of this later? Hummm

When you set up the cylinders for that dive make sure that the one you start 
with are the first gas in the list, the order of the other mixes is not as 
important.

At the start of the dive subsurface will implicit start you on 35/25 as that is 
the first gas in the list.
You can then do gas switches at the appropriate time points during the dive.

If you do this, is it something that is wrong in the way the dive is presented 
to you?

I have to try.
The gas change at 0@0 was suggested here to overcome the default cylinder.
I should completely remove default cylinder. Its' a shame. Default
cylinder along copy-paste are two useful tools to speed-up logging
operations.
When I get stuck in some dead, usually I directly edit the xml file
but two friends of mine who are Subsurface new adopter were caught
immediately into the current gas is in use... dead end without being
able to solve it.
Copy-paste was a Linus brilliant idea to avoid inserting each dive all
the tanks. Others (like me) suggested having predefined cylinder sets
saved into user preferences but this solution implied a whole new UI
and Linus solution it simple and effective.
Currently it become a dangerous option because if you copy-paste a
slightly different tank set your gas changes will likely get screwed
up mainly because the cylinder index get copy-pasted too.

Why it's compulsory to have a cylinder into the cylinder table?
___
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

Uwatec Smartrak dive log decoding

[Willem Ferguson]

On 10/03/2015 21:36, Salvador Cuñat wrote:

  I have a quite functional parser for SmartTrak files.
Do you still have access to your friend's divelog?  It would be great 
to test it, as all my dives in smarttrak are imported and I only have 
the example file shipped with Uwatek's app.
I don't know if this parser will do into master (because of its 
dependencies) but, at least, your friend may have his dives imported 
to Subsurface.


Regards

Salva.


Salva,
I have been working with Galileo logs lately. In which ways do the 
SmartTrak dive logs differ from the raw binary logs downloaded from the 
Uwatec DC?  I can reasonable easily get SmartTrak logs for you but I 
suspect that this is not what you are wanting? In particular, I am 
interested in the way that the Uwatec events are handled in Smartrac.

Kind regards,
willem


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

Re: Galileo Sol dive log decoding.

[Willem Ferguson]

On 09/03/2015 17:19, Jef Driesen wrote:

On 2015-03-09 14:24, Willem Ferguson wrote:

I am currently working with dive logs of the Galileo. I am looking at
the events during the dive.


Are you talking about direct downloading from the dive computer, or 
importing from the Uwatec application?
I am talking of the directly downloaded files I presume: those saved as 
subsurface.bin. Am I right?
Certainly the links you refer to below are helpful in decoding these. I 
will do controlled dives with a
Galileo,  generating events in a planned way, then download the dives as 
subsurface.bin and decode them to
see the way the events were recorded. I have written software to do the 
decoding and I think it is quite
sufficient for these purposes. I have a reasonable understanding of the 
dive structure and the way flags and
events are implemented. I can read any arbitrary dive within the whole 
downloaded dive log.

At least, that is my general plan of action.



The following events are recorded:
a) Several alarms, e.g rapid acscent, MOD alarm, excessive workload,
CNS overload, missed deco stop, RBT exceeded. Some of these have a
second marker for resetting the alarm (e.g. MOD; ascent rate).
b) Events such as gas change and bookmarks.

1) Which of these are handled by libdivecomputer and can therefore be
handles in Subsurface? This will determine which ones I will
specifically look at.


Have a look at the libdivecomputer parser_sample_event_t enum. It 
lists all the events that are supported today. Note that the current 
events were modeled after the Suunto event model. This will be 
reworked significantly after the v0.5 release, and not all events will 
be kept (especially the Suunto specific ones).


Thanks. This is very helpful.



2) I would prefer just providing the dive log details for
implementation, for instance this is how gas changes are recorded
into the dive log Would this be workable for you at all?


Sure. If you're going to reverse engineer the data, you'll be 
interested in these pages:


http://diversity.sourceforge.net/uwatec_smart_format.html
http://diversity.sourceforge.net/uwatec_galileo_format.html



Thanks, I am in contact with Simon Naunton.
Assuming I uncover something useful, I will document this in the 
libdivecomputer wiki,

as well as on Simon's existing web page.

They are lacking in a few areas, but as a starting point they are 
still a good reference.


BTW, you can always document your findings on the libdivecomputer wiki.

Jef
___
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

Re: Notification Patches.

[Willem Ferguson]

On 27/02/2015 08:20, Dirk Hohndel wrote:

On Fri, Feb 27, 2015 at 03:53:24AM +0200, Gehad Elrobey wrote:

Exporting big xslt files may need some time, so showing notifications with
the exporting condition is important.

Yes.


I used the main error message bar for showing exporting updates (which can
be a little bit confusing as updates are not errors) so I added the
notification object to the main window which handles the errors and updates.

I like this. And the blue vs. red works in my mind.


Dirk, Please review the code and tell me what do you think.

Didn't find anything glaringly wrong. The last commit could have been
merged with the earlier one, but that's not really a problem.

I have to read up on the QFutureWatcher stuff - I'm not sure I understand
sufficiently how it works, but I tested the patches and am happy so far.

Thanks

/D

Any possibility of using this mechanism to notify a user when the dive 
site data of the old dive log format is being converted to the new 
format? This often takes some time to complete.

Kind regards,
willem

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

partial pressures variables code cleanup

[Willem Ferguson]

Robert,

I would appreciate some advice from you.

1) The pressures structure contains a member for the partial pressure of 
each of the three possible gases (o2,n2,he). At present these members 
are defined as double.
If one could change their type to o2pressure_t (this is really an int16 
in units of mbar) then one could use constructs such as 
pressures.o2.mbar, consistent with usage throughout much of the existing 
code base. o2pressure_t has a maximum value around 65 bar, thus I do not 
think any of the pressures members will have magnitudes that exceed the 
max size of o2pressure_t. Comments, please?


2) The variable plot_info-o2pressure is really a left-over from before 
you created the pressures structure. Is there a case to be made to get 
rid of this variable, since its function has been replaced by the 
pressures structures?


Kind regards,
willem


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

Fixing HTML export

[Willem Ferguson]

Dear Gehad,

I have a few requests about the HTML export that I would appreciate if 
you would be prepared to check out??


First terminology. The HTML export has three way of looking at dives:
a) List view. This is when the dive list is shown with a few details of 
each dive.
b) Short view. This is when one selects one of the dives from the dive 
list. It shows more details for a particular dive.
c) Long view. This is when the link at the bottom of the short view is 
selected, enabling the graphics of the dive profile, and much more info 
about the dive.


Two bugs:
1) In the long view, under Dive equipment the start pressure of the 
cylinder is given as zero. This should be the correct value of the 
cylinder pressure at the start of the dive.
2) I do some trimix dives. In the Long view under Dive equipment, only 
the oxygen is shown for the trimix cylinder. There is no indication of 
helium fraction.


A request:
Would it be possible to show Max. Depth in the Short view as well as in 
the Long view, just above Duration ?

I hope you don't mind me copying this to the discussion forum?

Kind regards,
willem

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

Help with QtCreator

[Willem Ferguson]

I get the following unresolved symbols when I build Subsurface using 
QtCreator:



/home/willem/build-subsurface-Desktop_Qt_5_4_0_GCC_64bit-Debug/../subsurface/qt-ui/globe.cpp:192: 
undefined reference to `Marble::MarbleWidget::model()'


/home/willem/build-subsurface-Desktop_Qt_5_4_0_GCC_64bit-Debug/../subsurface/qt-ui/globe.cpp:233: 
undefined reference to `Marble::MarbleWidget::model()'


.obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x60): 
undefined reference to `Marble::MarbleWidget::connectNotify(QMetaMethod 
const)'


.obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x68): 
undefined reference to 
`Marble::MarbleWidget::disconnectNotify(QMetaMethod const)'


collect2: error: ld returned 1 exit status


Has anything changed with respect to marble?  When I build a new 
Subsurface by hand, I use the following form of qmake:


qmake SPECIAL_MARBLE_PREFIX=1

However, when I build using QtCreator, I cannot use this option. My 
suspicion is that this is my problem.


Advice, please !
Kind regards,
willem


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

Problems building from git on Ubuntu

[Willem Ferguson]

I use Ubuntu 14.4 and encounter a problem when building from git master 
AND when dowloading the latest Ubuntu package. Identical symptoms.


Program starts up with no dive log and is largely unresponsive. When 
opening a dive log listed under the File option of the main menu, 
nothing happens. When open a log book or start a new log book, program 
freezes and eventually terminates with a segfault.


Then I tried getting some information about the problem using 
Qt-creator. However, when I attempt a build of the code under 
Qt-creator, I get a compile error:


/home/willem/subsurface/qthelper.cpp:15: error: QStandardPaths: No such 
file or directory

 #include QStandardPaths

My Qt version is 5.2.1

Has anything else changed?
Kind regards,
willem

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

Re: [libgit2] Compile issue on debian-unstable

[Willem Ferguson]

On 19/02/2015 07:02, Miika Turkia wrote:



   As supossed, I had a v0.20.0  version built from scratch overlaped
   with the debian package. Cleaned it and the macro worked fine as
   debian version (v0.21.3) has three parameters defined .

   I think the wrapper was set to support three parameters because
   v0.21 (at least the one packaged in debian) had only those 3 and
   fourth was introduced  later.  But agree with you  3 completely
   different versions of the same library function in less than a  year
   is a mess  (saying it smooth and politely).

On Ubuntu Utopic (14.10) I also have the problem with only 1 parameter 
for git_remote _fetch

#define LIBGIT2_VERSION 0.20.0

I use the attached patch on my tree, but never sent it out as I have 
no clue about how the libgit versioning/API works.


miika

I was away for two weeks and got out of touch with respect to the mess 
with libgit2. I run Ubuntu 14.4 and the default version of libgit-dev is 
V19.
Does the latest Subsurface master run with libgit2 V19? The first #if in 
that file appears to provide for this


#if !LIBGIT2_VER_MAJOR  LIBGIT2_VER_MINOR = 20

but I get make errors as discussed previously on this forum. Upon
applying Miika's patch (above, to git-access.c), I get the following:

.obj/git-access.o: In function `is_git_repository':
git-access.c:(.text+0x327): undefined reference to `git_remote_fetch'

Is there a sane solution for Debian/Ubuntu?
Kind regards,
willem

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

Re: DM3 import

[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 http://divelogs.de? 
A bit more info in 
https://groups.google.com/forum/#!category-topic/subsurface-divelog/ccUACNKv6AQ 
https://groups.google.com/forum/#%21category-topic/subsurface-divelog/ccUACNKv6AQ


Of course, the SDE import is still an option, but the cylinder 
pressures are lost that way, so importing via divelogs.de 
http://divelogs.de is the preferred way, I guess. (Unless the user 
is not willing to upload the logs to the Internet.)


miika


Will check it out and do something.

At this stage I just want to give the translators a chance to catch up. 
If you look at the French,
Spanish and Russian translations, you will see they are not quite up to 
date yet. So I am trying to
create a bit of a lull in my own user-manual updates for V4.4.1 
otherwise I make it

quite difficult for the translators.

But I will see your DM3 request is there in the next user-manual update 
I submit.

Kind regards,
willem

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

[PATCH] Update user-manual images

[Willem Ferguson]

Subject: [PATCH 3/3] Update screenshots for user-manual

We want to get rid of the dreaded red line.
This gets rid of some of the last Ubuntu screenshots.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 Documentation/images/DiveProfile1_f20.jpg | Bin 41818 - 30915 bytes
 Documentation/images/DiveProfile2_f20.jpg | Bin 26109 - 19170 bytes
 Documentation/images/DiveProfile3_f20.jpg | Bin 3570 - 6425 bytes
 Documentation/images/DiveProfile4_f20.jpg | Bin 28791 - 25220 bytes
 Documentation/images/InfoBox2.jpg | Bin 78927 - 67631 bytes
 Documentation/images/LoadImage4_f20.jpg   | Bin 48657 - 49652 bytes
 Documentation/images/LoadImage5_f20.jpg   | Bin 48583 - 51963 bytes
 Documentation/images/LoadImage6_f20.jpg   | Bin 65603 - 64307 bytes
 Documentation/images/MeasuringBar.png | Bin 64903 - 82764 bytes
 Documentation/images/Profile2.jpg | Bin 45884 - 43452 bytes
 10 files changed, 0 insertions(+), 0 deletions(-)


IMPORTANT. This patch does NOT affect any of the translations of the 
manual.


All the image names were kept as they were before, so the translated manual
should come out with the new images correctly.


The original patch with images was sent directly to Dirk.
Kind regards,
willem

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

Re: GSoC 2015

[Willem Ferguson]

On 04/02/2015 21:01, Dirk Hohndel wrote:

So here are some ideas that I have seen...

- more flexible print formatting
   Something template based that the user can modify

- unit testing
   We have a start, but this needs a lot more work

- asset management
   Ability to manage all the equipment that a diver has with them on a
   dive, including grouping, tracking weights, etc

- more work on the Android full Subsurface
   Implement useful dialogs with QML or QtWidgets. NOT build a new UI, but
   tune the existing UI to be more Android/touch friendly

- adding integration with more online logbooks
   There are several more out there that have an API


What else?

/D
___
s
I have been using the HTML dive log export quite a lot lately to have my 
log handy on my phone when dive companies want to see my log. It is a 
really useful tool but it still needs lots of development. For starters 
it currently never gives the max depth of a dive. The basic dive list 
should contain the max depth and dive duration, the temperatures 
(currently shown) are less important. The presentation of the dive 
profile is totally inconsistent. Sometimes it gives the pressure of the 
cylinder, other times not, I think only when the cylinder pressure is 
measured my a transmitter. This is not very useful for the bulk of the 
recreational folk. I really think there is a useful place for this tool 
and it would really be to the advantage of all users if it could receive 
some concerted attention, not just piecemeal fixes.

Kind regards,
willem

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

[PATCH] CCR gas composition and gas pressure lables on dive profile revisited.

[Willem Ferguson]

Subject: [PATCH] CCR gas composition and gas pressure labels on dive 
profile:


This patch cleans up code for achieving the above with respect to
CCR dives. The code is simplified and shortened. The display of
gas lables on the profile is made consistent with the cylinder
pressure closest to the graph and the gas composition above/below
the cylinder pressure. The patch significantly improves the
maintainability of this code.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za

From a62aeee49dc69336b31cabc0e090508b914c5a59 Mon Sep 17 00:00:00 2001
From: willem ferguson willemfergu...@zoology.up.ac.za
Date: Thu, 5 Feb 2015 09:34:38 +0200
Subject: [PATCH] CCR gas composition and gas pressure labels on dive profile:
 revisited

This patch cleans up code for achieving the above with respect to
CCR dives. The code is simplified and shortened. The display of
gas lables on the profile is made consistent with the cylinder
pressure closest to the graph and the gas composition above/below
the cylinder pressure. The patch significantly improves the
maintainability of this code.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 qt-ui/profile/diveprofileitem.cpp | 39 ++-
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/qt-ui/profile/diveprofileitem.cpp b/qt-ui/profile/diveprofileitem.cpp
index 3bc7983..c145616 100644
--- a/qt-ui/profile/diveprofileitem.cpp
+++ b/qt-ui/profile/diveprofileitem.cpp
@@ -682,8 +682,8 @@ void DiveGasPressureItem::modelDataChanged(const QModelIndex topLeft, const QMo
 
 	bool offsets_initialised = false;
 	int o2cyl = -1, dilcyl = -1;
-	QFlagsQt::AlignmentFlag alignVar, align_dil = Qt::AlignBottom, align_o2 = Qt::AlignBottom;
-	double axisRange = (vAxis-maximum() - vAxis-minimum())/1000;
+	QFlagsQt::AlignmentFlag alignVar= Qt::AlignTop, align_dil = Qt::AlignBottom, align_o2 = Qt::AlignTop;
+	double axisRange = (vAxis-maximum() - vAxis-minimum())/1000;	// Convert axis pressure range to bar
 	double axisLog = log10(log10(axisRange));
 	for (int i = 0, count = dataModel-rowCount(); i  count; i++) {
 		entry = dataModel-data().entry + i;
@@ -691,23 +691,17 @@ void DiveGasPressureItem::modelDataChanged(const QModelIndex topLeft, const QMo
 		if (displayed_dive.dc.divemode == CCR  displayed_dive.oxygen_cylinder_index = 0)
 			o2mbar = GET_O2CYLINDER_PRESSURE(entry);
 
-		if (o2mbar) {
+		if (o2mbar) {	// If there is an o2mbar value then this is a CCR dive. Then do:
 			// The first time an o2 value is detected, see if the oxygen cyl pressure graph starts above or below the dil graph
 			if (!offsets_initialised) {	// Initialise the parameters for placing the text correctly near the graph line:
 o2cyl = displayed_dive.oxygen_cylinder_index;
 dilcyl = displayed_dive.diluent_cylinder_index;
 if ((o2mbar  mbar)) {	// If above, write o2 start cyl pressure above graph and diluent pressure below graph:
-	print_y_offset[o2cyl][0] = -7 * axisLog; // y offset for oxygen gas lable (above)
-	print_y_offset[o2cyl][1] = -0.5;	 // y offset for oxygen start pressure value (above)
+	print_y_offset[o2cyl][0] = -7 * axisLog; // y offset for oxygen gas lable (above); pressure offsets=-0.5, already initialised
 	print_y_offset[dilcyl][0] = 5 * axisLog; // y offset for diluent gas lable (below)
-	print_y_offset[dilcyl][1] = 0;		 // y offset for diluent start pressure value (below)
-	align_dil = Qt::AlignBottom;
-	align_o2  = Qt::AlignTop;
-} else {	// ... else write o2 start cyl pressure below graph:
-	print_y_offset[o2cyl][0]  = 5 * axisLog; // o2 lable  pressure below graph,
-	print_y_offset[o2cyl][1]  = 0;
-	print_y_offset[dilcyl][0] = -7 * axisLog;  // and diluent lable above graph.
-	print_y_offset[dilcyl][1] = -0.5;	// and diluent pressure above graph.
+} else {// ... else write o2 start cyl pressure below graph:
+	print_y_offset[o2cyl][0]  = 5 * axisLog; // o2 lable  pressure below graph; pressure offsets=-0.5, already initialised
+	print_y_offset[dilcyl][0] = -7.8 * axisLog;  // and diluent lable above graph.
 	align_dil = Qt::AlignTop;
 	align_o2  = Qt::AlignBottom;
 }
@@ -722,9 +716,6 @@ void DiveGasPressureItem::modelDataChanged(const QModelIndex topLeft, const QMo
 			last_pressure[displayed_dive.oxygen_cylinder_index] = o2mbar;
 			last_time[displayed_dive.oxygen_cylinder_index] = entry-sec;
 			alignVar = align_dil;
-		} else {
-			alignVar = Qt::AlignBottom;
-			align_dil = Qt::AlignTop;
 		}
 
 		if (!mbar)
@@ -733,29 +724,19 @@ void DiveGasPressureItem::modelDataChanged(const QModelIndex topLeft, const QMo
 		if (cyl != entry-cylinderindex) {	// Pressure value near the left hand edge of the profile - other cylinders:
 			cyl = entry-cylinderindex;	// For each other cylinder, write the gas lable and pressure
 			if (!seen_cyl[cyl]) {
-plotPressureValue(mbar, entry-sec, alignVar, print_y_offset[cyl][0]);
-plotGasValue(mbar

Re: [PATCH] User-manual: Facebook integration

[Willem Ferguson]

On 02/02/2015 17:13, Dirk Hohndel wrote:


I would never call something you contribute utter rubbish. You must be
confusing me with someone else :-)

Unfortunately the first part of the paragraph is what I WISH we did but
haven't figured out how to do, and the second part of the paragraph is...
questionable. So I simply dropped it.

/D
___

Thanks for doing the edits!
wf

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

User Manual: Facebook tests

[Willem Ferguson]

The Facebook-related panels all have the standard  OK/Apply/Discard 
buttons near the bottom right.

Discard = cancel = close without saving
Apply = assign the values to the completed fields
OK = Close panel without saving
What are the semantic differences among the three options?
Kind regards,
willem

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

Facebook testing

[Willem Ferguson]

I notice that if one logs into Facebook through Subsurface and then 
close Subsurface without disconnecting from Facebook, it looks like the 
Facebook session is not disconnected. If one fires up Subsurface and 
open the Facebook Preferences within Subsurface, the connection is till 
there and one can upload imaged to Facebook. To disconnect one has to 
explicitly disconnect even if it is several Subsurface sessions later. I 
am not sure how much of this is intentional.


There is a checkbox Keep the connection with Subsurface which, in my 
case, was NOT checked. But later experimentation made it look like this 
checkbox does not affect the fact that one remains connected.


I would suggest that, if one is connected to facebook and one terminates 
Subsurface, one uses the same popup asking about Do you want to save 
the changes? and add another question You are connected to Facebook. 
Do you wish to remain connected?

Kind regards,
willem

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

Facebook test

[Willem Ferguson]

1) in the preferences, connect Subsurface to your FB account
2) an 'f' icon will show up next to the notes
3) click the 'f' and you'll see a dialog that allows you to post to FB



V.4.3.960-58 on Ubuntu

The login process is quite simple and takes me through the process in a 
step-by-step way. In the end it leaves me with a panel with a button to 
select if I wish to leave facebook. I logged out of Facebook, logged 
back, now the the login process was much faster. However, two issues:


1) When clicking on the Facebook button/logo nothing happens. I see no 
way of interacting with facebook to send something to facebook. This was 
after the first login as well as after the second login.


2) I would like a way of changing the privacy settings of Subsurface 
submissions to Facebook, not only at first login into facebook from 
within Subsurface. Or can one do this from within fb?


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

Re: Facebook test

[Willem Ferguson]

On 31/01/2015 13:45, Willem Ferguson wrote:

1) in the preferences, connect Subsurface to your FB account
2) an 'f' icon will show up next to the notes
3) click the 'f' and you'll see a dialog that allows you to post to FB



V.4.3.960-58 on Ubuntu

The login process is quite simple and takes me through the process in 
a step-by-step way. In the end it leaves me with a panel with a button 
to select if I wish to leave facebook. I logged out of Facebook, 
logged back, now the the login process was much faster. However, two 
issues:


1) When clicking on the Facebook button/logo nothing happens. I see no 
way of interacting with facebook to send something to facebook. This 
was after the first login as well as after the second login.


2) I would like a way of changing the privacy settings of Subsurface 
submissions to Facebook, not only at first login into facebook from 
within Subsurface. Or can one do this from within fb?


Kind regards,
willem


Many apologies, I was hitting the wrong facebook logo. After I selected 
the one on the divenotes panel, I transfered to fb no problem.

Kind regards,
willem

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

[PATCH] User-manual - Update and expand section dealing with dive planning

[Willem Ferguson]

User-manual: Dive planner text

I took Robert's contribution describing the dive planner and
expanded it a bit, added two more graphics
to show CCR and pSCR dive planning, and changed a third image.

Moved the section dealing with configuring a dive computer to
be in a more logical place, just before the Subsurface Settings.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za

This patch does NOT contain the graphics.
Sent complete patch with graphics to Dirk.
This message meant for our translators.
Kind regards,
willem



From b4c61c5612c857547bb3db27f5dc2e17205b188c Mon Sep 17 00:00:00 2001
From: willem ferguson willemfergu...@zoology.up.ac.za
Date: Fri, 30 Jan 2015 19:59:49 +0200
Subject: [PATCH 3/3] User-manual: Dive planner text

I took Robert's contribution describing the dive planner and
expanded it a bit, added two more graphics
to show CCR and pSCR dive planning, and changed a third image.

Moved the section dealing with configuring a dive computer to
be in a more logical place, just before the Subsurface Settings.

Signed-off-by: willem ferguson willemfergu...@zoology.up.ac.za
---
 Documentation/images/DivePlanner2_f20.jpg  | Bin 86758 - 97331 bytes
 Documentation/images/Planner_CCR1_f20.jpg  | Bin 0 - 90805 bytes
 Documentation/images/Planner_pSCR1_f20.jpg | Bin 0 - 85986 bytes
 Documentation/user-manual.txt  | 171 -
 4 files changed, 96 insertions(+), 75 deletions(-)
 create mode 100644 Documentation/images/Planner_CCR1_f20.jpg
 create mode 100644 Documentation/images/Planner_pSCR1_f20.jpg


diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index b1f9658..cfed3cb 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2519,6 +2519,37 @@ the output for one particular page.
 image::images/Printpreview.jpg[FIGURE: Print preview page,align=center]
 
 
+[[S_Configure]]
+== Configuring a dive computer
+
+_Subsurface_ enables one to configure a dive computer. Currently the Heinrichs-Weikamp (OSTC 2, OSTC 3) and
+Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec,
+Cobra, Gekko and Zoop) family of dive computers are supported. A large number of settings of these dive computers
+can be read and changed to different values. As a first step, ensure that the appropriate hardware driver
+is installed for the dive computer and that the device name of the dive computer is known.
+See _appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,APPENDIX A for information on how to do this.
+
+Once the dive computer is connected to the _Subsurface_ computer, select _File -  Configure dive
+computer_ from the _Main Menu_. Provide the appropriate device name in the text box at the
+top of the configuration panel that opens and select the appropriate dive
+computer model from the panel on the lefthand (see image below).
+
+image::images/Configure_dc_f20.jpg[FIGURE: Configure dive computer,align=center]
+
+Using the appropriate buttons on the configuration panel, the following actions can be performed:
+
+ - *Retrieve available details*. This loads the existing configuration from the dive computer
+   to _Subsurface_, showing this in the configuration panel.
+ - *Save changes to device*. This changes the configuration of the
+   dive computer to correspond to the information shown in the configuration panel.
+ - *Backup*. This saves the configuration data to a file. _Subsurface_ asks for
+   a file location and file name for the saved information.
+ - *Restore backup*. This loads the information from a backup file and displays it
+   in the configuration panel.
+ - *Update firmware*. If new firmware is available for the dive computer, this is
+   loaded into the dive computer.
+
+
 [[S_Preferences]]
 == Setting user _Preferences_ for _Subsurface_
 
@@ -2675,6 +2706,7 @@ be provided. If the proxy server uses authentication, the appropriate userID and
 password also needs to be provided so that _Subsurface_ can automatically pass
 through the proxy server to access the Internet.
 
+
 [[S_DivePlanner]]
 == The _Subsurface_ dive planner
 Dive planning is an advanced feature of _Subsurface_, accessible by selecting
@@ -2719,16 +2751,14 @@ any warning messages about the dive plan are printed.
 image::images/PlannerWindow1_f20.jpg[FIGURE: Dive planner startup window,align=center]
 
 
-=== Initiating dive planning
-
-The dive planner comprises two parts: *constructing a dive plan* and *evaluating*
-that dive plan. To perform dive planning, perform these steps:
+=== Open circuit dives as an example of dive planning
 
-- Clear the existing dive log by creating a new planning log. This is achieved by selecting
-  _File -  New logbook_ from the main menu. This way, dive plans are kept separate
-  from the existing dive log of completed dives.
+-  Towards the left bottom of the planner (circled in blue in the image below) is a dropbox with three options

Re: Broken links on user manual

[Willem Ferguson]

On 30/01/2015 19:02, Miika Turkia wrote:
There are a couple of broken links / references on our user manual. I 
looked at the first one but couldn't figure out where it should be 
pointing to..so I am now trying to delegate the fixing of them to 
Willem :D


Following x-refs are used but the destination is missing:

S_ExtraTab
S_InfoBox
S_ImportingManualCSV

miika


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


Easy because I understand the layout. Will respond, just waiting for the 
latest release that applies current patches (ios companion, dive 
planner) to the manual.

Kind regards,
willem

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