Date widget

2014-06-24 Thread Willem Ferguson
Looks slick. Is there a possibility to make the day part smaller and the 
month-year banner lettering larger? As is, it is arguably less legible 
that the original text box format because the month-year part is so small.

Kind regards,
willmf

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


Re: Date widget

2014-06-24 Thread Dirk Hohndel
On Tue, Jun 24, 2014 at 09:30:56AM +0200, Willem Ferguson wrote:
 Looks slick. Is there a possibility to make the day part smaller and the
 month-year banner lettering larger?

I suggested the same to Tomaz already :-)
But he's busy participating in street protests in Brazil - I think he
mentioned that a day or two ago.

I'm really hoping that he'll finish the time picker plus the minor layout
changes to the date picker.


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


Re: [PATCH] Template for subsurface android package

2014-06-24 Thread Dirk Hohndel
Just like I asked Miika - I would prefer to get these with SOB's from your
mentor.

Andton, would you be able to do that? This way I know which patches the
mentor has reviewed and considers ready to make it into master.

/D

On Mon, Jun 23, 2014 at 11:28:52PM +0530, Venkatesh Shukla wrote:
 On Mon, Jun 23, 2014 at 8:18 PM, Venkatesh Shukla 
 venkatesh.shukla.ee...@iitbhu.ac.in wrote:
 
  Hello
 
  For building subsurface on android, a template is needed. In this
  template, android specific files, like AndroidManifest.xml, java files and
  android xml files among others would be added. I am attaching a patch which
  does takes care of this template while building for android.
  The included manifest file contains permissions for USB usage on android
  and device_filter.xml file to recognize the supported devices.
 
  --
  Venkatesh Shukla
 
 
 On suggestion of Anton, I have changed the package name to
 'org.subsurface'. Other modifications include inclusion of string.xml for
 proper naming of application and proper formatting of AndroidManifest.xml
 and setting default orientation to landscape.
 
 -- 
 Venkatesh Shukla

 From 251ab194b9357e58eacb2cc3ec590b037e3effab Mon Sep 17 00:00:00 2001
 From: Venkatesh Shukla venkatesh.shukla.ee...@iitbhu.ac.in
 Date: Mon, 23 Jun 2014 17:18:17 +0530
 Subject: [PATCH] Template for subsurface android package
 
 For modifications to the final source code of built android package
 such as permission additions and inclusion of xml and java files, it
 is necessary to maintain a template. The template is copied without
 any modifications on top of qt android-template before building
 subsurface libraries. ( Refer: http://goo.gl/z44dQC )
 
 All android specific files would be added to android subdirectory.
 
 In this commit, permission for usage of USB devices is added to
 AndroidManifest.xml. Also included is device_filter.xml. When
 devices having VID, PID listed in this file is attached to android,
 a dialogbox is displayed asking for permission for subsurface to
 use this USB device. Accepting it would take you straight to subsurface
 application.
 
 Signed-off-by: Venkatesh Shukla venkatesh.shukla.ee...@iitbhu.ac.in
 ---
  .gitignore|   2 +
  android/AndroidManifest.xml   | 117 
 ++
  android/res/values/strings.xml|   8 +++
  android/res/xml/device_filter.xml |  16 ++
  subsurface-install.pri|   2 +
  subsurface.pro|   6 ++
  6 files changed, 151 insertions(+)
  create mode 100644 android/AndroidManifest.xml
  create mode 100644 android/res/values/strings.xml
  create mode 100644 android/res/xml/device_filter.xml
 
 diff --git a/.gitignore b/.gitignore
 index 9272286..24e8eb7 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -30,3 +30,5 @@ Makefile
  subsurface.pro.user*
  Subsurface.app
  .DS_Store
 +!android/**/*.xml
 +
 diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
 new file mode 100644
 index 000..4eb97e5
 --- /dev/null
 +++ b/android/AndroidManifest.xml
 @@ -0,0 +1,117 @@
 +?xml version='1.0' encoding='utf-8'?
 +manifest xmlns:android=http://schemas.android.com/apk/res/android;
 +package=org.subsurface
 +android:installLocation=auto
 +android:versionCode=1
 +android:versionName=1.0 
 +
 +application
 +android:name=org.qtproject.qt5.android.bindings.QtApplication
 +android:hardwareAccelerated=true
 +android:label=@string/app_name 
 +activity
 +android:name=org.qtproject.qt5.android.bindings.QtActivity
 +
 android:configChanges=orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation
 +android:label=@string/app_name
 +android:launchMode=singleTop
 +android:screenOrientation=sensorLandscape 
 +intent-filter
 +action android:name=android.intent.action.MAIN /
 +
 +category android:name=android.intent.category.LAUNCHER /
 +/intent-filter
 +
 +meta-data
 +android:name=android.app.lib_name
 +android:value=-- %%INSERT_APP_LIB_NAME%% -- /
 +meta-data
 +android:name=android.app.qt_sources_resource_id
 +android:resource=@array/qt_sources /
 +meta-data
 +android:name=android.app.repository
 +android:value=default /
 +meta-data
 +android:name=android.app.qt_libs_resource_id
 +android:resource=@array/qt_libs /
 +meta-data
 +android:name=android.app.bundled_libs_resource_id
 +android:resource=@array/bundled_libs /
 +!-- Deploy Qt libs as part of package --
 +meta-data
 +android:name=android.app.bundle_local_qt_libs
 +android:value=-- %%BUNDLE_LOCAL_QT_LIBS%% -- 

Dive planner UI suggestion

2014-06-24 Thread Davide DB
Hi all,

Some suggestions after my comparison attempts against GUE Decoplanner 3.14.
In the past I used GAP and Vplanner.

I tried to use the graphical part moving points and so on but it was
painful.

For the sake of speed I prefer using a simple and effective data entry. BTW
it's nice that the profile and dive plan update immeditaely as I
enter/modify data.

#1 I don't want to insert the first point: it should automagically appear
because in the planner preferences I set a descent rate m/Min (20m/min by
default). It seems to me that Anton filed a patch for something like
this...

#2 By default I have just to insert depth and time.
By default dive time is always comprised of descent time. Sometime you find
the finesse to exclude/include it but it's unnecessary IMHO.

#3 If you have to plan a mutilevel dive you can add more depth/time points.

#4 for each point you define a gas mix.

#5 On my build SS added all the mix it found on my dive :) Maybe I'm wrong
but I did not understood its behavior.
For the sake of plan speed it would be nice if SS could automagically
select the best mix for me from a standard gas set (no flame intended: I'm
a GUE diver). Maybe PO2 =1.2 on the bottom and END =30m could be an
agreement or we could set them on a mix preferences page.

#6 I like that it choose my deco gas by default with a default switch
depth. Maybe it's a mistake but it suggest 18m instead of 21m for EAN50.

#7 dive plain details text box should be a table or somethig which permits
a better formatting. BTW Decoplanner has a table but it doesn't permit to
copy and paste nicely the plan on a email.

#8 on the dive plain it would be nice having a total deco time with
indication of deepest deco stop.



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


Re: Testing of planner against other software

2014-06-24 Thread Davide DB
Ok thank you for the explanation.
Hence SS run times seems to be slightly longer with the same GF for
more aggressive dives.

If I do not take in account SS and DP extra time from 6m  0m (SS=6'
DP=1'), I get the following runtimes:

30@45m; 50%

DP = 63'
SS = 60'

40@45m; 50%

DP = 88'
SS = 88'

40@45m; 50% + 100%

DP = 78'
SS = 78'

50@45m; 50% + 100%

DP = 103'
SS = 102'

30@70m; 50% + 100%

DP = 131'
SS = 143'

40@70m; 50% + 100%

DP = 189'
SS = 208'

30@90m; 35/25 + 50% + 100%

DP = 191'
SS = 217'


PS
Do you confirm that break gas check box doesn't work?

Bye


2014-06-24 14:22 GMT+02:00 Robert Helling hell...@atdotde.de:

 On 24.06.2014, at 12:51, Davide DB dbdav...@gmail.com wrote:

 Davide,

 So you mean that 5 minutes are all the deep stops summed together?


 I mean the ascent to the first stop. Let’s take for concreteness the 30min @
 70m with EAN50 and O2. For example it takes 3:42 to get from 70m to 42m.
 Then the actual stop is 2min (stops are always multiples of full minutes).
 And the display that you show always rounds to full minutes. To see more
 details, turn on “display transitions in deco” or even “verbatim dive plan”
 which gives you

 Subsurface dive plan
 based on GFlow = 20 and GFhigh = 85

 Transition to 70 m in 3:00 min - runtime 3:00 on (15/55)
 Stay at 70 m for 27:00 min - runtime 30:00 on (15/55)
 Transition to 42 m in 3:42 min - runtime 33:42 on (15/55)
 Stay at 42 m for 2:00 min - runtime 35:42 on (15/55)
 Transition to 39 m in 0:30 min - runtime 36:12 on (15/55)
 Stay at 39 m for 2:00 min - runtime 38:12 on (15/55)
 Transition to 36 m in 0:30 min - runtime 38:42 on (15/55)
 Stay at 36 m for 2:00 min - runtime 40:42 on (15/55)
 Transition to 33 m in 0:30 min - runtime 41:12 on (15/55)
 Stay at 33 m for 3:00 min - runtime 44:12 on (15/55)
 Transition to 30 m in 0:30 min - runtime 44:42 on (15/55)
 Stay at 30 m for 4:00 min - runtime 48:42 on (15/55)
 Transition to 27 m in 0:30 min - runtime 49:12 on (15/55)
 Stay at 27 m for 6:00 min - runtime 55:12 on (15/55)
 Transition to 24 m in 0:30 min - runtime 55:42 on (15/55)
 Stay at 24 m for 4:00 min - runtime 59:42 on (15/55)
 Transition to 22 m in 0:21 min - runtime 60:03 on (15/55)
 Switch gas to EAN50
 Stay at 22 m for 1:00 min - runtime 61:03 on EAN50
 Transition to 21 m in 0:12 min - runtime 61:15 on EAN50
 Stay at 21 m for 3:00 min - runtime 64:15 on EAN50
 Transition to 18,0 m in 0:30 min - runtime 64:45 on EAN50
 Stay at 18,0 m for 4:00 min - runtime 68:45 on EAN50
 Transition to 15,0 m in 0:30 min - runtime 69:15 on EAN50
 Stay at 15,0 m for 6:00 min - runtime 75:15 on EAN50
 Transition to 12,0 m in 0:30 min - runtime 75:45 on EAN50
 Stay at 12,0 m for 8:00 min - runtime 83:45 on EAN50
 Transition to 9,0 m in 0:30 min - runtime 84:15 on EAN50
 Stay at 9,0 m for 14:00 min - runtime 98:15 on EAN50
 Transition to 6,0 m in 0:30 min - runtime 98:45 on EAN50
 Switch gas to EAN100
 Stay at 6,0 m for 41:03 min - runtime 139:48 on EAN100
 Transition to 0,0 m in 6:15 min - runtime 146:03 on EAN100

 Gas consumption:
 6822ℓ of (15/55) — Warning: this is more gas than available in the specified
 cylinder!
 1517ℓ of EAN50
 1253ℓ of EAN100

 Best
 Robert



 --
 .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oO
 Robert C. Helling Elite Master Course Theoretical and Mathematical
 Physics
   Scientific Coordinator
   Ludwig Maximilians Universitaet Muenchen, Dept. Physik
   Phone: +49 89 2180-4523  Theresienstr. 39, rm. B339
   http://www.atdotde.de

 Enhance your privacy, use cryptography! My PGP keys have fingerprints
 A9D1 A01D 13A5 31FA 6515  BB44 0820 367C 36BC 0C1Dand
 DCED 37B6 251C 7861 270D  5613 95C7 9D32 9A8D 9B8F







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


Re: My progress in HTML export.

2014-06-24 Thread Miika Turkia
Hello,

I will send Gehad's patch-set from the 17th with my signed-off as a
separate set of mail (using git e-mail), as poor Internet connection
over here forces me to use HTML-only gmail and that does not seem to
support attachments. I will skip the one from 19th that switches to
Highchart as the license is unfortunately not acceptable for
Subsurface.

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


[PATCH 3/4] HTML: Wide Javascript code cleaning

2014-06-24 Thread Miika Turkia
From: Gehad elrobey gehadelro...@gmail.com

list_lib Javascript code cleaning, Now it looks like subsurface code.

Signed-off-by: Gehad elrobey gehadelro...@gmail.com
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
 theme/list_lib.js | 829 ++
 1 file changed, 458 insertions(+), 371 deletions(-)

diff --git a/theme/list_lib.js b/theme/list_lib.js
index bf5ad01..20dc5a7 100644
--- a/theme/list_lib.js
+++ b/theme/list_lib.js
@@ -1,9 +1,9 @@
-var itemsToShow = new Array(); //list of indexes to all dives to view
+var itemsToShow = new Array(); //list of indexes to all dives to view
 var items = new Array();
-var start; //index of first element viewed in 
itemsToShow
-var sizeofpage;//size of viewed page
-var numberofwords=0;   //just for stats
-var olditemstoshow;//to reference the indexes to all dives 
if changed
+var start; //index of first element viewed in itemsToShow
+var sizeofpage;//size of viewed page
+var numberofwords = 0; //just for stats
+var olditemstoshow;//to reference the indexes to all dives if 
changed
 //
 // //
 // View Model  //
@@ -15,12 +15,13 @@ var olditemstoshow; //to reference the 
indexes to all dives if changed
 *View N pages each of sizeofpage size items.
 *starting from zero
 */
-function showAllDives(){
-   for(var i=0 ; i  items.length ; i++){
+function showAllDives()
+{
+   for (var i = 0; i  items.length; i++) {
itemsToShow.push(i);
}
olditemstoshow = itemsToShow;
-   start=0;
+   start = 0;
viewInPage();
 }
 
@@ -29,36 +30,40 @@ function showAllDives(){
 *It start from 'start' variable.
 *It showes N pages each of sizeofpage size.
 */
-function viewInPage(){
-   var end = start + sizeofpage -1;
-   if(end = itemsToShow.length ) end = itemsToShow.length-1;
-   updateView(start,end);
+function viewInPage()
+{
+   var end = start + sizeofpage - 1;
+   if (end = itemsToShow.length)
+   end = itemsToShow.length - 1;
+   updateView(start, end);
 }
 
 /**
 *addHTML this Method puts the HTML of items of given indexes
 *@param {array} indexes array of indexes to put in HTML
 */
-function updateView(start,end){
+function updateView(start, end)
+{
var divelist = document.getElementById('diveslist');
-   divelist.innerHTML=;
-   for(var i=start;i=end;i++){
-   divelist.innerHTML+='ul id='+itemsToShow[i]+' 
onclick=toggleExpantion(this)/ul';
+   divelist.innerHTML = ;
+   for (var i = start; i = end; i++) {
+   divelist.innerHTML += 'ul id=' + itemsToShow[i] + ' 
onclick=toggleExpantion(this)/ul';
expand(document.getElementById(itemsToShow[i]));
items[itemsToShow[i]].expanded = true;
};
-   view_pagging(start,end);
+   view_pagging(start, end);
 }
 
 /**
 *addHTML this Method puts the HTML of items of given indexes
 *@param {array} indexes array of indexes to put in HTML
 */
-function addHTML(indexes){
+function addHTML(indexes)
+{
var divelist = document.getElementById('diveslist');
-   divelist.innerHTML=;
-   for(var i=0;iindexes.length;i++){
-   divelist.innerHTML+='ul id='+indexes[i]+' 
onclick=toggleExpantion(this)/ul';
+   divelist.innerHTML = ;
+   for (var i = 0; i  indexes.length; i++) {
+   divelist.innerHTML += 'ul id=' + indexes[i] + ' 
onclick=toggleExpantion(this)/ul';
expand(document.getElementById(indexes[i]));
itemsToShow[indexes[i]].expanded = true;
};
@@ -69,98 +74,107 @@ function addHTML(indexes){
 *@param {integer} start start from this index
 *@param {integer} finish at this index.
 */
-function view_in_range(start,end){
+function view_in_range(start, end)
+{
var ind = new Array();
-   if(end=itemsToShow.length)end=itemsToShow.length-1;
-   for(var i=start ; i = end ; i++){
+   if (end = itemsToShow.length)
+   end = itemsToShow.length - 1;
+   for (var i = start; i = end; i++) {
ind.push(i);
}
addHTML(ind);
-   view_pagging(start,end);
+   view_pagging(start, end);
 }
 
 
-function prev_page(){
-   var end = start+sizeofpage-1;
-   if(start-sizeofpage0){
-   start-=sizeofpage;
+function prev_page()
+{
+   var end = start + sizeofpage - 1;
+   if (start - sizeofpage  0) {
+   start -= sizeofpage;
+   } else {
+   start = 0;
}
-   else{
-   start=0;
+   if (end - sizeofpage  0) {
+   end -= sizeofpage;
}
-   if(end-sizeofpage0){
-   end-=sizeofpage;
+   if (end = itemsToShow.length) {
+ 

Re: Dive planner UI suggestion

2014-06-24 Thread Davide DB
Hi Robert,

You were faster than me :)

2014-06-24 14:40 GMT+02:00 Robert Helling hell...@atdotde.de:

 On 24.06.2014, at 12:49, Davide DB dbdav...@gmail.com wrote:

 Davide,

 I tried to use the graphical part moving points and so on but it was
 painful.


 does this refer to the fact that the grid/scale moves under the mouse
 pointer when you drag points? As this will be improved. Or anything else?

Yes, exactly that. I couldn't reach precisely 70m.

 You realize you can also move the waypoints in the graphical display using
 cursor keys?

Yes but it started with a default 15m dive so to reach 70m I broke my
keyboard cursor :) and anyway it's way longer than typing 70. Anyway
if someone like modifying the profile graphically, no problem at all
(see next point)

 For the sake of speed I prefer using a simple and effective data entry. BTW
 it's nice that the profile and dive plan update immeditaely as I
 enter/modify data.


 That's why we offer both options.

Yes of course, but right now the data entry seems to be dependent on
the graphicla part way of working.
On VPlanner and Decoplanner to plan a dive like 30'@45m you just type
30 and 45
Here I had to enter 45 and 2 to define the first point and then
again 45 and 28 for the second point: 30-2=28. It's a little bit
counter intuitive. Again if I move to 70m I have to change 4 data
again.
Of course patch introduced by Anton will solve this.


 #1 I don't want to insert the first point: it should automagically appear
 because in the planner preferences I set a descent rate m/Min (20m/min by
 default). It seems to me that Anton filed a patch for something like this...

 yes.

OK


 #2 By default I have just to insert depth and time.
 By default dive time is always comprised of descent time. Sometime you find
 the finesse to exclude/include it but it's unnecessary IMHO.

 #3 If you have to plan a mutilevel dive you can add more depth/time points.

 #4 for each point you define a gas mix.


 By default it copies the previous mix.

OK


 #5 On my build SS added all the mix it found on my dive :) Maybe I'm wrong
 but I did not understood its behavior.
 For the sake of plan speed it would be nice if SS could automagically select
 the best mix for me from a standard gas set (no flame intended: I'm a GUE
 diver). Maybe PO2 =1.2 on the bottom and END =30m could be an agreement or
 we could set them on a mix preferences page.


 The gases that it (don't call subsurface SS, Dirk does not like that for
 obvious reasons) starts up with are the gases that are used in the dive that
 is selected when you start the planner. That is meant to allow you to plan
 a similar dive to the one selected. If you adhere to a diving philosophy
 that has a standard set of gases you could make a dummy dive that uses those
 gases and always start planning by first selecting that dive. For the
 manually added waypoints the user is responsible to select the correct gas
 (again assuming that it is the same as the previous segment, so you only
 have to enter it once per gas change not per waypoint). In deco, gas changes
 are inserted accruing to the Switch at column in the gas table. That is
 pre-filled according to MOD using a (not yet user configurable) pO2 for
 deco.

Sorry for the wrong short name chosen. My apologize (also for the other email).
Now I understand: it chose a selected dive. I didn't realize it. It
seems a very clever shortcut.


 #6 I like that it choose my deco gas by default with a default switch depth.
 Maybe it's a mistake but it suggest 18m instead of 21m for EAN50.


 As I said, that depends on MOD (and thus pO2) or manual depth setting in the
 table. With pO2=1.6bar it wants to change gases at 22m (as that is the MOD).
 Shall we always make that multiples of 3m?

I guess yes (at least for OC and PSCR) I do not know for CCR diving.


 #7 dive plain details text box should be a table or somethig which permits a
 better formatting. BTW Decoplanner has a table but it doesn't permit to copy
 and paste nicely the plan on a email.


 I don't quite understand. That is a (html) table. When you cutpaste that to
 your word processor, you should be able to apply any formatting you like.

Ouch I didn't notice. I thought it was a canvas because If you look at
one of my screenshots you will notice that depth runtime gas
header appear squeezed together like a one word. Even the mix name
seems not aligned. On windows it should be  a courier new fixed
space font but the ( has a different alignment than E of EAN.
Maybe some margin and font size will improve it a lot.


 #8 on the dive plain it would be nice having a total deco time with
 indication of deepest deco stop.

 You mean subtract the time of the last manually entered waypoint from the
 total run time and explicitly state the depth of the first computed stop?
 The first I can understand but why would one one the second?

Decoplanner report the first deco stop in lower part of my screenshots
along with deco time. Maybe they 

Re: Filtering dives by tag

2014-06-24 Thread Dirk Hohndel
On Mon, Jun 23, 2014 at 11:50:21AM +0100, JB2Cool wrote:
 Tags filtering is disabled currently but i beleive it will be reappearing
 at some point. Whether the entry in this field will work as a 'tag' or not
 though, i don't know.

I believe tag filtering will be a 4.3 feature.

Adding a tag-ified suit field somehow to the equipment tab and making
that searchable as well should be a reasonable next step.

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


Re: GSoC: iOS Subsurface companion app (week 5)

2014-06-24 Thread Andrey Zhdanov

 On 23 июня 2014 г., at 16:40, Anton Lundin gla...@acc.umu.se wrote:
 
 On 23 June, 2014 - Andrey Zhdanov wrote:
 
 Hi Dirk,
 
 This week I have implemented: 
 * dive details edit (dive name and dive location by dragging pin on map);
 * info screen (build version label, visit website and mailing list buttons);
 * application settings.bundle and retrieving data from there (API URL, 
 distance, default name and dives synch / upload booleans);
 
 Next week I plan to implement collecting locations in background, account 
 deletion and minor UI improvements.
 By the way, where can I get Subsurface logo in vector (ideally) or at least 
 an image with 1024x1024 pixels resolution (largest image that I have found 
 is only 600x600)?
 
 http://git.hohndel.org/?p=subsurface.git;a=blob;f=subsurface-icon.svg
 
 I think that would suite your needs?

Thanks, Anton! That's what I needed. 

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


Re: [PATCH] Template for subsurface android package

2014-06-24 Thread Anton Lundin
On 24 June, 2014 - Venkatesh Shukla wrote:

 On Mon, Jun 23, 2014 at 11:28 PM, Venkatesh Shukla 
 venkatesh.shukla.ee...@iitbhu.ac.in wrote:
 
 
 
 
  On Mon, Jun 23, 2014 at 8:18 PM, Venkatesh Shukla 
  venkatesh.shukla.ee...@iitbhu.ac.in wrote:
 
  Hello
 
  For building subsurface on android, a template is needed. In this
  template, android specific files, like AndroidManifest.xml, java files and
  android xml files among others would be added. I am attaching a patch which
  does takes care of this template while building for android.
  The included manifest file contains permissions for USB usage on android
  and device_filter.xml file to recognize the supported devices.
 
  --
  Venkatesh Shukla
 
 
  On suggestion of Anton, I have changed the package name to
  'org.subsurface'. Other modifications include inclusion of string.xml for
  proper naming of application and proper formatting of AndroidManifest.xml
  and setting default orientation to landscape.
 
  --
  Venkatesh Shukla
 
 
 Launcher icon suitable for various screen resolutions are now included.
 Instead of the previous patches, this should be applied.
 

Finally i got some time to do a proper review of this.


 From ebcf2e0e648f18478d889fcbdb81bc17c3cf8979 Mon Sep 17 00:00:00 2001
 From: Venkatesh Shukla venkatesh.shukla.ee...@iitbhu.ac.in
 Date: Mon, 23 Jun 2014 17:18:17 +0530
 Subject: [PATCH] Template for subsurface android package
 
 For modifications to the final source code of built android package
 such as permission additions and inclusion of xml and java files, it
 is necessary to maintain a template. The template is copied without
 any modifications on top of qt android-template before building
 subsurface libraries. ( Refer: http://goo.gl/z44dQC )

I would recommend using the proper link here:
http://qt-project.org/doc/qt-5/deployment-android.html#qmake-variables

Its long and ugly, but its a bit clearer what you mean.

 
 All android specific files would be added to android subdirectory.
 

This isn't really true. The android.cpp file is android specific but
shouldn't live in that directory. This needs rephrasing.

 In this commit, permission for usage of USB devices is added to
 AndroidManifest.xml. Also included is device_filter.xml. When
 devices having VID, PID listed in this file is attached to android,
 a dialogbox is displayed asking for permission for subsurface to
 use this USB device. Accepting it would take you straight to subsurface
 application.
 

I would move this to a separate commit. When this is applied subsurface
knows nothing about usb devices, and i would hold off on those patches
until that code reaches some sort of state that it can land in this
repo. I refrained from commenting more on this below.

 diff --git a/.gitignore b/.gitignore
 index 9272286..24e8eb7 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -30,3 +30,5 @@ Makefile
  subsurface.pro.user*
  Subsurface.app
  .DS_Store
 +!android/**/*.xml
 +

Trailing newline here.

 diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
 new file mode 100644
 index 000..314d58e
 --- /dev/null
 +++ b/android/AndroidManifest.xml
 @@ -0,0 +1,118 @@
 +?xml version='1.0' encoding='utf-8'?
 +manifest xmlns:android=http://schemas.android.com/apk/res/android;
 +package=org.subsurface
 +android:installLocation=auto
 +android:versionCode=1
 +android:versionName=1.0 
 +
 +application
 +android:name=org.qtproject.qt5.android.bindings.QtApplication
 +android:hardwareAccelerated=true
 +android:label=@string/app_name
 +android:icon=@drawable/subsurface_icon 
 +activity
 +android:name=org.qtproject.qt5.android.bindings.QtActivity
 +
 android:configChanges=orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation
 +android:label=@string/app_name
 +android:launchMode=singleTop
 +android:screenOrientation=sensorLandscape 

I'm not sure about locking the beast to landscape. On my Nexus 5 the app
is about as useful in portrait to.

...

 diff --git a/android/res/xml/device_filter.xml
 b/android/res/xml/device_filter.xml
 new file mode 100644
 index 000..822680b
 --- /dev/null
 +++ b/android/res/xml/device_filter.xml
 @@ -0,0 +1,16 @@
 +?xml version=1.0 encoding=utf-8?
 +
 +resources
 +!-- FTDI Chips --
 +!-- (Smart Interface), Heinrichs Weikamp --
 +usb-device vendor-id=1027 product-id=24577/
 +usb-device vendor-id=1027 product-id=24592/
 +usb-device vendor-id=1027 product-id=24593/
 +!-- Oceanic Custom PID --
 +usb-device vendor-id=1027 product-id=62560/
 +!-- Suunto Custom PID --
 +usb-device vendor-id=1027 product-id=63104/
 +!-- Cressi (Leonardo) Custom PID --
 +usb-device vendor-id=1027 product-id=63104/
 +/resources
 +

Another trailing newline here.


The rest of it looks good to me.


//Anton

-- 
Anton Lundin+46702-161604

Re: Request for help to import data from J-Trak to SubSurface

2014-06-24 Thread Linus Torvalds
On Thu, Jun 19, 2014 at 12:20 AM, Emmanuelle QUILLEROU
emmanuelle_quille...@yahoo.fr wrote:

 I have a J-Trak file with 8 dives on my old MacBook (10.5) that I would like
 to transfer to SubSurface (v. 4.0.3 on a MacBook Air 10.9.3).

 - I have exported the dive details from JTrak as a csv file with the depth
 and temperatures but the import option on SubSurface for PC (lastest version
 for Windows 7) does not seem to work on my desktop. I made sure the column
 numbers are correct (whether changing teh default numbers in SubSurface or
 editing the csv file so that it matches the default column numbers)

Would you mind posting the CSV file publicly so that we can play
around it and see what the problem ends up being? That would make it a
lot easier for people to see what the issue might be..

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


[PATCH] Make ascent rate user configurable

2014-06-24 Thread Robert C. Helling


0001-Hook-up-UI-elements-for-ascent-rates-to-planner.patch
Description: Binary data
Hi,

this patch hooks up existing UI elements to code changing the ascent rates used 
by the planner.

Best
Robert

--  
.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oO 
Robert C. Helling Elite Master Course Theoretical and Mathematical Physics  
  Scientific Coordinator   
  Ludwig Maximilians Universitaet Muenchen, Dept. Physik
print Just another   Phone: +49 89 2180-4523  Theresienstr. 39, rm. B339   
stupid .sig\n;   http://www.atdotde.de 

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


Re: [PATCH] Template for subsurface android package

2014-06-24 Thread Dirk Hohndel
On Tue, Jun 24, 2014 at 10:41:45PM +0200, Anton Lundin wrote:
 On 24 June, 2014 - Dirk Hohndel wrote:
 
  Just like I asked Miika - I would prefer to get these with SOB's from your
  mentor.
  
  Andton, would you be able to do that? This way I know which patches the
  mentor has reviewed and considers ready to make it into master.
  
 
 NP.
 
 Here you go, the nicely updated version after the last review.

Great, thanks.

I'll push that in a minute.

What's missing for me now is an INSTALL.Android that tells the uninitiated
how to build for Android :-)

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