Re: Undo some broken CCR features
On 17/11/2014 22:58, Dirk Hohndel wrote:
A few questions...
a - why are there two different commit messages?
On Mon, Nov 17, 2014 at 09:19:20PM +0200, Willem Ferguson wrote:
Undo some features that were broken in Robert's patch 0d7c192e:
1) Calculate correct partial pressure of oxygen to be plotted on
dive profile, taking into account the oxygen sensor data.
Currently, erroneously, OC PO2 values are shown, due to an
erroneous calling parameter to fill_pressures().
2) Read start and end cylinder pressured correctly. In Robert's
patch, some wrong assignments were done in file.c. This is
now corrected and the correct cylinder pressures are shown in
the equipment tab.
3) Write correct cylinder pressures to XML. Currently the data for
the two cylinder are written to XML the wrong way round
(diluent pressures = oxygen and vice versa).
Expand XML output:
1) Write oxygen sensor data to XML
2) Write no_of_02sensors to XML
Signed-off-by: willem ferguson
From 8a4121607a4259fc5a2651eb815a340fd81d5034 Mon Sep 17 00:00:00 2001
From: willem ferguson
Date: Mon, 17 Nov 2014 21:04:36 +0200
Subject: [PATCH] Undo some features that were broken in Robert's patch
0d7c192e:
1) Calculate correct partial pressure of oxygen to be plotted on
dive profile, taking into account the oxygen sensor data.
Currently, erroneously, OC PO2 values are shown, due to an
erroneous calling parameter to fill_pressures().
2) Read start and end cylinder pressured correctly. In Robert's
patch, some wrong assignments wer done in file.c. This is
now corrected and the correct cylinder pressures are shown in
the equipment tab.
Expand XML output:
1) Write oxygen sensor data to XML
2) Write no_of_02sensors to XML
Signed-off-by: willem ferguson
The first one is what you wrote in the email, the second one is the commit
message that you gave when committing the patch. Why do you do that twice
instead of just sending the commit?
In future I will just send the commit.
diff --git a/file.c b/file.c
index 97095fd..4fe4d35 100644
--- a/file.c
+++ b/file.c
@@ -597,7 +597,7 @@ int parse_txt_file(const char *filename, const char *csv)
case 13:
add_sample_data(sample,
POSEIDON_O2CYLINDER, value);
if (!o2cylinder_pressure) {
-
dive->cylinder[1].sample_start.mbar = value * 1000;
+
dive->cylinder[0].sample_start.mbar = value * 1000;
o2cylinder_pressure =
value;
} else
o2cylinder_pressure =
value;
BTW: I wanted to comment on this one before. This is SO UGLY.
if you have braces on one side of the else, have them on both sides.
This is not my code
diff --git a/profile.c b/profile.c
index 63023b5..8e43c21 100644
--- a/profile.c
+++ b/profile.c
@@ -905,7 +905,7 @@ static void calculate_gas_information_new(struct dive
*dive, struct plot_info *p
amb_pressure = depth_to_mbar(entry->depth, dive) / 1000.0;
- fill_pressures(&entry->pressures, amb_pressure, &dive->cylinder[cylinderindex].gasmix, entry->pressures.o2, dive->dc.dctype, entry->sac);
+ fill_pressures(&entry->pressures, amb_pressure,
&dive->cylinder[cylinderindex].gasmix, entry->o2pressure, dive->dc.dctype, entry->sac);
fn2 = (int) (1000.0 * entry->pressures.n2 / amb_pressure);
fhe = (int) (1000.0 * entry->pressures.he / amb_pressure);
hmm, so what IS the difference between entry->pressures.o2 and
enry->o2pressure?
entry->o2pressure holds the consensus PO2 after considering the data
from the different oxygen sensors. It is the variable that is used for
plotting in the dive profile. entry->o2pressure is calculated before
pressures.o2. The call above to fill_pressures() is the one that
actually computes pressures.o2. I assume one should not use pressures.o2
as a parameter in a call to a function that calculates pressures.o2??
diff --git a/save-xml.c b/save-xml.c
index 52582db..cf7ccfe 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -254,6 +254,21 @@ static void save_sample(struct membuffer *b, struct sample
*sample, struct sampl
old->cns = sample->cns;
}
+ if ((sample->o2sensor[0].mbar) && (sample->o2sensor[0].mbar != old->o2sensor[0].mbar)) {
+ put_milli(b, " sensor1='", sample->o2sensor[0].mbar, " bar'");
+ old->o2sensor[0] = sample->o2sensor[0];
+ }
+
+ if ((sample->o2sensor[1].mbar) && (sample->o2sensor[1].mbar !=
old->o2sensor[1].mbar)) {
+ put_milli(b, " sensor2='", sample->o2sensor[1].mbar, " bar'");
+ old->o2sensor[1] = sample->o2sensor[1];
+ }
+
+ if ((sample->o
git save requires existing repository
Linus, can you remind me of the rationale why you did this? I obviously didn't get around writing a better UI for git saves (huge surprise), but when I just looked through the code to help Miika figure out how to test it, I realized that I thought we talked about Subsurface simply creating a new repository if there isn't onw - but then I can't remember why we aren't doing that. Thanks /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
[PATCH] eon steel
First patch limits the EON steel pressure and temperature samples to
somewhat sensible values. (I still need to dig into this more to understand
where the bogus data comes from, is it my parsing or is it in the DB.)
The second removes some unused variables from the DM5 import.
miika
From 48692396bf7cd616c42fbb97e0698badd3302a3e Mon Sep 17 00:00:00 2001
From: Miika Turkia
Date: Tue, 18 Nov 2014 11:05:07 +0545
Subject: [PATCH 2/2] Remove unused variables
Signed-off-by: Miika Turkia
---
parse-xml.c | 6 --
1 file changed, 6 deletions(-)
diff --git a/parse-xml.c b/parse-xml.c
index 37d1c25..0223611 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2016,9 +2016,6 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
{
int i, interval, retval = 0;
sqlite3 *handle = (sqlite3 *)param;
- float *profileBlob;
- unsigned char *tempBlob;
- int *pressureBlob;
unsigned const char *sampleBlob;
char *err = NULL;
char get_events_template[] = "select * from Mark where DiveId = %d";
@@ -2084,9 +2081,6 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
cur_dive->dc.surface_pressure.mbar = (atoi(data[14]) * 1000);
interval = data[16] ? atoi(data[16]) : 0;
- profileBlob = (float *)(data[17] + 3);
- tempBlob = (unsigned char *)(data[17] + 10);
- pressureBlob = (int *)(data[17] + 7);
sampleBlob = (unsigned const char *)data[17];
for (i = 0; interval && i * interval < cur_dive->duration.seconds; i++) {
float *depth = (float *)&sampleBlob[i * 16 + 3];
--
1.9.1
From 7786ee0c645d8687fa2ab1fe5328c29faaf39932 Mon Sep 17 00:00:00 2001
From: Miika Turkia
Date: Sun, 16 Nov 2014 13:18:17 +0530
Subject: [PATCH 1/2] Limit pressure and temperature values
Limit temperatures and cylinder pressures to somewhat sensible values.
Signed-off-by: Miika Turkia
---
parse-xml.c | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/parse-xml.c b/parse-xml.c
index 79fd496..37d1c25 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -2090,15 +2090,20 @@ extern int dm5_dive(void *param, int columns, char **data, char **column)
sampleBlob = (unsigned const char *)data[17];
for (i = 0; interval && i * interval < cur_dive->duration.seconds; i++) {
float *depth = (float *)&sampleBlob[i * 16 + 3];
-
int32_t temp = (sampleBlob[i * 16 + 10] << 8) + sampleBlob[i * 16 + 11];
int32_t pressure = (sampleBlob[i * 16 + 9] << 16) + (sampleBlob[i * 16 + 8] << 8) + sampleBlob[i * 16 + 7];
sample_start();
cur_sample->time.seconds = i * interval;
cur_sample->depth.mm = depth[0] * 1000;
- cur_sample->temperature.mkelvin = C_to_mkelvin(temp);
- cur_sample->cylinderpressure.mbar = pressure;
+ /*
+ * Limit temperatures and cylinder pressures to somewhat
+ * sensible values
+ */
+ if (temp >= -10 && temp < 50)
+ cur_sample->temperature.mkelvin = C_to_mkelvin(temp);
+ if (pressure >= 0 && pressure < 35)
+ cur_sample->cylinderpressure.mbar = pressure;
sample_end();
}
--
1.9.1
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: 4.3 Beta 1
On Mon, Nov 17, 2014 at 11:41:12PM +, Dirk Hohndel wrote: > Windows installers are on the serer in the download area (not daily, the > real download area). Patches and tag are pushed. > > I will post announcements soon. Unfortunately for certain reasons (don't ask) > I can't create a Mac DMG right now, so until that's fixed this is Windows > only (and Linux from source). And now the Mac DMG is in the Dowloads area as well. /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
4.3 Beta 1
Windows installers are on the serer in the download area (not daily, the real download area). Patches and tag are pushed. I will post announcements soon. Unfortunately for certain reasons (don't ask) I can't create a Mac DMG right now, so until that's fixed this is Windows only (and Linux from source). Major thanks goes to... Tomaz - for implementing the 4.3 killer feature Davide - for designing said feature and being persistent enough that it actually ended up being implemented as he envisioned things Anton & Joshua - for the work on the dive computer configuration (and much more) Gehad - for the HTML exporter Miika, Robert, Willem, Lubomir & everyone else for all the hard work you put into making this project fun and exciting. And of course for Linus, for getting this all started and for still hanging around and sending the occasional patch... I'm sure I forgot a ton of things. In the ReleaseNotes. In the README. Everywhere. Hey, just found the first oops. The ReleaseNotes still say "Experimental CCR and PSCR support: (someone explain what does and does not work, please)" But hey, it's only Beta 1. It's not supposed to be perfect. Send patches :-) /D git shortlog -s -n v4.2.. 178 Dirk Hohndel (bogus number, contains translations and random other stuff) 86 Tomaz Canabrava 80 Anton Lundin 34 Gehad Elrobey 34 Joshua Wambua 29 Miika Turkia 24 Robert Helling 24 Willem Ferguson 21 Lubomir I. Ivanov 14 Giuseppe Bilotta 14 John Van Ostrand 9 Tim Wootton 8 Linus Torvalds 7 Salvo 'LtWorf' Tomaselli 5 Thiago Macieira 4 Salvador Cuñat 1 Florian Klink 1 Gaetan Bisson 1 Joakim Bygdell 1 Karina Mochetti ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: INSTALL file
On 11/17/2014 01:56 PM, Lubomir I. Ivanov wrote: On 17 November 2014 23:53, Lubomir I. Ivanov wrote: On 17 November 2014 23:49, Steve Butler wrote: Looks like I need to find a non-Canonical source to update. Is there another PPA to which I can point for a later version? that should be it: https://marble.kde.org/sources.php but perhaps it would be best to remove all marble related packages first. not the exact answer to the question, i admit. perhaps there are alternative and compatible PPA, if not, you may have to built from the sources which is a bit of task. lubomir -- And makes my learning curve steeper! At least I spent the last couple of decades running Oracle databases on *Nix boxes. For sure, c++ isn't PL/SQL. Now to catch the train home. ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: INSTALL file
On 17 November 2014 23:53, Lubomir I. Ivanov wrote: > On 17 November 2014 23:49, Steve Butler wrote: >> >> Looks like I need to find a non-Canonical source to update. Is there >> another PPA to which I can point for a later version? >> > > that should be it: > https://marble.kde.org/sources.php > > but perhaps it would be best to remove all marble related packages first. > not the exact answer to the question, i admit. perhaps there are alternative and compatible PPA, if not, you may have to built from the sources which is a bit of task. lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: INSTALL file
On 11/17/2014 01:45 PM, Lubomir I. Ivanov wrote: qmake "DEFINES += NO_MARBLE" make clean make Yes, that did work. Sounds like a newer version of qtCreator is needed on my box. ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: INSTALL file
On 17 November 2014 23:49, Steve Butler wrote: > > On 11/17/2014 01:33 PM, Lubomir I. Ivanov wrote: >> >> On 17 November 2014 23:10, Steve Butler wrote: >>> >>> >>> ->make | tee -a ~/steve.txt >>> <> >>> linking subsurface >>> .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 >>> make: *** [subsurface] Error 1 >>> Makefile:523: recipe for target 'subsurface' failed >>> >> does the same happen if you first run "make clean", before "make"? > > > Yes. Same message set. > >> what version of Qt are you using?: "qmake --version" >> also what does "dpkg --list | grep marble" shows? > > -->qmake --version > QMake version 3.0 > Using Qt version 5.3.0 in /usr/lib/x86_64-linux-gnu > > > --> dpkg --list | grep marble > ii libmarble-dev 4:4.14.1-0ubuntu2 amd64 > development files for the Marble globe widget library > rc libmarblewidget18 4:4.13.3-0ubuntu0.1 amd64 > Marble globe widget library > ii libmarblewidget19 4:4.14.1-0ubuntu2 amd64 > Marble globe widget library > ii marble-data 4:4.14.1-0ubuntu2 all > data files for Marble > ii marble-plugins 4:4.14.1-0ubuntu2 amd64 > plugins for Marble > ii marble-qt 4:4.14.1-0ubuntu2 amd64globe > and map widget (no KDE dependencies) > > yeah, i think the versions are clashing. you are building with Qt5 and 14.10 has the Marble-dev packages built with Qt4. (or at least that's what i've gathered from their log file) > Software center reports qtCreater: qtcreator 3.1.1-0ubuntu4 >> >> to me, the following links show that marble 4.4.13 (which seems like >> the latest?) is built using Qt4: >> which is relevant to the issue...as they are using the QMetaMethod >> thing in Qt >= 5.0. >> >> > > Looks like I need to find a non-Canonical source to update. Is there > another PPA to which I can point for a later version? > that should be it: https://marble.kde.org/sources.php but perhaps it would be best to remove all marble related packages first. lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: INSTALL file
On 11/17/2014 01:33 PM, Lubomir I. Ivanov wrote: On 17 November 2014 23:10, Steve Butler wrote: ->make | tee -a ~/steve.txt <> linking subsurface .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 make: *** [subsurface] Error 1 Makefile:523: recipe for target 'subsurface' failed does the same happen if you first run "make clean", before "make"? Yes. Same message set. what version of Qt are you using?: "qmake --version" also what does "dpkg --list | grep marble" shows? -->qmake --version QMake version 3.0 Using Qt version 5.3.0 in /usr/lib/x86_64-linux-gnu --> dpkg --list | grep marble ii libmarble-dev 4:4.14.1-0ubuntu2 amd64development files for the Marble globe widget library rc libmarblewidget18 4:4.13.3-0ubuntu0.1 amd64Marble globe widget library ii libmarblewidget19 4:4.14.1-0ubuntu2 amd64Marble globe widget library ii marble-data 4:4.14.1-0ubuntu2 all data files for Marble ii marble-plugins 4:4.14.1-0ubuntu2 amd64plugins for Marble ii marble-qt 4:4.14.1-0ubuntu2 amd64 globe and map widget (no KDE dependencies) Software center reports qtCreater: qtcreator 3.1.1-0ubuntu4 to me, the following links show that marble 4.4.13 (which seems like the latest?) is built using Qt4: which is relevant to the issue...as they are using the QMetaMethod thing in Qt >= 5.0. Looks like I need to find a non-Canonical source to update. Is there another PPA to which I can point for a later version? --Steve ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: INSTALL file
On 17 November 2014 23:10, Steve Butler wrote: > linking subsurface > .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 > make: *** [subsurface] Error 1 > Makefile:523: recipe for target 'subsurface' failed > BTW, since everything else compiles you can try disabling Marble (the globe widget) if you can't solve the issue. qmake "DEFINES += NO_MARBLE" make clean make lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: INSTALL file
On 17 November 2014 23:10, Steve Butler wrote: > > On 11/16/2014 10:29 PM, Dirk Hohndel wrote: >> >> Could some of you who build from source on various flavors of Linux and >> Mac check the INSTALL file and make sure it's still accurate / send >> updates? >> >> Thanks, that would really help me. >> > Still learning c++ and git. In other words a "greenhorn". But still unable > to build from source. The make step fails. In 6-8 months I should be more > helpful. In the meantime, gasping for air! > > Anybody else using Ubuntu 14.10? > > Did: > ->git status > On branch master > Your branch is behind 'origin/master' by 20 commits, and can be > fast-forwarded. > (use "git pull" to update your local branch) > nothing to commit, working directory clean > > ->git pull > First, rewinding head to replay your work on top of it... > Fast-forwarded master to 25072b60ce6407044820dba043f07247f5acf226. > > ->qmake > > ->make | tee -a ~/steve.txt > <> > linking subsurface > .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 > make: *** [subsurface] Error 1 > Makefile:523: recipe for target 'subsurface' failed > does the same happen if you first run "make clean", before "make"? what version of Qt are you using?: "qmake --version" also what does "dpkg --list | grep marble" shows? to me, the following links show that marble 4.4.13 (which seems like the latest?) is built using Qt4: https://launchpadlibrarian.net/172518437/buildlog_ubuntu-trusty-amd64.marble_4%3A4.13.0-0ubuntu1_UPLOADING.txt.gz https://launchpad.net/ubuntu/+source/marble/4:4.13.0-0ubuntu1/+build/5898243 also i can see the following recent change in MarbleWidget.h: #if QT_VERSION < 0x05 void connectNotify( const char * signal ); void disconnectNotify( const char * signal ); #else virtual void connectNotify(const QMetaMethod &signal); virtual void disconnectNotify(const QMetaMethod &signal); #endif which is relevant to the issue...as they are using the QMetaMethod thing in Qt >= 5.0. lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Patches
On Mon, Nov 17, 2014 at 10:08:29PM +0100, Davide DB wrote: > Yes. Exactly Done. Just to keep our Chief User Experience Designer happy :-) /D > Il 17/nov/2014 22:06 "Dirk Hohndel" ha scritto: > > > On Mon, Nov 17, 2014 at 03:59:52PM +0100, Davide DB wrote: > > > I would have a smaaalll improvement if it is not difficult nor too late: > > > > > > Populating the tag list ONLY with the tag effectively used :) > > > > Are you trying to say "don't list tags with a count of 0" ? > > > > /D > > > ___ > 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: INSTALL file
On 11/16/2014 10:29 PM, Dirk Hohndel wrote: Could some of you who build from source on various flavors of Linux and Mac check the INSTALL file and make sure it's still accurate / send updates? Thanks, that would really help me. Still learning c++ and git. In other words a "greenhorn". But still unable to build from source. The make step fails. In 6-8 months I should be more helpful. In the meantime, gasping for air! Anybody else using Ubuntu 14.10? Did: ->git status On branch master Your branch is behind 'origin/master' by 20 commits, and can be fast-forwarded. (use "git pull" to update your local branch) nothing to commit, working directory clean ->git pull First, rewinding head to replay your work on top of it... Fast-forwarded master to 25072b60ce6407044820dba043f07247f5acf226. ->qmake ->make | tee -a ~/steve.txt <> linking subsurface .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 make: *** [subsurface] Error 1 Makefile:523: recipe for target 'subsurface' failed /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_source.ts -qm translations/subsurface_source.qm Warning: ignoring element Updating 'translations/subsurface_source.qm'... Generated 0 translation(s) (0 finished and 0 unfinished) Ignored 1227 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_bg_BG.ts -qm translations/subsurface_bg_BG.qm Warning: ignoring element Updating 'translations/subsurface_bg_BG.qm'... Generated 1217 translation(s) (1217 finished and 0 unfinished) Ignored 10 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_da_DK.ts -qm translations/subsurface_da_DK.qm Warning: ignoring element Updating 'translations/subsurface_da_DK.qm'... Generated 1016 translation(s) (1016 finished and 0 unfinished) Ignored 211 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_de_CH.ts -qm translations/subsurface_de_CH.qm Warning: ignoring element Updating 'translations/subsurface_de_CH.qm'... Generated 945 translation(s) (945 finished and 0 unfinished) Ignored 282 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_de_DE.ts -qm translations/subsurface_de_DE.qm Warning: ignoring element Updating 'translations/subsurface_de_DE.qm'... Generated 1214 translation(s) (1214 finished and 0 unfinished) Ignored 13 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_el_GR.ts -qm translations/subsurface_el_GR.qm Warning: ignoring element Updating 'translations/subsurface_el_GR.qm'... Generated 543 translation(s) (543 finished and 0 unfinished) Ignored 684 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_en_GB.ts -qm translations/subsurface_en_GB.qm Warning: ignoring element Updating 'translations/subsurface_en_GB.qm'... Generated 1216 translation(s) (1216 finished and 0 unfinished) Ignored 11 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_es_ES.ts -qm translations/subsurface_es_ES.qm Warning: ignoring element Updating 'translations/subsurface_es_ES.qm'... Generated 1217 translation(s) (1217 finished and 0 unfinished) Ignored 10 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_et_EE.ts -qm translations/subsurface_et_EE.qm Warning: ignoring element Updating 'translations/subsurface_et_EE.qm'... Generated 942 translation(s) (942 finished and 0 unfinished) Ignored 285 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_fi_FI.ts -qm translations/subsurface_fi_FI.qm Warning: ignoring element Updating 'translations/subsurface_fi_FI.qm'... Generated 1208 translation(s) (1208 finished and 0 unfinished) Ignored 19 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_fr_FR.ts -qm translations/subsurface_fr_FR.qm Warning: ignoring element Updating 'translations/subsurface_fr_FR.qm'... Generated 1149 translation(s) (1149 finished and 0 unfinished) Ignored 78 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_he.ts -qm translations/subsurface_he.qm Warning: ignoring element Updating 'translations/subsurface_he.qm'... Generated 502 translation(s) (502 finished and 0 unfinished) Ignored 725 untranslated source text(s) /usr/lib/x86_64-linux-gnu/qt5/bin/lrelease translations/subsurface_hu.ts -qm translations/subsurface_hu.qm Warning: igno
Re: Patches
Yes. Exactly davide@mobile Il 17/nov/2014 22:06 "Dirk Hohndel" ha scritto: > On Mon, Nov 17, 2014 at 03:59:52PM +0100, Davide DB wrote: > > I would have a smaaalll improvement if it is not difficult nor too late: > > > > Populating the tag list ONLY with the tag effectively used :) > > Are you trying to say "don't list tags with a count of 0" ? > > /D > ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Patches
On Mon, Nov 17, 2014 at 03:59:52PM +0100, Davide DB wrote: > I would have a smaaalll improvement if it is not difficult nor too late: > > Populating the tag list ONLY with the tag effectively used :) Are you trying to say "don't list tags with a count of 0" ? /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: [PATCH] Ruler: fix weird behaviour near x = 0
Nice catch. Thanks /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
[PATCH] Ruler: fix weird behaviour near x = 0
From: "Lubomir I. Ivanov"
RulerNodeItem2::recalculate() does something which is
apparently not a good idea in combination with
RulerNodeItem2::mouseMoveEvent().
Each time the mouse moves, setPos() is called. Then in
recalculate() the x() value is checked and if less than 0
it's changed to x = 0 (setPos(0, y());).
This last call (setPos(0, y());)
however does not work and the value remains less than zero
leaving one of the ruler points outside of the graph.
To solve the issue we add a silly explicit check if x() < 0
before calling setPos() in RulerNodeItem2::mouseMoveEvent().
The 'x() > timeAxis->posAtValue(data->sec)' strangely works
on the other hand.
Signed-off-by: Lubomir I. Ivanov
---
This looks like non-sense but you can observe it yourself
with some qDebug() calls. The order of calls does not follow
what should happen. I'm guessing concurency or something else
at play?
---
qt-ui/profile/ruleritem.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/qt-ui/profile/ruleritem.cpp b/qt-ui/profile/ruleritem.cpp
index 0bf97f9..c6cab22 100644
--- a/qt-ui/profile/ruleritem.cpp
+++ b/qt-ui/profile/ruleritem.cpp
@@ -61,7 +61,9 @@ void RulerNodeItem2::recalculate()
void RulerNodeItem2::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
- setPos(event->scenePos());
+ qreal x = event->scenePos().x();
+ if (x < 0.0) x = 0.0;
+ setPos(x, event->scenePos().y());
recalculate();
ruler->recalculate();
}
--
1.7.11.msysgit.0
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Undo some broken CCR features
A few questions...
a - why are there two different commit messages?
On Mon, Nov 17, 2014 at 09:19:20PM +0200, Willem Ferguson wrote:
> Undo some features that were broken in Robert's patch 0d7c192e:
>
> 1) Calculate correct partial pressure of oxygen to be plotted on
>dive profile, taking into account the oxygen sensor data.
>Currently, erroneously, OC PO2 values are shown, due to an
>erroneous calling parameter to fill_pressures().
> 2) Read start and end cylinder pressured correctly. In Robert's
>patch, some wrong assignments were done in file.c. This is
>now corrected and the correct cylinder pressures are shown in
>the equipment tab.
> 3) Write correct cylinder pressures to XML. Currently the data for
>the two cylinder are written to XML the wrong way round
> (diluent pressures = oxygen and vice versa).
>
> Expand XML output:
> 1) Write oxygen sensor data to XML
> 2) Write no_of_02sensors to XML
>
> Signed-off-by: willem ferguson
>
> From 8a4121607a4259fc5a2651eb815a340fd81d5034 Mon Sep 17 00:00:00 2001
> From: willem ferguson
> Date: Mon, 17 Nov 2014 21:04:36 +0200
> Subject: [PATCH] Undo some features that were broken in Robert's patch
> 0d7c192e:
>
> 1) Calculate correct partial pressure of oxygen to be plotted on
>dive profile, taking into account the oxygen sensor data.
>Currently, erroneously, OC PO2 values are shown, due to an
>erroneous calling parameter to fill_pressures().
> 2) Read start and end cylinder pressured correctly. In Robert's
>patch, some wrong assignments wer done in file.c. This is
>now corrected and the correct cylinder pressures are shown in
>the equipment tab.
>
> Expand XML output:
> 1) Write oxygen sensor data to XML
> 2) Write no_of_02sensors to XML
>
> Signed-off-by: willem ferguson
The first one is what you wrote in the email, the second one is the commit
message that you gave when committing the patch. Why do you do that twice
instead of just sending the commit?
> diff --git a/file.c b/file.c
> index 97095fd..4fe4d35 100644
> --- a/file.c
> +++ b/file.c
> @@ -597,7 +597,7 @@ int parse_txt_file(const char *filename, const char *csv)
> case 13:
> add_sample_data(sample,
> POSEIDON_O2CYLINDER, value);
> if (!o2cylinder_pressure) {
> -
> dive->cylinder[1].sample_start.mbar = value * 1000;
> +
> dive->cylinder[0].sample_start.mbar = value * 1000;
> o2cylinder_pressure =
> value;
> } else
> o2cylinder_pressure =
> value;
BTW: I wanted to comment on this one before. This is SO UGLY.
if you have braces on one side of the else, have them on both sides.
> diff --git a/profile.c b/profile.c
> index 63023b5..8e43c21 100644
> --- a/profile.c
> +++ b/profile.c
> @@ -905,7 +905,7 @@ static void calculate_gas_information_new(struct dive
> *dive, struct plot_info *p
>
> amb_pressure = depth_to_mbar(entry->depth, dive) / 1000.0;
>
> - fill_pressures(&entry->pressures, amb_pressure,
> &dive->cylinder[cylinderindex].gasmix, entry->pressures.o2, dive->dc.dctype,
> entry->sac);
> + fill_pressures(&entry->pressures, amb_pressure,
> &dive->cylinder[cylinderindex].gasmix, entry->o2pressure, dive->dc.dctype,
> entry->sac);
> fn2 = (int) (1000.0 * entry->pressures.n2 / amb_pressure);
> fhe = (int) (1000.0 * entry->pressures.he / amb_pressure);
>
hmm, so what IS the difference between entry->pressures.o2 and
enry->o2pressure?
> diff --git a/save-xml.c b/save-xml.c
> index 52582db..cf7ccfe 100644
> --- a/save-xml.c
> +++ b/save-xml.c
> @@ -254,6 +254,21 @@ static void save_sample(struct membuffer *b, struct
> sample *sample, struct sampl
> old->cns = sample->cns;
> }
>
> + if ((sample->o2sensor[0].mbar) && (sample->o2sensor[0].mbar !=
> old->o2sensor[0].mbar)) {
> + put_milli(b, " sensor1='", sample->o2sensor[0].mbar, " bar'");
> + old->o2sensor[0] = sample->o2sensor[0];
> + }
> +
> + if ((sample->o2sensor[1].mbar) && (sample->o2sensor[1].mbar !=
> old->o2sensor[1].mbar)) {
> + put_milli(b, " sensor2='", sample->o2sensor[1].mbar, " bar'");
> + old->o2sensor[1] = sample->o2sensor[1];
> + }
> +
> + if ((sample->o2sensor[2].mbar) && (sample->o2sensor[2].mbar !=
> old->o2sensor[2].mbar)) {
> + put_milli(b, " sensor3='", sample->o2sensor[2].mbar, " bar'");
> + old->o2sensor[2] = sample->o2sensor[2];
> + }
> +
> if (sample->setpoint.mbar != old->setpoint.mbar) {
> put_milli(b, " po2='", sample->setpoint.mbar, " bar'");
>
Re: some changes to the stats tab
I've just updated IT translation for the new tooltips On Mon, Nov 17, 2014 at 8:02 PM, Dirk Hohndel wrote: > Since the stats tab apparently caused confusion (especially with only one > dive selected), I made a few changes and added more tooltips. I think this > is much clearer now, but unfortunately this added a few new strings that > need to be translated. > > I don't worry so much about Beta 1, but just keep this in mind if you are > one of the people helping to get things translated for the 4.3 release. > > I just kicked of a new set of Windows builds which should be on the server > shortly (-569). Assuming I don't stumble into anything really annoying > over the next hour or two I hope this can finally become the long delayed > Beta 1. > > > /D > ___ > subsurface mailing list > subsurface@subsurface-divelog.org > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Plotting both CCR cylinders
On Mon, Nov 17, 2014 at 4:24 PM, Robert C. Helling wrote: > > On 17 Nov 2014, at 17:56, Tomaz Canabrava wrote: > > Tomaz, > > The curve of the first polygon should be separated or should e a single > curve for all cylinders? > > > I do not really understand the question. When using a CCR, the diver is > breathing gas from two cylinders simultaneously: One that is like the usual > one (in this case called diluent) and a second one containing pure oxygen. > So, while the diver is in CCR mode, there should be two lines representing > the two cylinders. I am not sure that plotting them in the same coordinate > system (as done now) is optimal since they overlap, but otherwise might > take up too much space. > > Does that help? > A bit: Right now they are not just on the same coordiante system, they are the same 'visual item representation', both are painted in the same paint-layer. I don't know if this is wanted, it certainly works. > > 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@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Undo some broken CCR features
Undo some features that were broken in Robert's patch 0d7c192e:
1) Calculate correct partial pressure of oxygen to be plotted on
dive profile, taking into account the oxygen sensor data.
Currently, erroneously, OC PO2 values are shown, due to an
erroneous calling parameter to fill_pressures().
2) Read start and end cylinder pressured correctly. In Robert's
patch, some wrong assignments were done in file.c. This is
now corrected and the correct cylinder pressures are shown in
the equipment tab.
3) Write correct cylinder pressures to XML. Currently the data for
the two cylinder are written to XML the wrong way round
(diluent pressures = oxygen and vice versa).
Expand XML output:
1) Write oxygen sensor data to XML
2) Write no_of_02sensors to XML
Signed-off-by: willem ferguson
>From 8a4121607a4259fc5a2651eb815a340fd81d5034 Mon Sep 17 00:00:00 2001
From: willem ferguson
Date: Mon, 17 Nov 2014 21:04:36 +0200
Subject: [PATCH] Undo some features that were broken in Robert's patch
0d7c192e:
1) Calculate correct partial pressure of oxygen to be plotted on
dive profile, taking into account the oxygen sensor data.
Currently, erroneously, OC PO2 values are shown, due to an
erroneous calling parameter to fill_pressures().
2) Read start and end cylinder pressured correctly. In Robert's
patch, some wrong assignments wer done in file.c. This is
now corrected and the correct cylinder pressures are shown in
the equipment tab.
Expand XML output:
1) Write oxygen sensor data to XML
2) Write no_of_02sensors to XML
Signed-off-by: willem ferguson
---
file.c | 4 ++--
profile.c | 2 +-
save-xml.c | 21 +++--
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/file.c b/file.c
index 97095fd..4fe4d35 100644
--- a/file.c
+++ b/file.c
@@ -597,7 +597,7 @@ int parse_txt_file(const char *filename, const char *csv)
case 13:
add_sample_data(sample, POSEIDON_O2CYLINDER, value);
if (!o2cylinder_pressure) {
- dive->cylinder[1].sample_start.mbar = value * 1000;
+ dive->cylinder[0].sample_start.mbar = value * 1000;
o2cylinder_pressure = value;
} else
o2cylinder_pressure = value;
@@ -605,7 +605,7 @@ int parse_txt_file(const char *filename, const char *csv)
case 14:
add_sample_data(sample, POSEIDON_PRESSURE, value);
if (!cylinder_pressure) {
- dive->cylinder[0].sample_start.mbar = value * 1000;
+ dive->cylinder[1].sample_start.mbar = value * 1000;
cylinder_pressure = value;
} else
cylinder_pressure = value;
diff --git a/profile.c b/profile.c
index 63023b5..8e43c21 100644
--- a/profile.c
+++ b/profile.c
@@ -905,7 +905,7 @@ static void calculate_gas_information_new(struct dive *dive, struct plot_info *p
amb_pressure = depth_to_mbar(entry->depth, dive) / 1000.0;
- fill_pressures(&entry->pressures, amb_pressure, &dive->cylinder[cylinderindex].gasmix, entry->pressures.o2, dive->dc.dctype, entry->sac);
+ fill_pressures(&entry->pressures, amb_pressure, &dive->cylinder[cylinderindex].gasmix, entry->o2pressure, dive->dc.dctype, entry->sac);
fn2 = (int) (1000.0 * entry->pressures.n2 / amb_pressure);
fhe = (int) (1000.0 * entry->pressures.he / amb_pressure);
diff --git a/save-xml.c b/save-xml.c
index 52582db..cf7ccfe 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -214,8 +214,8 @@ static void save_sample(struct membuffer *b, struct sample *sample, struct sampl
put_format(b, " time.seconds, 60));
put_milli(b, " depth='", sample->depth.mm, " m'");
put_temperature(b, sample->temperature, " temp='", " C'");
- put_pressure(b, sample->cylinderpressure, " pressure='", " bar'");
- put_pressure(b, sample->o2cylinderpressure, " pdiluent='", " bar'");
+ put_pressure(b, sample->cylinderpressure, " pdiluent='", " bar'");
+ put_pressure(b, sample->o2cylinderpressure, " pressure='", " bar'");
/*
* We only show sensor information for samples with pressure, and only if it
@@ -254,6 +254,21 @@ static void save_sample(struct membuffer *b, struct sample *sample, struct sampl
old->cns = sample->cns;
}
+ if ((sample->o2sensor[0].mbar) && (sample->o2sensor[0].mbar != old->o2sensor[0].mbar)) {
+ put_milli(b, " sensor1='", sample->o2sensor[0].mbar, " bar'");
+ old->o2sensor[0] = sample->o2sensor[0];
+ }
+
+ if ((sample->o2sensor[1].mbar) && (sample->o2sensor[1].mbar != old->o2sensor[1].mbar)) {
+ put_milli(b, " sensor2='", sample->o2sensor[1].mbar, " bar'");
+ old->o2sensor[1] = sample->o2sensor[1];
+ }
+
+ if ((sample->o2sensor[2].mbar) && (sample->o2sensor[2].mbar != old->o2sensor[2].mbar)) {
+ put_milli(b, " sensor3='", sample->o2sensor[2].mbar, " bar'");
+ old->o2sensor[2] = sample->o2sensor[2];
+ }
+
if (sample->setpoint.mbar != old->setpoint.mbar) {
put_milli(b, " po2='", sample->setpoint.mbar, " bar'");
old->setpoint = sample->setpoint;
@@ -355,6 +370,8 @@ static void save_dc(struct membuffer *b, struct dive *dive, struct divecomputer
some changes to the stats tab
Since the stats tab apparently caused confusion (especially with only one dive selected), I made a few changes and added more tooltips. I think this is much clearer now, but unfortunately this added a few new strings that need to be translated. I don't worry so much about Beta 1, but just keep this in mind if you are one of the people helping to get things translated for the 4.3 release. I just kicked of a new set of Windows builds which should be on the server shortly (-569). Assuming I don't stumble into anything really annoying over the next hour or two I hope this can finally become the long delayed Beta 1. /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Plotting both CCR cylinders
On 17 Nov 2014, at 17:56, Tomaz Canabrava wrote: Tomaz, > The curve of the first polygon should be separated or should e a single curve > for all cylinders? I do not really understand the question. When using a CCR, the diver is breathing gas from two cylinders simultaneously: One that is like the usual one (in this case called diluent) and a second one containing pure oxygen. So, while the diver is in CCR mode, there should be two lines representing the two cylinders. I am not sure that plotting them in the same coordinate system (as done now) is optimal since they overlap, but otherwise might take up too much space. Does that help? 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 signature.asc Description: Message signed with OpenPGP using GPGMail ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Help with translation & Typos
Il 17/nov/2014 18:33 "Dirk Hohndel" ha scritto: > > Yes, the word IS alone. > > If you have a CCR dive, the Cylinder table on the equipment tab will get > an additional column (you can test this with dives/test40.xml). And that > column is called "Use" and the possible values in that column are "OC gas" > "diluent" and "oxygen". > > Does this make more sense now? > > /D Much ado for nothing :) ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Help with translation & Typos
On Mon, Nov 17, 2014 at 04:45:05PM +0100, boret wrote: > On Lunes, 17 de noviembre de 2014 16:39:11 boret escribió: > > On Lunes, 17 de noviembre de 2014 16:19:24 Davide DB escribió: > > > Hi Salva, > > > I cannot swap words here because I'm not a developer. They chose > to > > > use two different strings here. > > > > Sorry Davide, I thought you were translating in transifex. > > > > Cheers! > > > > Salva. > > Ja !!! Have just seen the problem on transifex, the word is alone. > > Sorry again, had not understood the question till now. Yes, the word IS alone. If you have a CCR dive, the Cylinder table on the equipment tab will get an additional column (you can test this with dives/test40.xml). And that column is called "Use" and the possible values in that column are "OC gas" "diluent" and "oxygen". Does this make more sense now? /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Plotting both CCR cylinders
Robert, On Mon, Nov 17, 2014 at 2:45 PM, Robert Helling wrote: > Hi, > > this patch plots both diluent and o2 cylinder pressures for CCR dives. > Tested against test40.xml (although not a > perfect test case given very similar pressures leading to overlapping > plots). > > This needs testing with bailout dives. I don’t have such an example, could > somebody please supply one (i.e. a dive that has > both CCR and OC segments). > Help me understand CCR dives. The curve of the first polygon should be separated or should e a single curve for all cylinders? > 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 > > > > > > ___ > 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
Plotting both CCR cylinders
Hi,this patch plots both diluent and o2 cylinder pressures for CCR dives. Tested against test40.xml (although not a perfect test case given very similar pressures leading to overlapping plots).This needs testing with bailout dives. I don’t have such an example, could somebody please supply one (i.e. a dive that hasboth CCR and OC segments).BestRobert 0001-For-CCR-dives-show-plot-for-diluent-and-O2-cylinder-.patch Description: Binary data -- .oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oOo.oORobert 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.deEnhance your privacy, use cryptography! My PGP keys have fingerprintsA9D1 A01D 13A5 31FA 6515 BB44 0820 367C 36BC 0C1D andDCED 37B6 251C 7861 270D 5613 95C7 9D32 9A8D 9B8F signature.asc Description: Message signed with OpenPGP using GPGMail ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Help with translation & Typos
On Lunes, 17 de noviembre de 2014 16:39:11 boret escribió: > On Lunes, 17 de noviembre de 2014 16:19:24 Davide DB escribió: > > Hi Salva, > > I cannot swap words here because I'm not a developer. They chose to > > use two different strings here. > > Sorry Davide, I thought you were translating in transifex. > > Cheers! > > Salva. Ja !!! Have just seen the problem on transifex, the word is alone. Sorry again, had not understood the question till now. Cheers! Salva. ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Help with translation & Typos
On Lunes, 17 de noviembre de 2014 16:19:24 Davide DB escribió: > > Hi Salva, > I cannot swap words here because I'm not a developer. They chose to > use two different strings here. Sorry Davide, I thought you were translating in transifex. Cheers! Salva. ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Help with translation & Typos
On Mon, Nov 17, 2014 at 4:18 PM, Paul Sargent wrote: > Would "scopo" be reasonable? > Purpose / intent Yes of course but in Italian I would write: "Use of the cylinder" So a completely different construction. So it's not a problem of word translation -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Help with translation & Typos
On Mon, Nov 17, 2014 at 4:13 PM, Salvador Cuñat wrote: > Hi Davide. > > Don't worry about swapping the words, use the correct italian form. I do it > constantly in spanish translation. > I think is much preferable a good translation than the "Tarzan laguage", it > has to be meaningful for the final > italian user (and a bad translation hurts like a red hot nail in an eye). > Hi Salva, I cannot swap words here because I'm not a developer. They chose to use two different strings here. I could give the correct translation only having "Cylinder use" in one string The string containing "cylinder" is used many many times I guess. Bye -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Help with translation & Typos
Would "scopo" be reasonable? Purpose / intent My Italian is hardly polished though. I probably sound like Tarzan and don't know it :-)On 17 Nov 2014 15:06, Davide DB wrote: > > Hummm > So I guess "Cylinder" was reused from another string. > The problem here is that in Italian I cannot concatenae thwo > translated words getting a meaningfull sentence. At least not in this > case. > In Italian "Cylinder Use" would be "Uso della bombola" so I should add > "della" and swapping the words... > For the moment I will just translate Use but the resulting sentence > will be like Tarzan language :) > > On Mon, Nov 17, 2014 at 3:58 PM, Dirk Hohndel wrote: > > On Mon, Nov 17, 2014 at 03:56:57PM +0100, Davide DB wrote: > >> Sorry guys,, > >> > >> Could you give me some hint on the the string "use" > >> > >> ../qt-ui/models.cpp:79 > >> CylindersModel > >> subsurface4 > >> > >> Is it a verb or a nuon? > > > > It's the "Cylinder Use" for CCR dives, i.e., diluent, oxygen or OC gas > > > > /D > > -- > Davide > https://vimeo.com/bocio/videos > ___ > 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: Help with translation & Typos
Hi Davide. 2014-11-17 16:06 GMT+01:00 Davide DB : > > In Italian "Cylinder Use" would be "Uso della bombola" so I should add > "della" and swapping the words... > For the moment I will just translate Use but the resulting sentence > will be like Tarzan language :) > > Don't worry about swapping the words, use the correct italian form. I do it constantly in spanish translation. I think is much preferable a good translation than the "Tarzan laguage", it has to be meaningful for the final italian user (and a bad translation hurts like a red hot nail in an eye). Regards. Salva. ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: [PATCH] Update spanish translation of user manual to english 7967d2b
2014-11-17 15:57 GMT+01:00 Dirk Hohndel : > On Mon, Nov 17, 2014 at 01:50:26PM +0100, Salvador Cuñat wrote: > > Covers CCR APD and Poseidon divelogs and importing. Already changed > > by the time of writing this commit, at least twice. > > Thanks - btw... your patches are missing the path to the > user-manual_es.txt file... they should say > Documentation/user-manual_es.txt, not just user-manial_es.txt > > No big deal, easy to fix here, just thought I'd point it out > Have just realized they weren't patched against master. Atached should apply both of them, (the 002-xxx.patch the second in order) };-) Regards Salva. From 08f5e83b357a732eee024cfec84df40b2241cfb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Salvador=20Cu=C3=B1at?= Date: Mon, 17 Nov 2014 08:18:46 +0100 Subject: [PATCH] Update spanish translation of user manual to english 08adb2e MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Somehow I forgot to submit this back in October. Includes the gases pressures bar graph. Signed-off-by: Salvador Cuñat --- Documentation/user-manual_es.txt | 69 1 file changed, 69 insertions(+) diff --git a/Documentation/user-manual_es.txt b/Documentation/user-manual_es.txt index c5dff2d..24ed58a 100644 --- a/Documentation/user-manual_es.txt +++ b/Documentation/user-manual_es.txt @@ -1765,6 +1765,75 @@ respirando aire a una profundidad igual a la PNE. La figura (*B*) anterior muestra un Recuadro de Información con un conjunto de datos casi completo. + El gráfico de barras de presión de gases + +A la izquierda del *Recuadro de Información* hay un gráfico de barras vertical +que indica las presiones de los gases inertes que el buceador estaba respirando +_en un momento dado de la inmersión_, señalado por la posición del cursor sobre +el *Perfil de inmersión*. La figura abajo a la izquierda indica el significado +de las diferentes partes del gráfico de barras. + +image::images/GasPressureBarGraph.jpg["FIGURE:Gráfico de barras de presiones de gases",align="center"] + +El área verde claro indica el gas total, con el margen superior de esta zona +indicando la presión total de gas inhalada por el buceador y medida desde el +fondo del gráfico a la parte superior. Esta presión tiene un valor _relativo_ +en el gráfico y no indica presión absoluta. + +La línea negra horizontal por debajo de la zona verde claro indica la presión de +equilibrio de los gases inertes respirados, habitualmente nitrógeno. En el caso +del trimix, es la presión combinada del helio y el nitrógeno. En este ejemplo, +el usuario esta buceando con EAN32, por lo tanto la presión del gas inerte está +al 68% de la distancia desde el fondo del gráfico hasta el valor de la presión +total. + +La zona verde oscura en la parte baja del gráfico representa las presiones de +los gases inertes en cada uno de los 16 compartimentos de tejidos, según el +algoritmo de Bühlmann, estando los tejidos rápidos en el lado izquierdo. + +La línea horizontal negra superior indica el factor de gradiente que se aplica +a la profundidad del buceador para el punto concreto del *Perfil de Inmersión*. +Este factor de gradiente es una interpolación entre el GFbajo y el GFalto que +se hayan especificado en la pestaña Gráfico del *Panel de preferencias* de +_Subsurface_. + +El margen inferior de la zona roja del gráfico indica el valor M derivado de +Bühlman, o sea el valor de la presión de gases inertes a partir de la cual la +formación de burbujas se espera que sea severa, resultando en una enfermedad +descompresiva. + +Estos cinco valores se indican a la izquierda en la figura anterior. La forma +en que el gráfico de barras cambia durante una inmersión, se representa en el +lado derecho de la figura anterior, para un buceador usando EAN32. + +- El gráfico *A* indica la situación al inicio de una inmersión, con el buzo +en superficie. Las presiones en los compartimentos de tejidos todavía están +a la presión de equilibrio ya que aún no se ha buceado. + +- El gráfico *B* indica la situación tras un descenso a 30 metros. Pocos de +los compartimentos de tejidos han tenido tiempo de responder al descenso, las +presiones de los gases muy por debajo de presión de equilibrio. + +- El gráfico *C* representa las presiones tras 30 minutos a 30 metros. Los +compartimentos rápidos han llegado al equilibrio (p.e. han alcanzado la altura +de la línea negra que indica la presión de equilibrio). Los compartimentos más +lentos (hacia la derecha) no han alcanzado el equilibrio y están en proceso de +incrementar lentamente la presión. + +- El gráfico *D* muestra las presiones tras ascender a una profundidad de 4.5 +metros. Ya que, durante el ascenso, la presión total del gas inhalado ha caído +mucho, de 4 bares a 1.45 bares, las presiones en los diferentes compartimentos +de tejidos sobrepasan la presión total del gas y se aproximan al factor de +gradiente (la línea negra superior en la ima
Re: Help with translation & Typos
Hummm So I guess "Cylinder" was reused from another string. The problem here is that in Italian I cannot concatenae thwo translated words getting a meaningfull sentence. At least not in this case. In Italian "Cylinder Use" would be "Uso della bombola" so I should add "della" and swapping the words... For the moment I will just translate Use but the resulting sentence will be like Tarzan language :) On Mon, Nov 17, 2014 at 3:58 PM, Dirk Hohndel wrote: > On Mon, Nov 17, 2014 at 03:56:57PM +0100, Davide DB wrote: >> Sorry guys,, >> >> Could you give me some hint on the the string "use" >> >> ../qt-ui/models.cpp:79 >> CylindersModel >> subsurface4 >> >> Is it a verb or a nuon? > > It's the "Cylinder Use" for CCR dives, i.e., diluent, oxygen or OC gas > > /D -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Patches
I would have a smaaalll improvement if it is not difficult nor too late: Populating the tag list ONLY with the tag effectively used :) -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Help with translation & Typos
On Mon, Nov 17, 2014 at 03:56:57PM +0100, Davide DB wrote: > Sorry guys,, > > Could you give me some hint on the the string "use" > > ../qt-ui/models.cpp:79 > CylindersModel > subsurface4 > > Is it a verb or a nuon? It's the "Cylinder Use" for CCR dives, i.e., diluent, oxygen or OC gas /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: [PATCH] Update spanish translation of user manual to english 7967d2b
On Mon, Nov 17, 2014 at 01:50:26PM +0100, Salvador Cuñat wrote: > Covers CCR APD and Poseidon divelogs and importing. Already changed > by the time of writing this commit, at least twice. Thanks - btw... your patches are missing the path to the user-manual_es.txt file... they should say Documentation/user-manual_es.txt, not just user-manial_es.txt No big deal, easy to fix here, just thought I'd point it out. /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Help with translation & Typos
Sorry guys,, Could you give me some hint on the the string "use" ../qt-ui/models.cpp:79 CylindersModel subsurface4 Is it a verb or a nuon? On Wed, Nov 12, 2014 at 5:46 PM, Davide DB wrote: > > Il 12/nov/2014 17:10 "Dirk Hohndel" ha scritto: > >> In the planner we talk about "legs" in the plan, so these are the segments >> between the points in the plan. My guess is that these are segments (or >> legs) where the diver is on CCR? >> > > Now it's clear. In Italian I will use segments. > > Thanks -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
On Mon, Nov 17, 2014 at 04:39:01PM +0200, Lubomir I. Ivanov wrote: > On 17 November 2014 16:30, Davide DB wrote: > > I forgot: if I discard those changes the app crashes... > > I this this is useless but... just in case: > > > > Nome evento problema: APPCRASH > > Nome applicazione: subsurface.exe > > Versione applicazione: 4.2.0.549 > > that's on an older installer version, but we can assume that the > current git master has it fixed. I'm tethering over my phone right now. I'll make fresh binaries in a couple of hours... /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
On Mon, Nov 17, 2014 at 3:39 PM, Lubomir I. Ivanov wrote: > > that's on an older installer version, but we can assume that the > current git master has it fixed. > > lubomir > -- Ah! ok. I tried the last windows daily. -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Patches
On Mon, Nov 17, 2014 at 03:40:52PM +0100, Davide DB wrote: > Tomaz, > > I have no words to better describe it but... the filter panel is > simply amazing!!! > > It's the best invention since Cousteau-Gagnan diving regulator :) It's just an implementation of your design, so while Tomaz deserves the credit for writing the code (and I helped a little), the glory goes to you for coming up with the design for it. /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Patches
Tomaz, I have no words to better describe it but... the filter panel is simply amazing!!! It's the best invention since Cousteau-Gagnan diving regulator :) Thank you On Sun, Nov 16, 2014 at 6:18 PM, Tomaz Canabrava wrote: > better layout for the filter dialog, I hope. > > ___ > subsurface mailing list > subsurface@subsurface-divelog.org > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface > -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
On 17 November 2014 16:30, Davide DB wrote: > I forgot: if I discard those changes the app crashes... > I this this is useless but... just in case: > > Nome evento problema: APPCRASH > Nome applicazione: subsurface.exe > Versione applicazione: 4.2.0.549 that's on an older installer version, but we can assume that the current git master has it fixed. lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
I forgot: if I discard those changes the app crashes... I this this is useless but... just in case: Nome evento problema: APPCRASH Nome applicazione: subsurface.exe Versione applicazione: 4.2.0.549 Timestamp applicazione: 54694da4 Nome modulo con errori: StackHash_6178 Versione modulo con errori: 6.1.7601.18247 Timestamp modulo con errori: 521eaf24 Codice eccezione: c374 Offset eccezione: 000c4102 Versione SO: 6.1.7601.2.1.0.256.48 ID impostazioni locali: 1040 Informazioni aggiuntive 1: 6178 Ulteriori informazioni 2: 6178ff2eaa5848264b7eba5c689d0f4d Ulteriori informazioni 3: 59a6 Ulteriori informazioni 4: 59a6f19bd0d27d6544b7dea0e315d9dd On Mon, Nov 17, 2014 at 3:28 PM, Davide DB wrote: > I just tried copy & paste and some fields get messed. > > This is my try at copy & paste weight,tanks, tags, buddy, > > Some strange char on the weight type, some tag goes on the tank... > > If I exit without apply those changes the modal dialog is not translated. > > I'm working in Italian. Yesterday eventing I completed the Italian > translation but those string was not there so I guess it's another > problem. > > I Attached some screenshots. > > On Mon, Nov 17, 2014 at 2:57 PM, Lubomir I. Ivanov > wrote: >> On 17 November 2014 15:30, Dirk Hohndel wrote: >>> >>> Anyway, Linux is much more resillient to memory errors - Windows crashes >>> much more aggressively. But I think the crash / corruption should be fixed >>> (famous last words). >> >> yes, seems like i cannot reproduce salvador's steps on Win7. >> >>> The translation thing baffles me. >>> >> >> on runtime the apps says: >> can't find Qt localization for locale "bg" searching in "/translations" >> >> which i think means that the localization for the *default* UI >> elements such as OK, CANCEL etc buttons is missing. >> also for messages and other components. >> >> here: >> http://musescore.org/en/node/30266 >> >> the comments suggest that TS/QM files have to be included with the >> application: >> ftp://ftp.qt-project.org/qt/l10n/index.html >> >> e.g. DE file: >> ftp://ftp.qt-project.org/qt/l10n/qt-stable/qt_de.ts >> >> but for instance, there is still no 'BG' in that list, which tells us >> that translations may simply be missing for some languages. >> >> lubomir >> -- >> ___ >> subsurface mailing list >> subsurface@subsurface-divelog.org >> http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface > > > > -- > Davide > https://vimeo.com/bocio/videos -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
I just tried copy & paste and some fields get messed. This is my try at copy & paste weight,tanks, tags, buddy, Some strange char on the weight type, some tag goes on the tank... If I exit without apply those changes the modal dialog is not translated. I'm working in Italian. Yesterday eventing I completed the Italian translation but those string was not there so I guess it's another problem. I Attached some screenshots. On Mon, Nov 17, 2014 at 2:57 PM, Lubomir I. Ivanov wrote: > On 17 November 2014 15:30, Dirk Hohndel wrote: >> >> Anyway, Linux is much more resillient to memory errors - Windows crashes >> much more aggressively. But I think the crash / corruption should be fixed >> (famous last words). > > yes, seems like i cannot reproduce salvador's steps on Win7. > >> The translation thing baffles me. >> > > on runtime the apps says: > can't find Qt localization for locale "bg" searching in "/translations" > > which i think means that the localization for the *default* UI > elements such as OK, CANCEL etc buttons is missing. > also for messages and other components. > > here: > http://musescore.org/en/node/30266 > > the comments suggest that TS/QM files have to be included with the > application: > ftp://ftp.qt-project.org/qt/l10n/index.html > > e.g. DE file: > ftp://ftp.qt-project.org/qt/l10n/qt-stable/qt_de.ts > > but for instance, there is still no 'BG' in that list, which tells us > that translations may simply be missing for some languages. > > lubomir > -- > ___ > subsurface mailing list > subsurface@subsurface-divelog.org > http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface -- Davide https://vimeo.com/bocio/videos ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
On 17 November 2014 15:30, Dirk Hohndel wrote: > > Anyway, Linux is much more resillient to memory errors - Windows crashes > much more aggressively. But I think the crash / corruption should be fixed > (famous last words). yes, seems like i cannot reproduce salvador's steps on Win7. > The translation thing baffles me. > on runtime the apps says: can't find Qt localization for locale "bg" searching in "/translations" which i think means that the localization for the *default* UI elements such as OK, CANCEL etc buttons is missing. also for messages and other components. here: http://musescore.org/en/node/30266 the comments suggest that TS/QM files have to be included with the application: ftp://ftp.qt-project.org/qt/l10n/index.html e.g. DE file: ftp://ftp.qt-project.org/qt/l10n/qt-stable/qt_de.ts but for instance, there is still no 'BG' in that list, which tells us that translations may simply be missing for some languages. lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
On Mon, Nov 17, 2014 at 02:06:27PM +0100, Salvador Cuñat wrote: > 2014-11-17 10:19 GMT+01:00 Dirk Hohndel : > > > On Mon, Nov 17, 2014 at 10:05:13AM +0100, Salvador Cuñat wrote: > > > > > > In Windows 7, 64b, while doing copy/paste of data from a preexisting dive > > > to a new one (manually creating it), tanks and weight strings get > > > corrupted, probably the same problem solved some days ago with the tanks > > > names. > > > > Which strings? The descriptions? > > Yes, the descriptors. That should be fixed. > > BTW, BTW, some button tags aren't translated, I've realized "save", > > > "discard", and "cancel". > > > > That's odd - those look like they should be default strings that are > > translated through the Qt translations. Which language did you use? > > Where did those strings show up. > > > > It is. Only affects Win, in linux are perfectly translated. I'm on > spanish. > Those are the strings showed on the warning pop ups when quitting without > saving in both, the editor and the complete program (if there are changes > unsaved > to the log). This sounds like there are translations missing in the Windows installer. Odd. Everything else is translated correctly? > > On linux git-549 only seems to be affected the weight strings, even > > without > > > copy/paste, after saving the dive, no crash while discarding, button tags > > > translated. > > > > I can't quite parse that sentence... something only happens to the weight > > strings? What does "even without copy/paste" mean in this context? > > > > > I apologize for my bad english (specially when I'm in a hurry). I > initially thought that > the strings thing was only when copy/pasting in Win, but realized it > happened in linux > also, both with or without copy/paste (when saying copy/paste I mean the > subsurface > recent feature, not the usual desktop feature). > The other thing I meant was there were no crash or untranslated buttons in > linux. Don't worry about English - I am perfectly happy to ask for clarification if I'm lost. Your English is orders of magnitudes better than my Spanish :-) Anyway, Linux is much more resillient to memory errors - Windows crashes much more aggressively. But I think the crash / corruption should be fixed (famous last words). The translation thing baffles me. /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
2014-11-17 10:19 GMT+01:00 Dirk Hohndel : > On Mon, Nov 17, 2014 at 10:05:13AM +0100, Salvador Cuñat wrote: > > > > In Windows 7, 64b, while doing copy/paste of data from a preexisting dive > > to a new one (manually creating it), tanks and weight strings get > > corrupted, probably the same problem solved some days ago with the tanks > > names. > > Which strings? The descriptions? > Yes, the descriptors. > BTW, BTW, some button tags aren't translated, I've realized "save", > > "discard", and "cancel". > > That's odd - those look like they should be default strings that are > translated through the Qt translations. Which language did you use? > Where did those strings show up. > It is. Only affects Win, in linux are perfectly translated. I'm on spanish. Those are the strings showed on the warning pop ups when quitting without saving in both, the editor and the complete program (if there are changes unsaved to the log). > On linux git-549 only seems to be affected the weight strings, even > without > > copy/paste, after saving the dive, no crash while discarding, button tags > > translated. > > I can't quite parse that sentence... something only happens to the weight > strings? What does "even without copy/paste" mean in this context? > > I apologize for my bad english (specially when I'm in a hurry). I initially thought that the strings thing was only when copy/pasting in Win, but realized it happened in linux also, both with or without copy/paste (when saying copy/paste I mean the subsurface recent feature, not the usual desktop feature). The other thing I meant was there were no crash or untranslated buttons in linux. Regards. Salva. ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
[PATCH] Update spanish translation of user manual to english 7967d2b
Covers CCR APD and Poseidon divelogs and importing. Already changed by the time of writing this commit, at least twice. Signed-off-by: Salvador Cuñat --- user-manual_es.txt | 129 +++- 1 file changed, 128 insertions(+), 1 deletion(-) diff --git a/user-manual_es.txt b/user-manual_es.txt index 24ed58a..ac3fb29 100644 --- a/user-manual_es.txt +++ b/user-manual_es.txt @@ -880,6 +880,8 @@ nuevos datos se guardan. === Importar información de inmersiones de otras fuentes u otros formatos de datos +[[S_ImportingAlienDiveLogs]] + Si el usuario bucea desde hace algún tiempo, es posible que bastantes inmersiones hayan sido registradas usando otro software. No es necesario teclear de nuevo esta información ya que, probablemente, estos diarios puedan importarse @@ -928,15 +930,76 @@ importar directamente, como en el dialogo *B* anterior. Actualmente son: - Diarios en formato XML (Divinglog 5.0, MacDive y varios otros) - Diarios en formato UDDF (p.e. Kenozoooid) - Diarios en formato UDCF + - Diarios de CCR Poseidon - JDiveLog - Suunto Dive Manager (DM3 y DM4) - - Diarios en formato CSV (basados en texto o en hojas de cálculo). + - Diarios en formato CSV (basados en texto o en hojas de cálculo), incluidos +diarios de CCR APD. Seleccionar el archivo correspondiente en la lista del diálogo abre el archivo importado directamente en la *Lista de Inmersiones* de _Subsurface_. También están soportados algunos otros formatos, no accesibles desde el diálogo Importar, como se explica a continuación. + Importar diarios de sistemas de recicladores de circuito cerrado (CCR) + +[icon="images/APD.jpg"] +[NOTE] +Los recicladores de circuito cerrado utilizan tecnologías avanzadas para +reciclar el gas expirado, llevando a cabo dos acciones para mantener una +concentración de oxígeno respirable: +a) Eliminan dióxido de carbono del gas que ha sido exhalado. +b) Regulan la concentración de oxígeno para que sea segura en la inmersión. +Actualmente, en _Subsurface_, el Poseidon MKVI Discovery es el ordenador de +buceo mejor soportado. El interfaz CCR de _Subsurface_ es todavía experimental +y se halla bajo desarrollo activo. En contraste con un ordenador de circuito +abierto convencional, el ordenador de un sistema CCR no permite la descarga de +un diario que contenga múltiples inmersiones. En su lugar, cada buceo se guarda +independientemente. Esto supone que _Subsurface_ no pueda descargar un diario +directamente del ordenador CCR, sino que se importa de la misma manera que se +importan los diarios de otras bases de datos. + + Importar una inmersión con CCR + +Consulta la sección que trata +xref:S_ImportingAlienDiveLogs[la importación de otras fuentes digitales]. +Desde el menú principal de _Subsurface_, selecciona _Importar -> Importar +archivos de registro_ para desplegar el +xref:Unified_import[diálogo unificado de importación]. Como se explicó en la +sección anterior, la parte inferior derecha del diálogo contiene una lista +desplegable de dispositivos que incluye una opción para los archivos de MKVI. +Tras seleccionar el formato CCR apropiado y el directorio donde se hallan +guardados los archivos originales del ordenador CCR, se puede seleccionar un +archivo de diario concreto (en el caso del MKVI será un archivo con extensión +.txt). Después de haber seleccionado el archivo, pulsa el botón _Abrir_ debajo +a la derecha en el diálogo de importación. + + Información mostrada para una inmersión + +_Presiones parciales de los gases_: El gráfico de presión parcial de oxígeno +muestra la información de los sensores de oxígeno del equipo CCR. En el caso +del Poseidon MKVI, se muestra el valor promedio de los dos sensores. En el +caso del equipo APD, se muestra el promedio de los 3 sensores de oxígeno. Si +uno de los sensores muestra una lectura muy diferente en comparación a los +otros dos, se ignora el sensor que diverge. Para las inmersiones con CCR, el +gráfico de presiones parciales de oxígeno debería ser bastante plano, +reflejando el ajuste del "setpoint" durante la inmersión. +Las presiones parciales de nitrógeno (y helio en su caso) se muestran de la +forma habitual como en el resto de inmersiones. + +_Presiones de las botellas_: Los ordenadores de buceo con CCR como el Poseidon +MKVI registran las presiones de las botellas de oxígeno y diluyente. La presión +de la botella de oxígeno es la que se muestra en el perfil. Además, en la +pestaña _Equipo_ se mostrarán las presiones inicial y final de ambas, la de +oxígeno y la de diluyente. + +_Información específica del equipo_: La información específica del equipo +recabada por _Subsurface_ se muestra en la pestaña _Otros datos_. Puede incluir +información de ajustes o metadatos sobre la inmersión. + +Se puede encontrar más información especifica sobre descarga de diarios de CCR +en el xref:S_PoseidonMkVI[Apéndice B]. + Importar desde Mares Dive Organiser V2.1 Dado que Mares utili
[PATCH] Update spanish translation of user manual to english 08adb2e
Somehow I forgot to submit this back in October. Includes the gases pressures bar graph. Signed-off-by: Salvador Cuñat --- user-manual_es.txt | 69 1 file changed, 69 insertions(+) diff --git a/user-manual_es.txt b/user-manual_es.txt index c5dff2d..24ed58a 100644 --- a/user-manual_es.txt +++ b/user-manual_es.txt @@ -1765,6 +1765,75 @@ respirando aire a una profundidad igual a la PNE. La figura (*B*) anterior muestra un Recuadro de Información con un conjunto de datos casi completo. + El gráfico de barras de presión de gases + +A la izquierda del *Recuadro de Información* hay un gráfico de barras vertical +que indica las presiones de los gases inertes que el buceador estaba respirando +_en un momento dado de la inmersión_, señalado por la posición del cursor sobre +el *Perfil de inmersión*. La figura abajo a la izquierda indica el significado +de las diferentes partes del gráfico de barras. + +image::images/GasPressureBarGraph.jpg["FIGURE:Gráfico de barras de presiones de gases",align="center"] + +El área verde claro indica el gas total, con el margen superior de esta zona +indicando la presión total de gas inhalada por el buceador y medida desde el +fondo del gráfico a la parte superior. Esta presión tiene un valor _relativo_ +en el gráfico y no indica presión absoluta. + +La línea negra horizontal por debajo de la zona verde claro indica la presión de +equilibrio de los gases inertes respirados, habitualmente nitrógeno. En el caso +del trimix, es la presión combinada del helio y el nitrógeno. En este ejemplo, +el usuario esta buceando con EAN32, por lo tanto la presión del gas inerte está +al 68% de la distancia desde el fondo del gráfico hasta el valor de la presión +total. + +La zona verde oscura en la parte baja del gráfico representa las presiones de +los gases inertes en cada uno de los 16 compartimentos de tejidos, según el +algoritmo de Bühlmann, estando los tejidos rápidos en el lado izquierdo. + +La línea horizontal negra superior indica el factor de gradiente que se aplica +a la profundidad del buceador para el punto concreto del *Perfil de Inmersión*. +Este factor de gradiente es una interpolación entre el GFbajo y el GFalto que +se hayan especificado en la pestaña Gráfico del *Panel de preferencias* de +_Subsurface_. + +El margen inferior de la zona roja del gráfico indica el valor M derivado de +Bühlman, o sea el valor de la presión de gases inertes a partir de la cual la +formación de burbujas se espera que sea severa, resultando en una enfermedad +descompresiva. + +Estos cinco valores se indican a la izquierda en la figura anterior. La forma +en que el gráfico de barras cambia durante una inmersión, se representa en el +lado derecho de la figura anterior, para un buceador usando EAN32. + +- El gráfico *A* indica la situación al inicio de una inmersión, con el buzo +en superficie. Las presiones en los compartimentos de tejidos todavía están +a la presión de equilibrio ya que aún no se ha buceado. + +- El gráfico *B* indica la situación tras un descenso a 30 metros. Pocos de +los compartimentos de tejidos han tenido tiempo de responder al descenso, las +presiones de los gases muy por debajo de presión de equilibrio. + +- El gráfico *C* representa las presiones tras 30 minutos a 30 metros. Los +compartimentos rápidos han llegado al equilibrio (p.e. han alcanzado la altura +de la línea negra que indica la presión de equilibrio). Los compartimentos más +lentos (hacia la derecha) no han alcanzado el equilibrio y están en proceso de +incrementar lentamente la presión. + +- El gráfico *D* muestra las presiones tras ascender a una profundidad de 4.5 +metros. Ya que, durante el ascenso, la presión total del gas inhalado ha caído +mucho, de 4 bares a 1.45 bares, las presiones en los diferentes compartimentos +de tejidos sobrepasan la presión total del gas y se aproximan al factor de +gradiente (la línea negra superior en la imagen). Continuar el ascenso haría +que rebasáramos el valor del factor de gradiente (GFalto), poniendo en peligro +al buceador. + +- El gráfico *E* indica la situación después de permanecer a 4.5 metros durante +10 minutos. Los compartimentos rápidos han bajado su presión. Como era de +esperar, las presiones en los compartimentos lentos no han variado mucho. Las +presiones en los compartimentos rápidos ya no se acercan al valor de GFalto y +el buceador está más seguro que en la situación expuesta en el gráfico *D*. + == Organizar el registro (Manipular grupos de inmersiones) === El menú contextual de la Lista de Inmersiones -- 1.7.10.4 ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: 727 fixed
On Mon, Nov 17, 2014 at 4:05 AM, Dirk Hohndel wrote: > On Sun, Nov 16, 2014 at 11:28:48PM -0200, Tomaz Canabrava wrote: > > > > > From 3db4a422485374801ca2f6233ec23b8671a8656d Mon Sep 17 00:00:00 2001 > > From: Tomaz Canabrava > > Date: Sun, 16 Nov 2014 23:22:58 -0200 > > Subject: [PATCH] fix 727 - position correctly the popup. > > > > When the user entered a tag and that made the message box display > > the popup with the possible choices was still in the old position > > hidding the line edit. > > You're a genius. This was one of those subtle little bugs that drove me > nuts... > It was quite difficult to find a good way to fix this, the way I wanted to fix was to use the parent's moveEvent or resizeEvent, but it was not triggered after a layout change, strangely. > > Thanks > > /D > ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
hello, On 17 November 2014 11:05, Salvador Cuñat wrote: > > BTW, there is a crash when discarding the changes on the manually added > dive. > win7 64bit: i can't make it crash by pressing "cancel" for a manual dive, while adding it or editing after it's added; can you provide steps? lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: bugs in daily build 4.2-549
On Mon, Nov 17, 2014 at 10:05:13AM +0100, Salvador Cuñat wrote: > > In Windows 7, 64b, while doing copy/paste of data from a preexisting dive > to a new one (manually creating it), tanks and weight strings get > corrupted, probably the same problem solved some days ago with the tanks > names. Which strings? The descriptions? > BTW, there is a crash when discarding the changes on the manually added > dive. :-( > BTW, BTW, some button tags aren't translated, I've realized "save", > "discard", and "cancel". That's odd - those look like they should be default strings that are translated through the Qt translations. Which language did you use? Where did those strings show up. > On linux git-549 only seems to be affected the weight strings, even without > copy/paste, after saving the dive, no crash while discarding, button tags > translated. I can't quite parse that sentence... something only happens to the weight strings? What does "even without copy/paste" mean in this context? /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
bugs in daily build 4.2-549
Good morning. In Windows 7, 64b, while doing copy/paste of data from a preexisting dive to a new one (manually creating it), tanks and weight strings get corrupted, probably the same problem solved some days ago with the tanks names. BTW, there is a crash when discarding the changes on the manually added dive. BTW, BTW, some button tags aren't translated, I've realized "save", "discard", and "cancel". On linux git-549 only seems to be affected the weight strings, even without copy/paste, after saving the dive, no crash while discarding, button tags translated. Regards Salva. ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
