2017-04-27 18:18:03 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2024-05-01 16:11:35 +00:00
|
|
|
/* divelist.cpp */
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2020-05-01 11:43:52 +00:00
|
|
|
#include "divelist.h"
|
2018-05-11 15:25:41 +00:00
|
|
|
#include "subsurface-string.h"
|
2019-07-15 21:36:14 +00:00
|
|
|
#include "deco.h"
|
2020-04-23 21:32:42 +00:00
|
|
|
#include "device.h"
|
2020-05-01 11:43:52 +00:00
|
|
|
#include "dive.h"
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
#include "divelog.h"
|
|
|
|
#include "divesite.h"
|
2020-10-25 08:14:16 +00:00
|
|
|
#include "event.h"
|
2024-02-14 09:59:13 +00:00
|
|
|
#include "eventtype.h"
|
2020-05-26 16:32:52 +00:00
|
|
|
#include "filterpreset.h"
|
2020-02-16 21:26:47 +00:00
|
|
|
#include "fulltext.h"
|
2020-10-25 17:14:23 +00:00
|
|
|
#include "interpolate.h"
|
2014-07-18 06:39:53 +00:00
|
|
|
#include "planner.h"
|
2018-02-24 22:28:13 +00:00
|
|
|
#include "qthelper.h"
|
2019-11-24 12:51:01 +00:00
|
|
|
#include "gettext.h"
|
2016-03-23 19:09:18 +00:00
|
|
|
#include "git-access.h"
|
2019-11-24 14:02:34 +00:00
|
|
|
#include "selection.h"
|
2020-10-25 12:28:55 +00:00
|
|
|
#include "sample.h"
|
2019-03-10 20:37:05 +00:00
|
|
|
#include "table.h"
|
2019-05-31 14:09:14 +00:00
|
|
|
#include "trip.h"
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2011-12-12 05:28:18 +00:00
|
|
|
/*
|
|
|
|
* Get "maximal" dive gas for a dive.
|
|
|
|
* Rules:
|
|
|
|
* - Trimix trumps nitrox (highest He wins, O2 breaks ties)
|
|
|
|
* - Nitrox trumps air (even if hypoxic)
|
|
|
|
* These are the same rules as the inter-dive sorting rules.
|
|
|
|
*/
|
2024-05-04 16:45:55 +00:00
|
|
|
void get_dive_gas(const struct dive *dive, int *o2_p, int *he_p, int *o2max_p)
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
{
|
|
|
|
int i;
|
2011-12-12 17:20:22 +00:00
|
|
|
int maxo2 = -1, maxhe = -1, mino2 = 1000;
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
|
2019-08-04 16:44:57 +00:00
|
|
|
for (i = 0; i < dive->cylinders.nr; i++) {
|
2019-08-04 20:13:49 +00:00
|
|
|
const cylinder_t *cyl = get_cylinder(dive, i);
|
2018-08-16 17:10:10 +00:00
|
|
|
int o2 = get_o2(cyl->gasmix);
|
|
|
|
int he = get_he(cyl->gasmix);
|
2013-03-18 14:22:14 +00:00
|
|
|
|
2017-02-03 15:31:03 +00:00
|
|
|
if (!is_cylinder_used(dive, i))
|
2013-03-18 14:22:14 +00:00
|
|
|
continue;
|
2023-10-11 20:13:38 +00:00
|
|
|
if (cyl->cylinder_use == OXYGEN)
|
|
|
|
continue;
|
2023-10-11 20:15:02 +00:00
|
|
|
if (cyl->cylinder_use == NOT_USED)
|
|
|
|
continue;
|
2015-01-06 20:49:42 +00:00
|
|
|
if (o2 > maxo2)
|
|
|
|
maxo2 = o2;
|
2023-10-18 05:30:31 +00:00
|
|
|
if (o2 < mino2 && maxhe <= 0)
|
2023-10-11 20:15:43 +00:00
|
|
|
mino2 = o2;
|
2023-10-18 08:55:39 +00:00
|
|
|
if (he > maxhe) {
|
|
|
|
maxhe = he;
|
|
|
|
mino2 = o2;
|
|
|
|
}
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
}
|
2011-12-12 17:20:22 +00:00
|
|
|
/* All air? Show/sort as "air"/zero */
|
2015-01-25 11:28:06 +00:00
|
|
|
if ((!maxhe && maxo2 == O2_IN_AIR && mino2 == maxo2) ||
|
|
|
|
(maxo2 == -1 && maxhe == -1 && mino2 == 1000))
|
2011-12-12 17:20:22 +00:00
|
|
|
maxo2 = mino2 = 0;
|
2015-01-06 20:49:42 +00:00
|
|
|
*o2_p = mino2;
|
2012-01-05 16:16:08 +00:00
|
|
|
*he_p = maxhe;
|
2015-01-06 20:49:42 +00:00
|
|
|
*o2max_p = maxo2;
|
Add capability of custom sorts to divelist columns
.. and use this for the nitrox column, which can now be more complex
than just a single number.
The rule for the "nitrox" column is now:
- we look up the highest Oxygen and Helium mix for the dive
(Note: we look them up independently, so if you have a EAN50 deco
bottle, and a 20% Helium low-oxygen bottle for the deep portion, then
we'll consider the dive to be a "50% Oxygen, 20% Helium" dive, even
though you obviously never used that combination at the same time)
- we sort by Helium first, Oxygen second. So a dive with a 10% Helium
mix is considered to be "stronger" than a 50% Nitrox mix.
- If Helium is non-zero, we show "O2/He", otherwise we show just "O2"
(or "air"). So "21/20" means "21% oxygen, 20% Helium", while "40"
means "Ean 40".
- I got rid of the decimals. We save them, and you can see them in the
dive equipment details, but for the dive list we just use rounded
percentages.
Let's see how many bugs I introduced. I don't actually have any trimix
dives, but I edited a few for (very limited) testing.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-11 22:38:58 +00:00
|
|
|
}
|
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
int total_weight(const struct dive *dive)
|
2012-08-07 18:24:40 +00:00
|
|
|
{
|
|
|
|
int i, total_grams = 0;
|
|
|
|
|
|
|
|
if (dive)
|
2019-06-26 15:21:03 +00:00
|
|
|
for (i = 0; i < dive->weightsystems.nr; i++)
|
|
|
|
total_grams += dive->weightsystems.weightsystems[i].weight.grams;
|
2012-08-07 18:24:40 +00:00
|
|
|
return total_grams;
|
|
|
|
}
|
|
|
|
|
2018-08-23 17:18:43 +00:00
|
|
|
static int active_o2(const struct dive *dive, const struct divecomputer *dc, duration_t time)
|
First step in cleaning up cylinder pressure sensor logic
This clarifies/changes the meaning of our "cylinderindex" entry in our
samples. It has been rather confused, because different dive computers
have done things differently, and the naming really hasn't helped.
There are two totally different - and independent - cylinder "indexes":
- the pressure sensor index, which indicates which cylinder the sensor
data is from.
- the "active cylinder" index, which indicates which cylinder we actually
breathe from.
These two values really are totally independent, and have nothing
what-so-ever to do with each other. The sensor index may well be fixed:
many dive computers only support a single pressure sensor (whether
wireless or wired), and the sensor index is thus always zero.
Other dive computers may support multiple pressure sensors, and the gas
switch event may - or may not - indicate that the sensor changed too. A
dive computer might give the sensor data for *all* cylinders it can read,
regardless of which one is the one we're actively breathing. In fact, some
dive computers might give sensor data for not just *your* cylinder, but
your buddies.
This patch renames "cylinderindex" in the samples as "sensor", making it
quite clear that it's about which sensor index the pressure data in the
sample is about.
The way we figure out which is the currently active gas is with an
explicit has change event. If a computer (like the Uemis Zurich) joins the
two concepts together, then a sensor change should also create a gas
switch event. This patch also changes the Uemis importer to do that.
Finally, it should be noted that the plot info works totally separately
from the sample data, and is about what we actually *display*, not about
the sample pressures etc. In the plot info, the "cylinderindex" does in
fact mean the currently active cylinder, and while it is initially set to
match the sensor information from the samples, we then walk the gas change
events and fix it up - and if the active cylinder differs from the sensor
cylinder, we clear the sensor data.
[Dirk Hohndel: this conflicted with some of my recent changes - I think
I merged things correctly...]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-31 04:00:51 +00:00
|
|
|
{
|
2018-08-16 15:11:51 +00:00
|
|
|
struct gasmix gas = get_gasmix_at_time(dive, dc, time);
|
2018-08-16 17:10:10 +00:00
|
|
|
return get_o2(gas);
|
First step in cleaning up cylinder pressure sensor logic
This clarifies/changes the meaning of our "cylinderindex" entry in our
samples. It has been rather confused, because different dive computers
have done things differently, and the naming really hasn't helped.
There are two totally different - and independent - cylinder "indexes":
- the pressure sensor index, which indicates which cylinder the sensor
data is from.
- the "active cylinder" index, which indicates which cylinder we actually
breathe from.
These two values really are totally independent, and have nothing
what-so-ever to do with each other. The sensor index may well be fixed:
many dive computers only support a single pressure sensor (whether
wireless or wired), and the sensor index is thus always zero.
Other dive computers may support multiple pressure sensors, and the gas
switch event may - or may not - indicate that the sensor changed too. A
dive computer might give the sensor data for *all* cylinders it can read,
regardless of which one is the one we're actively breathing. In fact, some
dive computers might give sensor data for not just *your* cylinder, but
your buddies.
This patch renames "cylinderindex" in the samples as "sensor", making it
quite clear that it's about which sensor index the pressure data in the
sample is about.
The way we figure out which is the currently active gas is with an
explicit has change event. If a computer (like the Uemis Zurich) joins the
two concepts together, then a sensor change should also create a gas
switch event. This patch also changes the Uemis importer to do that.
Finally, it should be noted that the plot info works totally separately
from the sample data, and is about what we actually *display*, not about
the sample pressures etc. In the plot info, the "cylinderindex" does in
fact mean the currently active cylinder, and while it is initially set to
match the sensor information from the samples, we then walk the gas change
events and fix it up - and if the active cylinder differs from the sensor
cylinder, we clear the sensor data.
[Dirk Hohndel: this conflicted with some of my recent changes - I think
I merged things correctly...]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-31 04:00:51 +00:00
|
|
|
}
|
|
|
|
|
2021-08-18 21:38:15 +00:00
|
|
|
// Do not call on first sample as it acccesses the previous sample
|
|
|
|
static int get_sample_o2(const struct dive *dive, const struct divecomputer *dc, const struct sample *sample)
|
|
|
|
{
|
|
|
|
int po2i, po2f, po2;
|
|
|
|
const struct sample *psample = sample - 1;
|
|
|
|
// Use sensor[0] if available
|
|
|
|
if ((dc->divemode == CCR || dc->divemode == PSCR) && sample->o2sensor[0].mbar) {
|
|
|
|
po2i = psample->o2sensor[0].mbar;
|
|
|
|
po2f = sample->o2sensor[0].mbar; // then use data from the first o2 sensor
|
|
|
|
po2 = (po2f + po2i) / 2;
|
|
|
|
} else if (sample->setpoint.mbar > 0) {
|
2024-05-01 16:14:17 +00:00
|
|
|
po2 = std::min((int) sample->setpoint.mbar,
|
|
|
|
depth_to_mbar(sample->depth.mm, dive));
|
2021-08-18 21:38:15 +00:00
|
|
|
} else {
|
|
|
|
double amb_presure = depth_to_bar(sample->depth.mm, dive);
|
|
|
|
double pamb_pressure = depth_to_bar(psample->depth.mm , dive);
|
|
|
|
if (dc->divemode == PSCR) {
|
|
|
|
po2i = pscr_o2(pamb_pressure, get_gasmix_at_time(dive, dc, psample->time));
|
|
|
|
po2f = pscr_o2(amb_presure, get_gasmix_at_time(dive, dc, sample->time));
|
|
|
|
} else {
|
|
|
|
int o2 = active_o2(dive, dc, psample->time); // ... calculate po2 from depth and FiO2.
|
|
|
|
po2i = lrint(o2 * pamb_pressure); // (initial) po2 at start of segment
|
|
|
|
po2f = lrint(o2 * amb_presure); // (final) po2 at end of segment
|
|
|
|
}
|
|
|
|
po2 = (po2i + po2f) / 2;
|
|
|
|
}
|
|
|
|
return po2;
|
|
|
|
}
|
|
|
|
|
2018-11-11 10:33:11 +00:00
|
|
|
/* Calculate OTU for a dive - this only takes the first divecomputer into account.
|
|
|
|
Implement the protocol in Erik Baker's document "Oxygen Toxicity Calculations". This code
|
|
|
|
implements a third-order continuous approximation of Baker's Eq. 2 and enables OTU
|
|
|
|
calculation for rebreathers. Baker obtained his information from:
|
|
|
|
Comroe Jr. JH et al. (1945) Oxygen toxicity. J. Am. Med. Assoc. 128,710-717
|
|
|
|
Clark JM & CJ Lambertsen (1970) Pulmonary oxygen tolerance in man and derivation of pulmonary
|
|
|
|
oxygen tolerance curves. Inst. env. Med. Report 1-70, University of Pennsylvania, Philadelphia, USA. */
|
2018-08-23 17:18:43 +00:00
|
|
|
static int calculate_otu(const struct dive *dive)
|
2011-09-22 20:45:53 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
double otu = 0.0;
|
2018-08-23 17:18:43 +00:00
|
|
|
const struct divecomputer *dc = &dive->dc;
|
2012-11-24 02:51:27 +00:00
|
|
|
for (i = 1; i < dc->samples; i++) {
|
2011-09-22 20:45:53 +00:00
|
|
|
int t;
|
2018-11-11 10:33:11 +00:00
|
|
|
int po2i, po2f;
|
|
|
|
double pm;
|
2012-11-24 02:51:27 +00:00
|
|
|
struct sample *sample = dc->sample + i;
|
2011-09-22 20:45:53 +00:00
|
|
|
struct sample *psample = sample - 1;
|
|
|
|
t = sample->time.seconds - psample->time.seconds;
|
2021-08-18 21:38:15 +00:00
|
|
|
// if there is sensor data use sensor[0]
|
|
|
|
if ((dc->divemode == CCR || dc->divemode == PSCR) && sample->o2sensor[0].mbar) {
|
2018-11-11 10:33:11 +00:00
|
|
|
po2i = psample->o2sensor[0].mbar;
|
|
|
|
po2f = sample->o2sensor[0].mbar; // ... use data from the first o2 sensor
|
2012-12-21 01:42:10 +00:00
|
|
|
} else {
|
2021-08-18 21:38:15 +00:00
|
|
|
if (sample->setpoint.mbar > 0) {
|
2024-05-01 16:14:17 +00:00
|
|
|
po2f = std::min((int) sample->setpoint.mbar,
|
|
|
|
depth_to_mbar(sample->depth.mm, dive));
|
2021-08-18 21:38:15 +00:00
|
|
|
if (psample->setpoint.mbar > 0)
|
2024-05-01 16:14:17 +00:00
|
|
|
po2i = std::min((int) psample->setpoint.mbar,
|
|
|
|
depth_to_mbar(psample->depth.mm, dive));
|
2021-08-18 21:38:15 +00:00
|
|
|
else
|
|
|
|
po2i = po2f;
|
2018-11-11 10:33:11 +00:00
|
|
|
} else { // For OC and rebreather without o2 sensor/setpoint
|
2021-03-11 22:27:13 +00:00
|
|
|
double amb_presure = depth_to_bar(sample->depth.mm, dive);
|
|
|
|
double pamb_pressure = depth_to_bar(psample->depth.mm , dive);
|
|
|
|
if (dc->divemode == PSCR) {
|
|
|
|
po2i = pscr_o2(pamb_pressure, get_gasmix_at_time(dive, dc, psample->time));
|
|
|
|
po2f = pscr_o2(amb_presure, get_gasmix_at_time(dive, dc, sample->time));
|
|
|
|
} else {
|
|
|
|
int o2 = active_o2(dive, dc, psample->time); // ... calculate po2 from depth and FiO2.
|
|
|
|
po2i = lrint(o2 * pamb_pressure); // (initial) po2 at start of segment
|
|
|
|
po2f = lrint(o2 * amb_presure); // (final) po2 at end of segment
|
|
|
|
}
|
2018-11-11 10:33:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((po2i > 500) || (po2f > 500)) { // If PO2 in segment is above 500 mbar then calculate otu
|
|
|
|
if (po2i <= 500) { // For descent segment with po2i <= 500 mbar ..
|
|
|
|
t = t * (po2f - 500) / (po2f - po2i); // .. only consider part with PO2 > 500 mbar
|
|
|
|
po2i = 501; // Mostly important for the dive planner with long segments
|
|
|
|
} else {
|
|
|
|
if (po2f <= 500){
|
|
|
|
t = t * (po2i - 500) / (po2i - po2f); // For ascent segment with po2f <= 500 mbar ..
|
|
|
|
po2f = 501; // .. only consider part with PO2 > 500 mbar
|
|
|
|
}
|
|
|
|
}
|
|
|
|
pm = (po2f + po2i)/1000.0 - 1.0;
|
|
|
|
// This is a 3rd order continuous approximation of Baker's eq. 2, therefore Baker's eq. 1 is not used:
|
|
|
|
otu += t / 60.0 * pow(pm, 5.0/6.0) * (1.0 - 5.0 * (po2f - po2i) * (po2f - po2i) / 216000000.0 / (pm * pm));
|
2012-12-21 01:42:10 +00:00
|
|
|
}
|
2011-09-22 20:45:53 +00:00
|
|
|
}
|
2017-03-08 06:41:41 +00:00
|
|
|
return lrint(otu);
|
2011-09-22 20:45:53 +00:00
|
|
|
}
|
2019-06-04 18:41:31 +00:00
|
|
|
|
More accurate CNS calculations (following comments on github)
Update table of maximum oxygen exposure durations, used in CNS calulations.
This table shows the official NOAA maximum O2 exposure limits
(in seconds) for different PO2 values. It also gives
slope values for linear interpolation for intermediate PO2 values
between the tabulated PO2 values in the 1st column.
Top & bottom rows are inserted that are not in the NOAA table:
(1) For PO2 > 1.6 the same slope value as between
1.5 & 1.6 is used. This exptrapolation for PO2 > 1.6 likely
gives an underestimate above 1.6 but is better than the
value for PO2=1.6 (45 min). (2) The NOAA table only
tabulates values for PO2 >= 0.6. Since O2-uptake occurs down to
PO2=0.5, the same slope is used as for 0.7 > PO2 > 0.6.
This gives a conservative estimate for 0.6 > PO2 > 0.5. To
preserve the integer structure of the table, all slopes are
given as slope*10: divide by 10 to get the valid slope.
The columns below are:
po2 (mbar), Maximum Single Exposure (seconds), single_slope,
Maximum 24 hour Exposure (seconds), 24h_slope */
Then update Calculations of the CNS for a single dive -
this only takes the first divecomputer into account.
The previous version of the code did a table lookup and
used the max O2 exposure for the next-higher PO2 category.
This gave a shorter max O2 exposure time and a higher CNS
contribution for a specific dive segment, resulting in a
slightly conservative value of CNS, often some 2 - 3 % too high.
This code does an interpolation for PO2 values inbetween
PO2 entries in the lookup table and therefore results in a more
accurate maximum O2 exposure time for that PO2.
The maximum O2 exposure duration for each segment
is also calculated based on the mean depth of the two
samples (start & end) that define each segment. The CNS
contribution of each segment is found by dividing the
time duration of the segment by its maximum exposure duration.
The contributions of all segments of the dive are summed to
get the total CNS% value. This is a partial implementation
of the proposals in Erik Baker's document "Oxygen Toxicity Calculations" */
Overall, this PR does not radically alter the existing CNS calculation,
it only makes it more accurate and more consistent by doing
interpolation and by using mean segment depth to find PO2.
Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
2018-11-10 11:49:52 +00:00
|
|
|
/* Calculate the CNS for a single dive - this only takes the first divecomputer into account.
|
|
|
|
The CNS contributions are summed for dive segments defined by samples. The maximum O2 exposure duration for each
|
|
|
|
segment is calculated based on the mean depth of the two samples (start & end) that define each segment. The CNS
|
|
|
|
contribution of each segment is found by dividing the time duration of the segment by its maximum exposure duration.
|
|
|
|
The contributions of all segments of the dive are summed to get the total CNS% value. This is a partial implementation
|
|
|
|
of the proposals in Erik Baker's document "Oxygen Toxicity Calculations" using fixed-depth calculations for the mean
|
|
|
|
po2 for each segment. Empirical testing showed that, for large changes in depth, the cns calculation for the mean po2
|
|
|
|
value is extremely close, if not identical to the additive calculations for 0.1 bar increments in po2 from the start
|
|
|
|
to the end of the segment, assuming a constant rate of change in po2 (i.e. depth) with time. */
|
2018-08-23 17:18:43 +00:00
|
|
|
static double calculate_cns_dive(const struct dive *dive)
|
2013-04-09 17:25:21 +00:00
|
|
|
{
|
2017-10-02 18:35:21 +00:00
|
|
|
int n;
|
2018-08-23 17:18:43 +00:00
|
|
|
const struct divecomputer *dc = &dive->dc;
|
2017-10-02 18:35:21 +00:00
|
|
|
double cns = 0.0;
|
2019-08-17 19:46:00 +00:00
|
|
|
double rate;
|
More accurate CNS calculations (following comments on github)
Update table of maximum oxygen exposure durations, used in CNS calulations.
This table shows the official NOAA maximum O2 exposure limits
(in seconds) for different PO2 values. It also gives
slope values for linear interpolation for intermediate PO2 values
between the tabulated PO2 values in the 1st column.
Top & bottom rows are inserted that are not in the NOAA table:
(1) For PO2 > 1.6 the same slope value as between
1.5 & 1.6 is used. This exptrapolation for PO2 > 1.6 likely
gives an underestimate above 1.6 but is better than the
value for PO2=1.6 (45 min). (2) The NOAA table only
tabulates values for PO2 >= 0.6. Since O2-uptake occurs down to
PO2=0.5, the same slope is used as for 0.7 > PO2 > 0.6.
This gives a conservative estimate for 0.6 > PO2 > 0.5. To
preserve the integer structure of the table, all slopes are
given as slope*10: divide by 10 to get the valid slope.
The columns below are:
po2 (mbar), Maximum Single Exposure (seconds), single_slope,
Maximum 24 hour Exposure (seconds), 24h_slope */
Then update Calculations of the CNS for a single dive -
this only takes the first divecomputer into account.
The previous version of the code did a table lookup and
used the max O2 exposure for the next-higher PO2 category.
This gave a shorter max O2 exposure time and a higher CNS
contribution for a specific dive segment, resulting in a
slightly conservative value of CNS, often some 2 - 3 % too high.
This code does an interpolation for PO2 values inbetween
PO2 entries in the lookup table and therefore results in a more
accurate maximum O2 exposure time for that PO2.
The maximum O2 exposure duration for each segment
is also calculated based on the mean depth of the two
samples (start & end) that define each segment. The CNS
contribution of each segment is found by dividing the
time duration of the segment by its maximum exposure duration.
The contributions of all segments of the dive are summed to
get the total CNS% value. This is a partial implementation
of the proposals in Erik Baker's document "Oxygen Toxicity Calculations" */
Overall, this PR does not radically alter the existing CNS calculation,
it only makes it more accurate and more consistent by doing
interpolation and by using mean segment depth to find PO2.
Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
2018-11-10 11:49:52 +00:00
|
|
|
/* Calculate the CNS for each sample in this dive and sum them */
|
2017-10-02 18:35:21 +00:00
|
|
|
for (n = 1; n < dc->samples; n++) {
|
2013-04-09 17:25:21 +00:00
|
|
|
int t;
|
2021-08-18 21:38:15 +00:00
|
|
|
int po2;
|
2017-10-02 18:35:21 +00:00
|
|
|
struct sample *sample = dc->sample + n;
|
2013-04-09 17:25:21 +00:00
|
|
|
struct sample *psample = sample - 1;
|
|
|
|
t = sample->time.seconds - psample->time.seconds;
|
2021-08-18 21:38:15 +00:00
|
|
|
po2 = get_sample_o2(dive, dc, sample);
|
More accurate CNS calculations (following comments on github)
Update table of maximum oxygen exposure durations, used in CNS calulations.
This table shows the official NOAA maximum O2 exposure limits
(in seconds) for different PO2 values. It also gives
slope values for linear interpolation for intermediate PO2 values
between the tabulated PO2 values in the 1st column.
Top & bottom rows are inserted that are not in the NOAA table:
(1) For PO2 > 1.6 the same slope value as between
1.5 & 1.6 is used. This exptrapolation for PO2 > 1.6 likely
gives an underestimate above 1.6 but is better than the
value for PO2=1.6 (45 min). (2) The NOAA table only
tabulates values for PO2 >= 0.6. Since O2-uptake occurs down to
PO2=0.5, the same slope is used as for 0.7 > PO2 > 0.6.
This gives a conservative estimate for 0.6 > PO2 > 0.5. To
preserve the integer structure of the table, all slopes are
given as slope*10: divide by 10 to get the valid slope.
The columns below are:
po2 (mbar), Maximum Single Exposure (seconds), single_slope,
Maximum 24 hour Exposure (seconds), 24h_slope */
Then update Calculations of the CNS for a single dive -
this only takes the first divecomputer into account.
The previous version of the code did a table lookup and
used the max O2 exposure for the next-higher PO2 category.
This gave a shorter max O2 exposure time and a higher CNS
contribution for a specific dive segment, resulting in a
slightly conservative value of CNS, often some 2 - 3 % too high.
This code does an interpolation for PO2 values inbetween
PO2 entries in the lookup table and therefore results in a more
accurate maximum O2 exposure time for that PO2.
The maximum O2 exposure duration for each segment
is also calculated based on the mean depth of the two
samples (start & end) that define each segment. The CNS
contribution of each segment is found by dividing the
time duration of the segment by its maximum exposure duration.
The contributions of all segments of the dive are summed to
get the total CNS% value. This is a partial implementation
of the proposals in Erik Baker's document "Oxygen Toxicity Calculations" */
Overall, this PR does not radically alter the existing CNS calculation,
it only makes it more accurate and more consistent by doing
interpolation and by using mean segment depth to find PO2.
Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
2018-11-10 11:49:52 +00:00
|
|
|
/* Don't increase CNS when po2 below 500 matm */
|
2021-08-18 21:38:15 +00:00
|
|
|
if (po2 <= 500)
|
2014-06-17 18:01:16 +00:00
|
|
|
continue;
|
2019-08-17 19:46:00 +00:00
|
|
|
|
|
|
|
// This formula is the result of fitting two lines to the Log of the NOAA CNS table
|
2021-08-18 21:38:15 +00:00
|
|
|
rate = po2 <= 1500 ? exp(-11.7853 + 0.00193873 * po2) : exp(-23.6349 + 0.00980829 * po2);
|
2019-08-28 15:53:28 +00:00
|
|
|
cns += (double) t * rate * 100.0;
|
2013-04-09 17:25:21 +00:00
|
|
|
}
|
2017-10-02 18:35:21 +00:00
|
|
|
return cns;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* this only gets called if dive->maxcns == 0 which means we know that
|
|
|
|
* none of the divecomputers has tracked any CNS for us
|
|
|
|
* so we calculated it "by hand" */
|
|
|
|
static int calculate_cns(struct dive *dive)
|
|
|
|
{
|
|
|
|
int i, divenr;
|
|
|
|
double cns = 0.0;
|
|
|
|
timestamp_t last_starttime, last_endtime = 0;
|
|
|
|
|
|
|
|
/* shortcut */
|
|
|
|
if (dive->cns)
|
|
|
|
return dive->cns;
|
|
|
|
|
|
|
|
divenr = get_divenr(dive);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
i = divenr >= 0 ? divenr : divelog.dives->nr;
|
2017-10-02 18:35:21 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2018-05-13 22:29:54 +00:00
|
|
|
if (i >= 0 && i < dive_table.nr)
|
2017-10-02 18:35:21 +00:00
|
|
|
printf("\n\n*** CNS for dive #%d %d\n", i, get_dive(i)->number);
|
2018-05-13 22:29:54 +00:00
|
|
|
else
|
2017-10-02 18:35:21 +00:00
|
|
|
printf("\n\n*** CNS for dive #%d\n", i);
|
|
|
|
#endif
|
|
|
|
/* Look at next dive in dive list table and correct i when needed */
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
while (i < divelog.dives->nr - 1) {
|
2017-10-02 18:35:21 +00:00
|
|
|
struct dive *pdive = get_dive(i);
|
|
|
|
if (!pdive || pdive->when > dive->when)
|
|
|
|
break;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
/* Look at previous dive in dive list table and correct i when needed */
|
|
|
|
while (i > 0) {
|
|
|
|
struct dive *pdive = get_dive(i - 1);
|
|
|
|
if (!pdive || pdive->when < dive->when)
|
|
|
|
break;
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Dive number corrected to #%d\n", i);
|
|
|
|
#endif
|
|
|
|
last_starttime = dive->when;
|
|
|
|
/* Walk backwards to check previous dives - how far do we need to go back? */
|
|
|
|
while (i--) {
|
|
|
|
if (i == divenr && i > 0)
|
|
|
|
i--;
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Check if dive #%d %d has to be considered as prev dive: ", i, get_dive(i)->number);
|
|
|
|
#endif
|
|
|
|
struct dive *pdive = get_dive(i);
|
|
|
|
/* we don't want to mix dives from different trips as we keep looking
|
|
|
|
* for how far back we need to go */
|
|
|
|
if (dive->divetrip && pdive->divetrip != dive->divetrip) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
2018-05-13 22:29:54 +00:00
|
|
|
printf("No - other dive trip\n");
|
2017-10-02 18:35:21 +00:00
|
|
|
#endif
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!pdive || pdive->when >= dive->when || dive_endtime(pdive) + 12 * 60 * 60 < last_starttime) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("No\n");
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
last_starttime = pdive->when;
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Yes\n");
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
/* Walk forward and add dives and surface intervals to CNS */
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
while (++i < divelog.dives->nr) {
|
2017-10-02 18:35:21 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Check if dive #%d %d will be really added to CNS calc: ", i, get_dive(i)->number);
|
|
|
|
#endif
|
|
|
|
struct dive *pdive = get_dive(i);
|
|
|
|
/* again skip dives from different trips */
|
|
|
|
if (dive->divetrip && dive->divetrip != pdive->divetrip) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
2018-05-13 22:29:54 +00:00
|
|
|
printf("No - other dive trip\n");
|
2017-10-02 18:35:21 +00:00
|
|
|
#endif
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* Don't add future dives */
|
|
|
|
if (pdive->when >= dive->when) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("No - future or same dive\n");
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* Don't add the copy of the dive itself */
|
|
|
|
if (i == divenr) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("No - copy of dive\n");
|
|
|
|
#endif
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Yes\n");
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* CNS reduced with 90min halftime during surface interval */
|
2018-05-13 22:29:54 +00:00
|
|
|
if (last_endtime)
|
2017-10-02 18:35:21 +00:00
|
|
|
cns /= pow(2, (pdive->when - last_endtime) / (90.0 * 60.0));
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("CNS after surface interval: %f\n", cns);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
cns += calculate_cns_dive(pdive);
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("CNS after previous dive: %f\n", cns);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
last_starttime = pdive->when;
|
|
|
|
last_endtime = dive_endtime(pdive);
|
|
|
|
}
|
2018-05-13 22:29:54 +00:00
|
|
|
|
2017-10-02 18:35:21 +00:00
|
|
|
/* CNS reduced with 90min halftime during surface interval */
|
|
|
|
if (last_endtime)
|
|
|
|
cns /= pow(2, (dive->when - last_endtime) / (90.0 * 60.0));
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("CNS after last surface interval: %f\n", cns);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
cns += calculate_cns_dive(dive);
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("CNS after dive: %f\n", cns);
|
|
|
|
#endif
|
|
|
|
|
2013-04-09 17:25:21 +00:00
|
|
|
/* save calculated cns in dive struct */
|
2017-03-09 16:07:30 +00:00
|
|
|
dive->cns = lrint(cns);
|
2013-04-09 17:25:21 +00:00
|
|
|
return dive->cns;
|
|
|
|
}
|
2011-09-19 23:11:38 +00:00
|
|
|
/*
|
|
|
|
* Return air usage (in liters).
|
|
|
|
*/
|
2018-08-23 17:18:43 +00:00
|
|
|
static double calculate_airuse(const struct dive *dive)
|
2011-09-19 23:11:38 +00:00
|
|
|
{
|
2013-02-25 23:23:16 +00:00
|
|
|
int airuse = 0;
|
2011-09-19 23:11:38 +00:00
|
|
|
int i;
|
|
|
|
|
2021-11-14 02:55:33 +00:00
|
|
|
// SAC for a CCR dive does not make sense.
|
|
|
|
if (dive->dc.divemode == CCR)
|
|
|
|
return 0.0;
|
|
|
|
|
2019-08-04 16:44:57 +00:00
|
|
|
for (i = 0; i < dive->cylinders.nr; i++) {
|
2011-11-09 15:51:00 +00:00
|
|
|
pressure_t start, end;
|
2019-08-04 20:13:49 +00:00
|
|
|
const cylinder_t *cyl = get_cylinder(dive, i);
|
2011-09-19 23:11:38 +00:00
|
|
|
|
2011-11-09 15:51:00 +00:00
|
|
|
start = cyl->start.mbar ? cyl->start : cyl->sample_start;
|
|
|
|
end = cyl->end.mbar ? cyl->end : cyl->sample_end;
|
2018-05-17 19:25:57 +00:00
|
|
|
if (!end.mbar || start.mbar <= end.mbar) {
|
|
|
|
// If a cylinder is used but we do not have info on amout of gas used
|
|
|
|
// better not pretend we know the total gas use.
|
|
|
|
// Eventually, logic should be fixed to compute average depth and total time
|
|
|
|
// for those segments where cylinders with known pressure drop are breathed from.
|
|
|
|
if (is_cylinder_used(dive, i))
|
|
|
|
return 0.0;
|
|
|
|
else
|
|
|
|
continue;
|
|
|
|
}
|
2011-09-19 23:11:38 +00:00
|
|
|
|
2013-02-25 23:23:16 +00:00
|
|
|
airuse += gas_volume(cyl, start) - gas_volume(cyl, end);
|
2011-09-19 23:11:38 +00:00
|
|
|
}
|
2013-02-25 23:23:16 +00:00
|
|
|
return airuse / 1000.0;
|
2011-09-19 23:11:38 +00:00
|
|
|
}
|
|
|
|
|
2013-02-08 06:48:07 +00:00
|
|
|
/* this only uses the first divecomputer to calculate the SAC rate */
|
2018-08-23 17:18:43 +00:00
|
|
|
static int calculate_sac(const struct dive *dive)
|
2011-09-19 20:32:10 +00:00
|
|
|
{
|
2018-08-23 17:18:43 +00:00
|
|
|
const struct divecomputer *dc = &dive->dc;
|
2011-09-19 23:11:38 +00:00
|
|
|
double airuse, pressure, sac;
|
2013-02-24 18:50:18 +00:00
|
|
|
int duration, meandepth;
|
2011-09-19 23:11:38 +00:00
|
|
|
|
|
|
|
airuse = calculate_airuse(dive);
|
|
|
|
if (!airuse)
|
2011-11-02 02:56:14 +00:00
|
|
|
return 0;
|
2013-02-24 18:50:18 +00:00
|
|
|
|
2013-02-24 19:39:51 +00:00
|
|
|
duration = dc->duration.seconds;
|
2013-02-24 18:50:18 +00:00
|
|
|
if (!duration)
|
|
|
|
return 0;
|
2013-02-08 06:48:07 +00:00
|
|
|
|
2013-02-24 19:39:51 +00:00
|
|
|
meandepth = dc->meandepth.mm;
|
|
|
|
if (!meandepth)
|
|
|
|
return 0;
|
|
|
|
|
Fix up SAC calculations for ATM/bar confusion
We even documented that we did SAC in bar*l/min, but the "S" in SAC
stands for "Surface". So we should normalize SAC rate to surface
pressure, not one bar.
It's a tiny 1% difference, and doesn't actually matter in practice, but
it's noticeable when you want to explicitly test for SAC-rate by
creating a test-dive that averages exactly 10m. Suddenly you don't get
the round numbers you expect.
[ Side note: 10m is not _exactly_ one extra atmosphere according to our
calculations, but it's darn close in sea water: the standard salinity
of 1.03 kg/l together with the standard acceleration of 9.81m/s^2
gives an additional pressure of 1.01 bar, which is within a fraction
of a percent of one ATM.
Of course, divers have likely chosen that value exactly for the math
to come out that way, since the true average salinity of seawater is
actually slightly lower ]
So here's a few test-dives, along with the SAC rate fixup to make them
look right.
(There's also a one-liner to dive.c that makes the duration come out
right if the last sample has a non-zero depth, and the previous sample
did not: one of my original test-dives did the "average 10m depth" by
starting at 0 and ending at 20m, and dive.c got a tiny bit confused
about that ;)
[ The rationale for me testing our SAC rate calculations in the first
place was that on snorkkeli.net user "Poltsi" reported that our SAC rate
calculations differ from the ones that Suunto DM4 reports. So I wanted
to verify that we did things right.
Note that Poltsi reported differences larger than the difference of
BAR/ATM, so this is not the cause. I'll continue to look at this. ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-02-24 18:01:18 +00:00
|
|
|
/* Mean pressure in ATM (SAC calculations are in atm*l/min) */
|
2014-02-11 21:08:29 +00:00
|
|
|
pressure = depth_to_atm(meandepth, dive);
|
2011-11-21 21:23:13 +00:00
|
|
|
sac = airuse / pressure * 60 / duration;
|
2011-09-19 23:11:38 +00:00
|
|
|
|
|
|
|
/* milliliters per minute.. */
|
2017-03-09 16:07:30 +00:00
|
|
|
return lrint(sac * 1000);
|
2011-09-20 02:13:36 +00:00
|
|
|
}
|
2011-09-19 23:11:38 +00:00
|
|
|
|
2013-01-04 04:45:20 +00:00
|
|
|
/* for now we do this based on the first divecomputer */
|
2021-02-12 16:39:46 +00:00
|
|
|
static void add_dive_to_deco(struct deco_state *ds, struct dive *dive, bool in_planner)
|
2013-01-04 04:45:20 +00:00
|
|
|
{
|
|
|
|
struct divecomputer *dc = &dive->dc;
|
2018-09-10 18:40:25 +00:00
|
|
|
struct gasmix gasmix = gasmix_air;
|
2013-01-04 04:45:20 +00:00
|
|
|
int i;
|
2018-08-16 22:58:30 +00:00
|
|
|
const struct event *ev = NULL, *evd = NULL;
|
2018-05-08 14:24:51 +00:00
|
|
|
enum divemode_t current_divemode = UNDEF_COMP_TYPE;
|
2013-01-04 04:45:20 +00:00
|
|
|
|
|
|
|
if (!dc)
|
|
|
|
return;
|
2017-07-28 17:35:25 +00:00
|
|
|
|
2013-02-09 15:41:15 +00:00
|
|
|
for (i = 1; i < dc->samples; i++) {
|
2013-01-04 04:45:20 +00:00
|
|
|
struct sample *psample = dc->sample + i - 1;
|
|
|
|
struct sample *sample = dc->sample + i;
|
|
|
|
int t0 = psample->time.seconds;
|
|
|
|
int t1 = sample->time.seconds;
|
|
|
|
int j;
|
|
|
|
|
|
|
|
for (j = t0; j < t1; j++) {
|
2013-01-08 23:48:23 +00:00
|
|
|
int depth = interpolate(psample->depth.mm, sample->depth.mm, j - t0, t1 - t0);
|
2018-08-16 17:10:10 +00:00
|
|
|
gasmix = get_gasmix(dive, dc, j, &ev, gasmix);
|
|
|
|
add_segment(ds, depth_to_bar(depth, dive), gasmix, 1, sample->setpoint.mbar,
|
2021-02-12 16:39:46 +00:00
|
|
|
get_current_divemode(&dive->dc, j, &evd, ¤t_divemode), dive->sac,
|
|
|
|
in_planner);
|
2013-01-04 04:45:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
int get_divenr(const struct dive *dive)
|
2013-01-14 04:41:48 +00:00
|
|
|
{
|
2013-11-16 21:21:54 +00:00
|
|
|
int i;
|
2018-08-23 17:18:43 +00:00
|
|
|
const struct dive *d;
|
2014-07-04 04:18:40 +00:00
|
|
|
// tempting as it may be, don't die when called with dive=NULL
|
|
|
|
if (dive)
|
|
|
|
for_each_dive(i, d) {
|
|
|
|
if (d->id == dive->id) // don't compare pointers, we could be passing in a copy of the dive
|
|
|
|
return i;
|
|
|
|
}
|
2013-11-16 21:21:54 +00:00
|
|
|
return -1;
|
2013-01-14 04:41:48 +00:00
|
|
|
}
|
|
|
|
|
2013-01-04 04:45:20 +00:00
|
|
|
/* take into account previous dives until there is a 48h gap between dives */
|
2017-10-02 09:17:10 +00:00
|
|
|
/* return last surface time before this dive or dummy value of 48h */
|
|
|
|
/* return negative surface time if dives are overlapping */
|
2017-11-22 19:42:33 +00:00
|
|
|
/* The place you call this function is likely the place where you want
|
|
|
|
* to create the deco_state */
|
2024-05-04 16:45:55 +00:00
|
|
|
int init_decompression(struct deco_state *ds, const struct dive *dive, bool in_planner)
|
2013-01-04 04:45:20 +00:00
|
|
|
{
|
|
|
|
int i, divenr = -1;
|
2017-10-02 09:17:10 +00:00
|
|
|
int surface_time = 48 * 60 * 60;
|
|
|
|
timestamp_t last_endtime = 0, last_starttime = 0;
|
2014-01-15 18:54:41 +00:00
|
|
|
bool deco_init = false;
|
2015-08-31 21:25:28 +00:00
|
|
|
double surface_pressure;
|
2013-01-04 04:45:20 +00:00
|
|
|
|
|
|
|
if (!dive)
|
2016-12-15 22:22:54 +00:00
|
|
|
return false;
|
2014-03-09 00:47:06 +00:00
|
|
|
|
2013-01-14 04:41:48 +00:00
|
|
|
divenr = get_divenr(dive);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
i = divenr >= 0 ? divenr : divelog.dives->nr;
|
2017-10-02 09:17:10 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
if (i >= 0 && i < dive_table.nr)
|
|
|
|
printf("\n\n*** Init deco for dive #%d %d\n", i, get_dive(i)->number);
|
|
|
|
else
|
|
|
|
printf("\n\n*** Init deco for dive #%d\n", i);
|
|
|
|
#endif
|
|
|
|
/* Look at next dive in dive list table and correct i when needed */
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
while (i < divelog.dives->nr - 1) {
|
2017-10-02 09:17:10 +00:00
|
|
|
struct dive *pdive = get_dive(i);
|
|
|
|
if (!pdive || pdive->when > dive->when)
|
|
|
|
break;
|
2014-07-08 19:42:17 +00:00
|
|
|
i++;
|
|
|
|
}
|
2017-10-02 09:17:10 +00:00
|
|
|
/* Look at previous dive in dive list table and correct i when needed */
|
|
|
|
while (i > 0) {
|
|
|
|
struct dive *pdive = get_dive(i - 1);
|
|
|
|
if (!pdive || pdive->when < dive->when)
|
|
|
|
break;
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Dive number corrected to #%d\n", i);
|
|
|
|
#endif
|
|
|
|
last_starttime = dive->when;
|
|
|
|
/* Walk backwards to check previous dives - how far do we need to go back? */
|
2014-07-08 19:42:17 +00:00
|
|
|
while (i--) {
|
2017-10-02 09:17:10 +00:00
|
|
|
if (i == divenr && i > 0)
|
|
|
|
i--;
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Check if dive #%d %d has to be considered as prev dive: ", i, get_dive(i)->number);
|
|
|
|
#endif
|
2014-02-28 04:09:57 +00:00
|
|
|
struct dive *pdive = get_dive(i);
|
2013-01-14 03:37:41 +00:00
|
|
|
/* we don't want to mix dives from different trips as we keep looking
|
|
|
|
* for how far back we need to go */
|
2017-10-02 09:17:10 +00:00
|
|
|
if (dive->divetrip && pdive->divetrip != dive->divetrip) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
2018-05-13 22:29:54 +00:00
|
|
|
printf("No - other dive trip\n");
|
2017-10-02 09:17:10 +00:00
|
|
|
#endif
|
2013-01-14 03:37:41 +00:00
|
|
|
continue;
|
2017-10-02 09:17:10 +00:00
|
|
|
}
|
|
|
|
if (!pdive || pdive->when >= dive->when || dive_endtime(pdive) + 48 * 60 * 60 < last_starttime) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("No\n");
|
|
|
|
#endif
|
2013-01-04 04:45:20 +00:00
|
|
|
break;
|
2017-10-02 09:17:10 +00:00
|
|
|
}
|
|
|
|
last_starttime = pdive->when;
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Yes\n");
|
|
|
|
#endif
|
2013-01-04 04:45:20 +00:00
|
|
|
}
|
2017-10-02 09:17:10 +00:00
|
|
|
/* Walk forward an add dives and surface intervals to deco */
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
while (++i < divelog.dives->nr) {
|
2017-10-02 09:17:10 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Check if dive #%d %d will be really added to deco calc: ", i, get_dive(i)->number);
|
|
|
|
#endif
|
2014-02-28 04:09:57 +00:00
|
|
|
struct dive *pdive = get_dive(i);
|
2013-01-14 03:37:41 +00:00
|
|
|
/* again skip dives from different trips */
|
2017-10-02 09:17:10 +00:00
|
|
|
if (dive->divetrip && dive->divetrip != pdive->divetrip) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
2018-05-13 22:29:54 +00:00
|
|
|
printf("No - other dive trip\n");
|
2017-10-02 09:17:10 +00:00
|
|
|
#endif
|
2013-01-14 03:37:41 +00:00
|
|
|
continue;
|
2017-10-02 09:17:10 +00:00
|
|
|
}
|
2016-06-08 19:51:02 +00:00
|
|
|
/* Don't add future dives */
|
2017-10-02 09:17:10 +00:00
|
|
|
if (pdive->when >= dive->when) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("No - future or same dive\n");
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* Don't add the copy of the dive itself */
|
|
|
|
if (i == divenr) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("No - copy of dive\n");
|
|
|
|
#endif
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Yes\n");
|
|
|
|
#endif
|
|
|
|
|
2014-01-15 18:54:41 +00:00
|
|
|
surface_pressure = get_surface_pressure_in_mbar(pdive, true) / 1000.0;
|
2017-10-02 09:17:10 +00:00
|
|
|
/* Is it the first dive we add? */
|
2013-01-04 04:45:20 +00:00
|
|
|
if (!deco_init) {
|
2017-10-02 09:17:10 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Init deco\n");
|
|
|
|
#endif
|
2021-02-12 16:52:31 +00:00
|
|
|
clear_deco(ds, surface_pressure, in_planner);
|
2014-01-15 18:54:41 +00:00
|
|
|
deco_init = true;
|
2013-01-04 19:56:43 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2017-10-02 09:17:10 +00:00
|
|
|
printf("Tissues after init:\n");
|
2018-02-11 21:23:59 +00:00
|
|
|
dump_tissues(ds);
|
2013-01-04 04:45:20 +00:00
|
|
|
#endif
|
2019-05-15 14:42:14 +00:00
|
|
|
} else {
|
2017-10-02 09:17:10 +00:00
|
|
|
surface_time = pdive->when - last_endtime;
|
|
|
|
if (surface_time < 0) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Exit because surface intervall is %d\n", surface_time);
|
|
|
|
#endif
|
|
|
|
return surface_time;
|
|
|
|
}
|
2024-05-01 16:11:35 +00:00
|
|
|
add_segment(ds, surface_pressure, gasmix_air, surface_time, 0, OC, prefs.decosac, in_planner);
|
2013-01-14 03:37:41 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2024-05-01 09:01:06 +00:00
|
|
|
printf("Tissues after surface intervall of %d:%02u:\n", FRACTION_TUPLE(surface_time, 60));
|
2017-11-22 19:42:33 +00:00
|
|
|
dump_tissues(ds);
|
2013-01-14 03:37:41 +00:00
|
|
|
#endif
|
|
|
|
}
|
2017-10-02 09:17:10 +00:00
|
|
|
|
2021-02-12 16:39:46 +00:00
|
|
|
add_dive_to_deco(ds, pdive, in_planner);
|
2017-10-02 09:17:10 +00:00
|
|
|
|
|
|
|
last_starttime = pdive->when;
|
|
|
|
last_endtime = dive_endtime(pdive);
|
2017-11-22 19:42:33 +00:00
|
|
|
clear_vpmb_state(ds);
|
2016-06-08 19:51:02 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2017-10-02 09:17:10 +00:00
|
|
|
printf("Tissues after added dive #%d:\n", pdive->number);
|
2017-11-22 19:42:33 +00:00
|
|
|
dump_tissues(ds);
|
2016-06-08 19:51:02 +00:00
|
|
|
#endif
|
2013-01-14 03:37:41 +00:00
|
|
|
}
|
2017-10-02 09:17:10 +00:00
|
|
|
|
|
|
|
surface_pressure = get_surface_pressure_in_mbar(dive, true) / 1000.0;
|
|
|
|
/* We don't have had a previous dive at all? */
|
|
|
|
if (!deco_init) {
|
|
|
|
#if DECO_CALC_DEBUG & 2
|
2018-05-13 22:29:54 +00:00
|
|
|
printf("Init deco\n");
|
2017-10-02 09:17:10 +00:00
|
|
|
#endif
|
2021-02-12 16:52:31 +00:00
|
|
|
clear_deco(ds, surface_pressure, in_planner);
|
2013-01-04 19:56:43 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2017-10-02 09:17:10 +00:00
|
|
|
printf("Tissues after no previous dive, surface time set to 48h:\n");
|
2017-11-22 19:42:33 +00:00
|
|
|
dump_tissues(ds);
|
2013-01-04 04:45:20 +00:00
|
|
|
#endif
|
2019-05-15 14:42:14 +00:00
|
|
|
} else {
|
2017-10-02 09:17:10 +00:00
|
|
|
surface_time = dive->when - last_endtime;
|
|
|
|
if (surface_time < 0) {
|
2013-01-04 19:56:43 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2017-10-02 09:17:10 +00:00
|
|
|
printf("Exit because surface intervall is %d\n", surface_time);
|
|
|
|
#endif
|
|
|
|
return surface_time;
|
|
|
|
}
|
2024-05-01 16:11:35 +00:00
|
|
|
add_segment(ds, surface_pressure, gasmix_air, surface_time, 0, OC, prefs.decosac, in_planner);
|
2017-10-02 09:17:10 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2024-05-01 09:01:06 +00:00
|
|
|
printf("Tissues after surface intervall of %d:%02u:\n", FRACTION_TUPLE(surface_time, 60));
|
2017-11-22 19:42:33 +00:00
|
|
|
dump_tissues(ds);
|
2013-01-04 04:45:20 +00:00
|
|
|
#endif
|
|
|
|
}
|
2017-10-02 09:17:10 +00:00
|
|
|
|
2016-12-15 22:22:54 +00:00
|
|
|
// I do not dare to remove this call. We don't need the result but it might have side effects. Bummer.
|
2021-02-12 17:19:24 +00:00
|
|
|
tissue_tolerance_calc(ds, dive, surface_pressure, in_planner);
|
2017-01-03 14:14:42 +00:00
|
|
|
return surface_time;
|
2013-01-04 04:45:20 +00:00
|
|
|
}
|
|
|
|
|
2011-11-13 17:29:07 +00:00
|
|
|
void update_cylinder_related_info(struct dive *dive)
|
|
|
|
{
|
2011-11-13 17:51:34 +00:00
|
|
|
if (dive != NULL) {
|
2013-02-08 06:48:07 +00:00
|
|
|
dive->sac = calculate_sac(dive);
|
|
|
|
dive->otu = calculate_otu(dive);
|
2013-04-09 17:25:21 +00:00
|
|
|
if (dive->maxcns == 0)
|
|
|
|
dive->maxcns = calculate_cns(dive);
|
2011-11-13 17:29:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-15 09:48:41 +00:00
|
|
|
/* Like strcmp(), but don't crash on null-pointers */
|
|
|
|
static int safe_strcmp(const char *s1, const char *s2)
|
|
|
|
{
|
|
|
|
return strcmp(s1 ? s1 : "", s2 ? s2 : "");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Compare a list of dive computers by model name */
|
|
|
|
static int comp_dc(const struct divecomputer *dc1, const struct divecomputer *dc2)
|
|
|
|
{
|
|
|
|
int cmp;
|
|
|
|
while (dc1 || dc2) {
|
|
|
|
if (!dc1)
|
|
|
|
return -1;
|
|
|
|
if (!dc2)
|
|
|
|
return 1;
|
|
|
|
if ((cmp = safe_strcmp(dc1->model, dc2->model)) != 0)
|
|
|
|
return cmp;
|
|
|
|
dc1 = dc1->next;
|
|
|
|
dc2 = dc2->next;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-11-24 08:57:14 +00:00
|
|
|
/* This function defines the sort ordering of dives. The core
|
|
|
|
* and the UI models should use the same sort function, which
|
|
|
|
* should be stable. This is not crucial at the moment, as the
|
|
|
|
* indices in core and UI are independent, but ultimately we
|
|
|
|
* probably want to unify the models.
|
|
|
|
* After editing a key used in this sort-function, the order of
|
|
|
|
* the dives must be re-astablished.
|
|
|
|
* Currently, this does a lexicographic sort on the
|
2019-05-11 06:46:08 +00:00
|
|
|
* (start-time, trip-time, number, id) tuple.
|
2018-11-24 08:57:14 +00:00
|
|
|
* trip-time is defined such that dives that do not belong to
|
|
|
|
* a trip are sorted *after* dives that do. Thus, in the default
|
|
|
|
* chronologically-descending sort order, they are shown *before*.
|
|
|
|
* "id" is a stable, strictly increasing unique number, that
|
|
|
|
* is handed out when a dive is added to the system.
|
|
|
|
* We might also consider sorting by end-time and other criteria,
|
|
|
|
* but see the caveat above (editing means rearrangement of the dives).
|
|
|
|
*/
|
2024-05-04 16:45:55 +00:00
|
|
|
int comp_dives(const struct dive *a, const struct dive *b)
|
2018-11-24 09:01:03 +00:00
|
|
|
{
|
2019-05-15 09:48:41 +00:00
|
|
|
int cmp;
|
2018-11-24 08:57:14 +00:00
|
|
|
if (a->when < b->when)
|
|
|
|
return -1;
|
|
|
|
if (a->when > b->when)
|
|
|
|
return 1;
|
|
|
|
if (a->divetrip != b->divetrip) {
|
|
|
|
if (!b->divetrip)
|
|
|
|
return -1;
|
|
|
|
if (!a->divetrip)
|
|
|
|
return 1;
|
|
|
|
if (trip_date(a->divetrip) < trip_date(b->divetrip))
|
|
|
|
return -1;
|
|
|
|
if (trip_date(a->divetrip) > trip_date(b->divetrip))
|
|
|
|
return 1;
|
2018-11-24 09:01:03 +00:00
|
|
|
}
|
2019-05-11 06:46:08 +00:00
|
|
|
if (a->number < b->number)
|
|
|
|
return -1;
|
|
|
|
if (a->number > b->number)
|
|
|
|
return 1;
|
2019-05-15 09:48:41 +00:00
|
|
|
if ((cmp = comp_dc(&a->dc, &b->dc)) != 0)
|
|
|
|
return cmp;
|
2018-11-24 08:57:14 +00:00
|
|
|
if (a->id < b->id)
|
|
|
|
return -1;
|
|
|
|
if (a->id > b->id)
|
|
|
|
return 1;
|
|
|
|
return 0; /* this should not happen for a != b */
|
2018-11-24 09:01:03 +00:00
|
|
|
}
|
|
|
|
|
2019-05-31 14:09:14 +00:00
|
|
|
/* Dive table functions */
|
2019-06-04 19:25:42 +00:00
|
|
|
static MAKE_GROW_TABLE(dive_table, struct dive *, dives)
|
2018-11-24 08:57:14 +00:00
|
|
|
MAKE_GET_INSERTION_INDEX(dive_table, struct dive *, dives, dive_less_than)
|
2019-03-04 22:20:29 +00:00
|
|
|
MAKE_ADD_TO(dive_table, struct dive *, dives)
|
2018-11-24 08:57:14 +00:00
|
|
|
static MAKE_REMOVE_FROM(dive_table, dives)
|
|
|
|
static MAKE_GET_IDX(dive_table, struct dive *, dives)
|
|
|
|
MAKE_SORT(dive_table, struct dive *, dives, comp_dives)
|
2019-03-10 19:28:50 +00:00
|
|
|
MAKE_REMOVE(dive_table, struct dive *, dive)
|
2019-06-04 18:59:08 +00:00
|
|
|
MAKE_CLEAR_TABLE(dive_table, dives, dive)
|
2019-09-25 18:17:41 +00:00
|
|
|
MAKE_MOVE_TABLE(dive_table, dives)
|
2018-12-23 11:46:45 +00:00
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
void insert_dive(struct dive_table *table, struct dive *d)
|
2019-04-14 13:37:19 +00:00
|
|
|
{
|
|
|
|
int idx = dive_table_get_insertion_index(table, d);
|
|
|
|
add_to_dive_table(table, idx, d);
|
|
|
|
}
|
|
|
|
|
2018-09-23 19:22:48 +00:00
|
|
|
/*
|
2018-11-24 11:31:35 +00:00
|
|
|
* Walk the dives from the oldest dive in the given table, and see if we
|
2018-11-24 06:50:13 +00:00
|
|
|
* can autogroup them. But only do this when the user selected autogrouping.
|
2018-09-23 19:22:48 +00:00
|
|
|
*/
|
2019-03-17 20:52:45 +00:00
|
|
|
static void autogroup_dives(struct dive_table *table, struct trip_table *trip_table_arg)
|
2018-09-23 19:22:48 +00:00
|
|
|
{
|
|
|
|
int from, to;
|
|
|
|
dive_trip_t *trip;
|
|
|
|
int i, j;
|
|
|
|
bool alloc;
|
|
|
|
|
2022-11-12 08:14:00 +00:00
|
|
|
if (!divelog.autogroup)
|
2018-10-14 06:20:59 +00:00
|
|
|
return;
|
|
|
|
|
2018-11-26 22:39:37 +00:00
|
|
|
for (i = 0; (trip = get_dives_to_autogroup(table, i, &from, &to, &alloc)) != NULL; i = to) {
|
2018-11-24 11:31:35 +00:00
|
|
|
for (j = from; j < to; ++j)
|
2018-11-26 22:39:37 +00:00
|
|
|
add_dive_to_trip(table->dives[j], trip);
|
2018-09-23 19:22:48 +00:00
|
|
|
/* If this was newly allocated, add trip to list */
|
|
|
|
if (alloc)
|
2019-03-17 20:52:45 +00:00
|
|
|
insert_trip(trip, trip_table_arg);
|
2018-09-23 19:22:48 +00:00
|
|
|
}
|
2019-03-17 20:52:45 +00:00
|
|
|
sort_trip_table(trip_table_arg);
|
2012-11-26 04:06:54 +00:00
|
|
|
#ifdef DEBUG_TRIP
|
|
|
|
dump_trip_list();
|
|
|
|
#endif
|
2012-09-10 18:04:58 +00:00
|
|
|
}
|
|
|
|
|
2018-09-28 08:21:23 +00:00
|
|
|
/* Remove a dive from a dive table. This assumes that the
|
|
|
|
* dive was already removed from any trip and deselected.
|
|
|
|
* It simply shrinks the table and frees the trip */
|
2024-05-04 16:45:55 +00:00
|
|
|
void delete_dive_from_table(struct dive_table *table, int idx)
|
2018-09-28 08:21:23 +00:00
|
|
|
{
|
|
|
|
free_dive(table->dives[idx]);
|
2018-11-24 09:11:07 +00:00
|
|
|
remove_from_dive_table(table, idx);
|
2018-09-28 08:21:23 +00:00
|
|
|
}
|
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
struct dive *get_dive_from_table(int nr, const struct dive_table *dt)
|
2020-05-01 11:43:52 +00:00
|
|
|
{
|
|
|
|
if (nr >= dt->nr || nr < 0)
|
|
|
|
return NULL;
|
|
|
|
return dt->dives[nr];
|
|
|
|
}
|
|
|
|
|
2018-12-09 12:01:10 +00:00
|
|
|
/* This removes a dive from the global dive table but doesn't free the
|
|
|
|
* resources associated with the dive. The caller must removed the dive
|
|
|
|
* from the trip-list. Returns a pointer to the unregistered dive.
|
|
|
|
* The unregistered dive has the selection- and hidden-flags cleared. */
|
2024-05-04 16:45:55 +00:00
|
|
|
struct dive *unregister_dive(int idx)
|
2011-09-07 19:01:37 +00:00
|
|
|
{
|
2013-04-07 03:49:06 +00:00
|
|
|
struct dive *dive = get_dive(idx);
|
|
|
|
if (!dive)
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 12:44:27 +00:00
|
|
|
return NULL; /* this should never happen */
|
2020-04-13 10:17:43 +00:00
|
|
|
/* When removing a dive from the global dive table,
|
|
|
|
* we also have to unregister its fulltext cache. */
|
|
|
|
fulltext_unregister(dive);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
remove_from_dive_table(divelog.dives, idx);
|
2018-08-01 08:47:09 +00:00
|
|
|
if (dive->selected)
|
|
|
|
amount_selected--;
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
dive->selected = false;
|
Undo: fix multi-level undo of delete-dive and remove-dive-from-trip
The original undo-code was fundamentally broken. Not only did it leak
resources (copied trips were never freed), it also kept references
to trips or dives that could be changed by other commands. Thus,
anything more than a single undo could lead to crashes.
Two ways of fixing this were considered
1) Don't store pointers, but unique dive-ids and trip-ids.
Whereas such unique ids exist for dives, they would have to be
implemented for trips.
2) Don't free objects in the backend.
Instead, take ownership of deleted objects in the undo-object.
Thus, all references in previous undo-objects are guaranteed to
still exist (unless the objects are deleted elsewhere).
After some contemplation, the second method was chosen, because
it is significantly less intrusive. While touching the undo-objects,
clearly separate backend from ui-code, such that they can ultimately
be reused for mobile.
Note that if other parts of the code delete dives, crashes can still
be provoked. Notable examples are split/merge dives. These will have
to be fixed later. Nevertheless, the new code is a significant
improvement over the old state.
While touching the code, implement proper translation string based
on Qt's plural-feature (using %n).
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-19 12:44:27 +00:00
|
|
|
return dive;
|
|
|
|
}
|
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
void process_loaded_dives()
|
2018-09-23 10:53:35 +00:00
|
|
|
{
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
sort_dive_table(divelog.dives);
|
|
|
|
sort_trip_table(divelog.trips);
|
2018-11-23 14:18:59 +00:00
|
|
|
|
|
|
|
/* Autogroup dives if desired by user. */
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
autogroup_dives(divelog.dives, divelog.trips);
|
2020-02-16 21:26:47 +00:00
|
|
|
|
2020-04-08 07:05:28 +00:00
|
|
|
fulltext_populate();
|
cleanup: invert control-flow when resetting the core structures
To reset the core data structures, the mobile and desktop UIs
were calling into the dive-list models, which then reset the
core data structures, themselves and the unrelated
locationinformation model. The UI code then reset various other
things, such as the TankInformation model or the map. . This was
unsatisfying from a control-flow perspective, as the models should
display the core data, not act on it. Moreover, this meant lots
of intricate intermodule-dependencies.
Thus, straighten up the control flow: give the C core the
possibility to send a "all data reset" event. And do that
in those functions that reset the core data structures.
Let each module react to this event by itself. This removes
inter-module dependencies. For example, the MainWindow now
doesn't have to reset the TankInfoModel or the MapWidget.
Then, to reset the core data structures, let the UI code
simply directly call the respective core functions.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-04 22:12:36 +00:00
|
|
|
|
|
|
|
/* Inform frontend of reset data. This should reset all the models. */
|
|
|
|
emit_reset_signal();
|
2021-03-31 11:54:23 +00:00
|
|
|
|
|
|
|
/* Now that everything is settled, select the newest dive. */
|
|
|
|
select_newest_visible_dive();
|
2018-09-23 10:53:35 +00:00
|
|
|
}
|
|
|
|
|
2018-09-28 08:21:23 +00:00
|
|
|
/*
|
|
|
|
* Merge subsequent dives in a table, if mergeable. This assumes
|
|
|
|
* that the dives are neither selected, not part of a trip, as
|
|
|
|
* is the case of freshly imported dives.
|
|
|
|
*/
|
|
|
|
static void merge_imported_dives(struct dive_table *table)
|
2013-04-24 23:33:29 +00:00
|
|
|
{
|
2013-06-17 22:58:26 +00:00
|
|
|
int i;
|
2018-09-28 08:21:23 +00:00
|
|
|
for (i = 1; i < table->nr; i++) {
|
|
|
|
struct dive *prev = table->dives[i - 1];
|
|
|
|
struct dive *dive = table->dives[i];
|
2013-04-24 23:33:29 +00:00
|
|
|
struct dive *merged;
|
2019-03-05 21:58:47 +00:00
|
|
|
struct dive_site *ds;
|
2013-04-24 23:33:29 +00:00
|
|
|
|
|
|
|
/* only try to merge overlapping dives - or if one of the dives has
|
|
|
|
* zero duration (that might be a gps marker from the webservice) */
|
|
|
|
if (prev->duration.seconds && dive->duration.seconds &&
|
2017-09-30 16:00:34 +00:00
|
|
|
dive_endtime(prev) < dive->when)
|
2013-04-24 23:33:29 +00:00
|
|
|
continue;
|
|
|
|
|
2018-09-28 08:21:23 +00:00
|
|
|
merged = try_to_merge(prev, dive, false);
|
2013-04-24 23:33:29 +00:00
|
|
|
if (!merged)
|
|
|
|
continue;
|
|
|
|
|
2019-03-05 21:58:47 +00:00
|
|
|
/* Add dive to dive site; try_to_merge() does not do that! */
|
|
|
|
ds = merged->dive_site;
|
|
|
|
if (ds) {
|
|
|
|
merged->dive_site = NULL;
|
|
|
|
add_dive_to_dive_site(merged, ds);
|
|
|
|
}
|
2020-10-31 23:58:35 +00:00
|
|
|
unregister_dive_from_dive_site(prev);
|
|
|
|
unregister_dive_from_dive_site(dive);
|
|
|
|
unregister_dive_from_trip(prev);
|
|
|
|
unregister_dive_from_trip(dive);
|
2019-03-05 21:58:47 +00:00
|
|
|
|
2018-09-28 08:21:23 +00:00
|
|
|
/* Overwrite the first of the two dives and remove the second */
|
|
|
|
free_dive(prev);
|
|
|
|
table->dives[i - 1] = merged;
|
|
|
|
delete_dive_from_table(table, i);
|
2013-04-24 23:33:29 +00:00
|
|
|
|
|
|
|
/* Redo the new 'i'th dive */
|
|
|
|
i--;
|
|
|
|
}
|
2018-09-28 08:21:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Try to merge a new dive into the dive at position idx. Return
|
2018-12-23 21:08:00 +00:00
|
|
|
* true on success. On success, the old dive will be added to the
|
|
|
|
* dives_to_remove table and the merged dive to the dives_to_add
|
|
|
|
* table. On failure everything stays unchanged.
|
2018-09-28 08:21:23 +00:00
|
|
|
* If "prefer_imported" is true, use data of the new dive.
|
|
|
|
*/
|
2018-12-23 21:08:00 +00:00
|
|
|
static bool try_to_merge_into(struct dive *dive_to_add, int idx, struct dive_table *table, bool prefer_imported,
|
|
|
|
/* output parameters: */
|
|
|
|
struct dive_table *dives_to_add, struct dive_table *dives_to_remove)
|
2018-09-28 08:21:23 +00:00
|
|
|
{
|
2018-12-23 11:46:45 +00:00
|
|
|
struct dive *old_dive = table->dives[idx];
|
2018-09-28 08:21:23 +00:00
|
|
|
struct dive *merged = try_to_merge(old_dive, dive_to_add, prefer_imported);
|
|
|
|
if (!merged)
|
|
|
|
return false;
|
|
|
|
|
2018-12-23 11:46:45 +00:00
|
|
|
merged->divetrip = old_dive->divetrip;
|
2018-12-23 21:08:00 +00:00
|
|
|
insert_dive(dives_to_remove, old_dive);
|
|
|
|
insert_dive(dives_to_add, merged);
|
2018-09-28 08:21:23 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* Check if a dive is ranked after the last dive of the global dive list */
|
|
|
|
static bool dive_is_after_last(struct dive *d)
|
2018-12-23 11:46:45 +00:00
|
|
|
{
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
if (divelog.dives->nr == 0)
|
2018-12-23 21:08:00 +00:00
|
|
|
return true;
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
return dive_less_than(divelog.dives->dives[divelog.dives->nr - 1], d);
|
2018-12-23 21:08:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge dives from "dives_from" into "dives_to". Overlapping dives will be merged,
|
|
|
|
* non-overlapping dives will be moved. The results will be added to the "dives_to_add"
|
|
|
|
* table. Dives that were merged are added to the "dives_to_remove" table.
|
2019-01-13 06:12:47 +00:00
|
|
|
* Any newly added (not merged) dive will be assigned to the trip of the "trip"
|
2018-12-23 21:08:00 +00:00
|
|
|
* paremeter. If "delete_from" is non-null dives will be removed from this table.
|
|
|
|
* This function supposes that all input tables are sorted.
|
|
|
|
* Returns true if any dive was added (not merged) that is not past the
|
|
|
|
* last dive of the global dive list (i.e. the sequence will change).
|
|
|
|
* The integer pointed to by "num_merged" will be increased for every
|
|
|
|
* merged dive that is added to "dives_to_add" */
|
2018-12-23 11:46:45 +00:00
|
|
|
static bool merge_dive_tables(struct dive_table *dives_from, struct dive_table *delete_from,
|
2018-12-23 21:08:00 +00:00
|
|
|
struct dive_table *dives_to,
|
|
|
|
bool prefer_imported, struct dive_trip *trip,
|
|
|
|
/* output parameters: */
|
|
|
|
struct dive_table *dives_to_add, struct dive_table *dives_to_remove,
|
|
|
|
int *num_merged)
|
2018-12-23 11:46:45 +00:00
|
|
|
{
|
|
|
|
int i, j;
|
2018-12-23 21:08:00 +00:00
|
|
|
int last_merged_into = -1;
|
2018-12-23 11:46:45 +00:00
|
|
|
bool sequence_changed = false;
|
2018-09-28 08:21:23 +00:00
|
|
|
|
|
|
|
/* Merge newly imported dives into the dive table.
|
|
|
|
* Since both lists (old and new) are sorted, we can step
|
|
|
|
* through them concurrently and locate the insertions points.
|
|
|
|
* Once found, check if the new dive can be merged in the
|
|
|
|
* previous or next dive.
|
|
|
|
* Note that this doesn't consider pathological cases such as:
|
|
|
|
* - New dive "connects" two old dives (turn three into one).
|
|
|
|
* - New dive can not be merged into adjacent but some further dive.
|
|
|
|
*/
|
2018-12-23 11:46:45 +00:00
|
|
|
j = 0; /* Index in dives_to */
|
|
|
|
for (i = 0; i < dives_from->nr; i++) {
|
|
|
|
struct dive *dive_to_add = dives_from->dives[i];
|
|
|
|
|
|
|
|
if (delete_from)
|
2019-03-10 19:04:47 +00:00
|
|
|
remove_dive(dive_to_add, delete_from);
|
2018-09-28 08:21:23 +00:00
|
|
|
|
|
|
|
/* Find insertion point. */
|
2018-12-23 11:46:45 +00:00
|
|
|
while (j < dives_to->nr && dive_less_than(dives_to->dives[j], dive_to_add))
|
2018-09-28 08:21:23 +00:00
|
|
|
j++;
|
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* Try to merge into previous dive.
|
|
|
|
* We are extra-careful to not merge into the same dive twice, as that
|
|
|
|
* would put the merged-into dive twice onto the dives-to-delete list.
|
|
|
|
* In principle that shouldn't happen as all dives that compare equal
|
|
|
|
* by is_same_dive() were already merged, and is_same_dive() should be
|
|
|
|
* transitive. But let's just go *completely* sure for the odd corner-case. */
|
|
|
|
if (j > 0 && j - 1 > last_merged_into &&
|
|
|
|
dive_endtime(dives_to->dives[j - 1]) > dive_to_add->when) {
|
|
|
|
if (try_to_merge_into(dive_to_add, j - 1, dives_to, prefer_imported,
|
|
|
|
dives_to_add, dives_to_remove)) {
|
2018-12-23 11:46:45 +00:00
|
|
|
free_dive(dive_to_add);
|
2018-12-23 21:08:00 +00:00
|
|
|
last_merged_into = j - 1;
|
|
|
|
(*num_merged)++;
|
2018-09-28 08:21:23 +00:00
|
|
|
continue;
|
2018-12-23 11:46:45 +00:00
|
|
|
}
|
2018-09-28 08:21:23 +00:00
|
|
|
}
|
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* That didn't merge into the previous dive.
|
|
|
|
* Try to merge into next dive. */
|
|
|
|
if (j < dives_to->nr && j > last_merged_into &&
|
|
|
|
dive_endtime(dive_to_add) > dives_to->dives[j]->when) {
|
|
|
|
if (try_to_merge_into(dive_to_add, j, dives_to, prefer_imported,
|
|
|
|
dives_to_add, dives_to_remove)) {
|
2018-12-23 11:46:45 +00:00
|
|
|
free_dive(dive_to_add);
|
2018-12-23 21:08:00 +00:00
|
|
|
last_merged_into = j;
|
|
|
|
(*num_merged)++;
|
2018-09-28 08:21:23 +00:00
|
|
|
continue;
|
2018-12-23 11:46:45 +00:00
|
|
|
}
|
2018-09-28 08:21:23 +00:00
|
|
|
}
|
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* We couldnt merge dives, simply add to list of dives to-be-added. */
|
|
|
|
insert_dive(dives_to_add, dive_to_add);
|
|
|
|
sequence_changed |= !dive_is_after_last(dive_to_add);
|
2018-12-23 11:46:45 +00:00
|
|
|
dive_to_add->divetrip = trip;
|
|
|
|
}
|
2018-09-23 10:53:35 +00:00
|
|
|
|
2018-09-28 08:21:23 +00:00
|
|
|
/* we took care of all dives, clean up the import table */
|
2018-12-23 11:46:45 +00:00
|
|
|
dives_from->nr = 0;
|
|
|
|
|
|
|
|
return sequence_changed;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Merge the dives of the trip "from" and the dive_table "dives_from" into the trip "to"
|
|
|
|
* and dive_table "dives_to". If "prefer_imported" is true, dive data of "from" takes
|
|
|
|
* precedence */
|
2024-05-04 16:45:55 +00:00
|
|
|
void add_imported_dives(struct divelog *import_log, int flags)
|
2018-12-23 21:08:00 +00:00
|
|
|
{
|
|
|
|
int i, idx;
|
2020-01-09 05:25:02 +00:00
|
|
|
struct dive_table dives_to_add = empty_dive_table;
|
|
|
|
struct dive_table dives_to_remove = empty_dive_table;
|
|
|
|
struct trip_table trips_to_add = empty_trip_table;
|
2024-05-11 09:47:45 +00:00
|
|
|
dive_site_table dive_sites_to_add;
|
2020-10-17 14:07:39 +00:00
|
|
|
struct device_table *devices_to_add = alloc_device_table();
|
2018-12-23 21:08:00 +00:00
|
|
|
|
|
|
|
/* Process imported dives and generate lists of dives
|
|
|
|
* to-be-added and to-be-removed */
|
2022-11-12 07:40:04 +00:00
|
|
|
process_imported_dives(import_log, flags, &dives_to_add, &dives_to_remove, &trips_to_add,
|
2024-05-11 09:47:45 +00:00
|
|
|
dive_sites_to_add, devices_to_add);
|
2018-12-23 21:08:00 +00:00
|
|
|
|
2022-05-21 18:53:28 +00:00
|
|
|
/* Start by deselecting all dives, so that we don't end up with an invalid selection */
|
|
|
|
select_single_dive(NULL);
|
|
|
|
|
2019-03-05 21:58:47 +00:00
|
|
|
/* Add new dives to trip and site to get reference count correct. */
|
2018-12-23 21:08:00 +00:00
|
|
|
for (i = 0; i < dives_to_add.nr; i++) {
|
|
|
|
struct dive *d = dives_to_add.dives[i];
|
|
|
|
struct dive_trip *trip = d->divetrip;
|
2019-03-05 21:58:47 +00:00
|
|
|
struct dive_site *site = d->dive_site;
|
2018-12-23 21:08:00 +00:00
|
|
|
d->divetrip = NULL;
|
2019-03-05 21:58:47 +00:00
|
|
|
d->dive_site = NULL;
|
2018-12-23 21:08:00 +00:00
|
|
|
add_dive_to_trip(d, trip);
|
2019-03-05 21:58:47 +00:00
|
|
|
add_dive_to_dive_site(d, site);
|
2018-12-23 21:08:00 +00:00
|
|
|
}
|
2018-12-23 11:46:45 +00:00
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* Remove old dives */
|
|
|
|
for (i = 0; i < dives_to_remove.nr; i++) {
|
|
|
|
idx = get_divenr(dives_to_remove.dives[i]);
|
2024-05-12 10:46:57 +00:00
|
|
|
delete_single_dive(&divelog, idx);
|
2018-12-23 21:08:00 +00:00
|
|
|
}
|
|
|
|
dives_to_remove.nr = 0;
|
2018-12-23 11:46:45 +00:00
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* Add new dives */
|
2019-04-14 13:37:19 +00:00
|
|
|
for (i = 0; i < dives_to_add.nr; i++)
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
insert_dive(divelog.dives, dives_to_add.dives[i]);
|
2018-12-23 21:08:00 +00:00
|
|
|
dives_to_add.nr = 0;
|
2018-12-23 11:46:45 +00:00
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* Add new trips */
|
|
|
|
for (i = 0; i < trips_to_add.nr; i++)
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
insert_trip(trips_to_add.trips[i], divelog.trips);
|
2018-12-23 21:08:00 +00:00
|
|
|
trips_to_add.nr = 0;
|
2018-12-23 11:46:45 +00:00
|
|
|
|
2019-03-03 14:12:22 +00:00
|
|
|
/* Add new dive sites */
|
2024-05-11 09:47:45 +00:00
|
|
|
for (auto &ds: dive_sites_to_add)
|
|
|
|
divelog.sites->register_site(std::move(ds));
|
2019-03-03 14:12:22 +00:00
|
|
|
|
2020-10-17 14:07:39 +00:00
|
|
|
/* Add new devices */
|
|
|
|
for (i = 0; i < nr_devices(devices_to_add); i++) {
|
|
|
|
const struct device *dev = get_device(devices_to_add, i);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
add_to_device_table(divelog.devices, dev);
|
2020-10-17 14:07:39 +00:00
|
|
|
}
|
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* We might have deleted the old selected dive.
|
|
|
|
* Choose the newest dive as selected (if any) */
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
current_dive = divelog.dives->nr > 0 ? divelog.dives->dives[divelog.dives->nr - 1] : NULL;
|
cleanup: invert control-flow when resetting the core structures
To reset the core data structures, the mobile and desktop UIs
were calling into the dive-list models, which then reset the
core data structures, themselves and the unrelated
locationinformation model. The UI code then reset various other
things, such as the TankInformation model or the map. . This was
unsatisfying from a control-flow perspective, as the models should
display the core data, not act on it. Moreover, this meant lots
of intricate intermodule-dependencies.
Thus, straighten up the control flow: give the C core the
possibility to send a "all data reset" event. And do that
in those functions that reset the core data structures.
Let each module react to this event by itself. This removes
inter-module dependencies. For example, the MainWindow now
doesn't have to reset the TankInfoModel or the MapWidget.
Then, to reset the core data structures, let the UI code
simply directly call the respective core functions.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-04 22:12:36 +00:00
|
|
|
|
2020-10-17 14:07:39 +00:00
|
|
|
free_device_table(devices_to_add);
|
2024-05-26 14:36:53 +00:00
|
|
|
free(dives_to_add.dives);
|
|
|
|
free(dives_to_remove.dives);
|
|
|
|
free(trips_to_add.trips);
|
2020-10-17 14:07:39 +00:00
|
|
|
|
cleanup: invert control-flow when resetting the core structures
To reset the core data structures, the mobile and desktop UIs
were calling into the dive-list models, which then reset the
core data structures, themselves and the unrelated
locationinformation model. The UI code then reset various other
things, such as the TankInformation model or the map. . This was
unsatisfying from a control-flow perspective, as the models should
display the core data, not act on it. Moreover, this meant lots
of intricate intermodule-dependencies.
Thus, straighten up the control flow: give the C core the
possibility to send a "all data reset" event. And do that
in those functions that reset the core data structures.
Let each module react to this event by itself. This removes
inter-module dependencies. For example, the MainWindow now
doesn't have to reset the TankInfoModel or the MapWidget.
Then, to reset the core data structures, let the UI code
simply directly call the respective core functions.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-04 22:12:36 +00:00
|
|
|
/* Inform frontend of reset data. This should reset all the models. */
|
|
|
|
emit_reset_signal();
|
2018-12-23 11:46:45 +00:00
|
|
|
}
|
|
|
|
|
2019-01-10 15:07:03 +00:00
|
|
|
/* Helper function for process_imported_dives():
|
|
|
|
* Try to merge a trip into one of the existing trips.
|
|
|
|
* The bool pointed to by "sequence_changed" is set to true, if the sequence of
|
|
|
|
* the existing dives changes.
|
|
|
|
* The int pointed to by "start_renumbering_at" keeps track of the first dive
|
2019-01-13 06:12:47 +00:00
|
|
|
* to be renumbered in the dives_to_add table.
|
2019-01-10 15:07:03 +00:00
|
|
|
* For other parameters see process_imported_dives()
|
|
|
|
* Returns true if trip was merged. In this case, the trip will be
|
|
|
|
* freed.
|
|
|
|
*/
|
|
|
|
bool try_to_merge_trip(struct dive_trip *trip_import, struct dive_table *import_table, bool prefer_imported,
|
|
|
|
/* output parameters: */
|
|
|
|
struct dive_table *dives_to_add, struct dive_table *dives_to_remove,
|
|
|
|
bool *sequence_changed, int *start_renumbering_at)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct dive_trip *trip_old;
|
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
for (i = 0; i < divelog.trips->nr; i++) {
|
|
|
|
trip_old = divelog.trips->trips[i];
|
2019-01-10 15:07:03 +00:00
|
|
|
if (trips_overlap(trip_import, trip_old)) {
|
|
|
|
*sequence_changed |= merge_dive_tables(&trip_import->dives, import_table, &trip_old->dives,
|
|
|
|
prefer_imported, trip_old,
|
|
|
|
dives_to_add, dives_to_remove,
|
|
|
|
start_renumbering_at);
|
|
|
|
free_trip(trip_import); /* All dives in trip have been consumed -> free */
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* Process imported dives: take a table of dives to be imported and
|
2020-10-17 14:07:39 +00:00
|
|
|
* generate five lists:
|
2018-12-23 21:08:00 +00:00
|
|
|
* 1) Dives to be added
|
|
|
|
* 2) Dives to be removed
|
|
|
|
* 3) Trips to be added
|
2019-03-03 14:12:22 +00:00
|
|
|
* 4) Dive sites to be added
|
2020-10-17 14:07:39 +00:00
|
|
|
* 5) Devices to be added
|
2018-12-23 21:08:00 +00:00
|
|
|
* The dives to be added are owning (i.e. the caller is responsible
|
|
|
|
* for freeing them).
|
2019-03-03 14:12:22 +00:00
|
|
|
* The dives, trips and sites in "import_table", "import_trip_table"
|
|
|
|
* and "import_sites_table" are consumed. On return, the tables have
|
|
|
|
* size 0. "import_trip_table" may be NULL if all dives are not associated
|
2019-01-13 08:58:04 +00:00
|
|
|
* with a trip.
|
2019-03-03 14:12:22 +00:00
|
|
|
* The output tables should be empty - if not, their content
|
2018-12-23 21:08:00 +00:00
|
|
|
* will be cleared!
|
|
|
|
*
|
2019-03-03 14:12:22 +00:00
|
|
|
* Note: The new dives will have their divetrip- and divesites-fields
|
|
|
|
* set, but will *not* be part of the trip and site. The caller has to
|
|
|
|
* add them to the trip and site.
|
2018-12-23 21:08:00 +00:00
|
|
|
*
|
|
|
|
* The lists are generated by merging dives if possible. This is
|
2019-01-13 20:53:57 +00:00
|
|
|
* performed trip-wise. Finer control on merging is provided by
|
|
|
|
* the "flags" parameter:
|
|
|
|
* - If IMPORT_PREFER_IMPORTED is set, data of the new dives are
|
|
|
|
* prioritized on merging.
|
|
|
|
* - If IMPORT_MERGE_ALL_TRIPS is set, all overlapping trips will
|
|
|
|
* be merged, not only non-autogenerated trips.
|
|
|
|
* - If IMPORT_IS_DOWNLOADED is true, only the divecomputer of the
|
|
|
|
* first dive will be considered, as it is assumed that all dives
|
|
|
|
* come from the same computer.
|
|
|
|
* - If IMPORT_ADD_TO_NEW_TRIP is true, dives that are not assigned
|
|
|
|
* to a trip will be added to a newly generated trip.
|
2018-12-23 11:46:45 +00:00
|
|
|
*/
|
2022-11-12 07:40:04 +00:00
|
|
|
void process_imported_dives(struct divelog *import_log, int flags,
|
2018-12-23 21:08:00 +00:00
|
|
|
/* output parameters: */
|
|
|
|
struct dive_table *dives_to_add, struct dive_table *dives_to_remove,
|
2024-05-11 09:47:45 +00:00
|
|
|
struct trip_table *trips_to_add, dive_site_table &sites_to_add,
|
2020-10-17 14:07:39 +00:00
|
|
|
struct device_table *devices_to_add)
|
2018-12-23 11:46:45 +00:00
|
|
|
{
|
2019-03-03 13:56:38 +00:00
|
|
|
int i, j, nr, start_renumbering_at = 0;
|
2019-01-13 06:12:47 +00:00
|
|
|
struct dive_trip *trip_import, *new_trip;
|
2018-12-23 11:46:45 +00:00
|
|
|
bool sequence_changed = false;
|
2018-12-23 21:08:00 +00:00
|
|
|
bool new_dive_has_number = false;
|
2020-08-17 18:59:46 +00:00
|
|
|
bool last_old_dive_is_numbered;
|
2018-12-23 21:08:00 +00:00
|
|
|
|
|
|
|
/* Make sure that output parameters don't contain garbage */
|
2019-06-04 18:59:08 +00:00
|
|
|
clear_dive_table(dives_to_add);
|
|
|
|
clear_dive_table(dives_to_remove);
|
2018-12-23 21:08:00 +00:00
|
|
|
clear_trip_table(trips_to_add);
|
2024-05-11 09:47:45 +00:00
|
|
|
sites_to_add.clear();
|
2020-10-17 14:07:39 +00:00
|
|
|
clear_device_table(devices_to_add);
|
2018-12-23 21:08:00 +00:00
|
|
|
|
|
|
|
/* Check if any of the new dives has a number. This will be
|
|
|
|
* important later to decide if we want to renumber the added
|
|
|
|
* dives */
|
2022-11-12 07:40:04 +00:00
|
|
|
for (int i = 0; i < import_log->dives->nr; i++) {
|
|
|
|
if (import_log->dives->dives[i]->number > 0) {
|
2018-12-23 21:08:00 +00:00
|
|
|
new_dive_has_number = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2018-12-23 11:46:45 +00:00
|
|
|
|
|
|
|
/* If no dives were imported, don't bother doing anything */
|
2022-11-12 07:40:04 +00:00
|
|
|
if (!import_log->dives->nr)
|
2018-12-23 11:46:45 +00:00
|
|
|
return;
|
|
|
|
|
2020-10-17 14:07:39 +00:00
|
|
|
/* Add only the devices that we don't know about yet. */
|
2022-11-12 07:40:04 +00:00
|
|
|
for (i = 0; i < nr_devices(import_log->devices); i++) {
|
|
|
|
const struct device *dev = get_device(import_log->devices, i);
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
if (!device_exists(divelog.devices, dev))
|
2020-10-17 14:07:39 +00:00
|
|
|
add_to_device_table(devices_to_add, dev);
|
|
|
|
}
|
|
|
|
|
2018-12-23 11:46:45 +00:00
|
|
|
/* Sort the table of dives to be imported and combine mergable dives */
|
2022-11-12 07:40:04 +00:00
|
|
|
sort_dive_table(import_log->dives);
|
|
|
|
merge_imported_dives(import_log->dives);
|
2018-12-23 11:46:45 +00:00
|
|
|
|
2019-01-13 06:12:47 +00:00
|
|
|
/* Autogroup tripless dives if desired by user. But don't autogroup
|
|
|
|
* if tripless dives should be added to a new trip. */
|
2019-01-13 20:53:57 +00:00
|
|
|
if (!(flags & IMPORT_ADD_TO_NEW_TRIP))
|
2022-11-12 07:40:04 +00:00
|
|
|
autogroup_dives(import_log->dives, import_log->trips);
|
2018-12-23 11:46:45 +00:00
|
|
|
|
2019-03-03 14:12:22 +00:00
|
|
|
/* If dive sites already exist, use the existing versions. */
|
2024-05-11 09:47:45 +00:00
|
|
|
for (auto &new_ds: *import_log->sites) {
|
|
|
|
struct dive_site *old_ds = get_same_dive_site(*new_ds);
|
2019-03-03 14:12:22 +00:00
|
|
|
|
|
|
|
/* Check if it dive site is actually used by new dives. */
|
2022-11-12 07:40:04 +00:00
|
|
|
for (j = 0; j < import_log->dives->nr; j++) {
|
2024-05-11 09:47:45 +00:00
|
|
|
if (import_log->dives->dives[j]->dive_site == new_ds.get())
|
2019-03-03 14:12:22 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2022-11-12 07:40:04 +00:00
|
|
|
if (j == import_log->dives->nr) {
|
2024-05-11 09:47:45 +00:00
|
|
|
/* Dive site not even used. */
|
2019-03-03 14:12:22 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!old_ds) {
|
|
|
|
/* Dive site doesn't exist. Add it to list of dive sites to be added. */
|
2024-05-04 12:41:04 +00:00
|
|
|
new_ds->dives.clear(); /* Caller is responsible for adding dives to site */
|
2024-05-11 09:47:45 +00:00
|
|
|
sites_to_add.put(std::move(new_ds));
|
|
|
|
} else {
|
|
|
|
/* Dive site already exists - use the old one. */
|
|
|
|
for (j = 0; j < import_log->dives->nr; j++) {
|
|
|
|
if (import_log->dives->dives[j]->dive_site == new_ds.get())
|
|
|
|
import_log->dives->dives[j]->dive_site = old_ds;
|
|
|
|
}
|
2019-03-03 14:12:22 +00:00
|
|
|
}
|
|
|
|
}
|
2024-05-11 09:47:45 +00:00
|
|
|
import_log->sites->clear();
|
2019-03-03 14:12:22 +00:00
|
|
|
|
2018-12-23 11:46:45 +00:00
|
|
|
/* Merge overlapping trips. Since both trip tables are sorted, we
|
|
|
|
* could be smarter here, but realistically not a whole lot of trips
|
|
|
|
* will be imported so do a simple n*m loop until someone complains.
|
|
|
|
*/
|
2022-11-12 07:40:04 +00:00
|
|
|
for (i = 0; i < import_log->trips->nr; i++) {
|
|
|
|
trip_import = import_log->trips->trips[i];
|
2019-01-13 20:53:57 +00:00
|
|
|
if ((flags & IMPORT_MERGE_ALL_TRIPS) || trip_import->autogen) {
|
2022-11-12 07:40:04 +00:00
|
|
|
if (try_to_merge_trip(trip_import, import_log->dives, flags & IMPORT_PREFER_IMPORTED, dives_to_add, dives_to_remove,
|
2019-01-10 15:07:03 +00:00
|
|
|
&sequence_changed, &start_renumbering_at))
|
|
|
|
continue;
|
2018-12-23 11:46:45 +00:00
|
|
|
}
|
|
|
|
|
2019-01-10 15:07:03 +00:00
|
|
|
/* If no trip to merge-into was found, add trip as-is.
|
|
|
|
* First, add dives to list of dives to add */
|
2019-03-03 13:56:38 +00:00
|
|
|
for (j = 0; j < trip_import->dives.nr; j++) {
|
|
|
|
struct dive *d = trip_import->dives.dives[j];
|
2018-09-28 08:21:23 +00:00
|
|
|
|
2019-01-10 15:07:03 +00:00
|
|
|
/* Add dive to list of dives to-be-added. */
|
|
|
|
insert_dive(dives_to_add, d);
|
|
|
|
sequence_changed |= !dive_is_after_last(d);
|
2013-04-24 23:33:29 +00:00
|
|
|
|
2022-11-12 07:40:04 +00:00
|
|
|
remove_dive(d, import_log->dives);
|
2018-12-23 21:08:00 +00:00
|
|
|
}
|
2019-01-10 15:07:03 +00:00
|
|
|
|
|
|
|
/* Then, add trip to list of trips to add */
|
|
|
|
insert_trip(trip_import, trips_to_add);
|
|
|
|
trip_import->dives.nr = 0; /* Caller is responsible for adding dives to trip */
|
2018-12-23 21:08:00 +00:00
|
|
|
}
|
2022-11-12 07:40:04 +00:00
|
|
|
import_log->trips->nr = 0; /* All trips were consumed */
|
2018-11-24 11:31:35 +00:00
|
|
|
|
2022-11-12 07:40:04 +00:00
|
|
|
if ((flags & IMPORT_ADD_TO_NEW_TRIP) && import_log->dives->nr > 0) {
|
2019-01-13 06:12:47 +00:00
|
|
|
/* Create a new trip for unassigned dives, if desired. */
|
2022-11-12 07:40:04 +00:00
|
|
|
new_trip = create_trip_from_dive(import_log->dives->dives[0]);
|
2019-01-13 06:12:47 +00:00
|
|
|
insert_trip(new_trip, trips_to_add);
|
|
|
|
|
|
|
|
/* Add all remaining dives to this trip */
|
2022-11-12 07:40:04 +00:00
|
|
|
for (i = 0; i < import_log->dives->nr; i++) {
|
|
|
|
struct dive *d = import_log->dives->dives[i];
|
2019-01-13 06:12:47 +00:00
|
|
|
d->divetrip = new_trip;
|
|
|
|
insert_dive(dives_to_add, d);
|
|
|
|
sequence_changed |= !dive_is_after_last(d);
|
|
|
|
}
|
|
|
|
|
2022-11-12 07:40:04 +00:00
|
|
|
import_log->dives->nr = 0; /* All dives were consumed */
|
|
|
|
} else if (import_log->dives->nr > 0) {
|
|
|
|
/* The remaining dives in import_log->dives are those that don't belong to
|
2019-01-13 06:12:47 +00:00
|
|
|
* a trip and the caller does not want them to be associated to a
|
|
|
|
* new trip. Merge them into the global table. */
|
2022-11-12 07:40:04 +00:00
|
|
|
sequence_changed |= merge_dive_tables(import_log->dives, NULL, divelog.dives, flags & IMPORT_PREFER_IMPORTED, NULL,
|
2019-01-13 06:12:47 +00:00
|
|
|
dives_to_add, dives_to_remove, &start_renumbering_at);
|
|
|
|
}
|
2018-12-23 21:08:00 +00:00
|
|
|
|
|
|
|
/* If new dives were only added at the end, renumber the added dives.
|
|
|
|
* But only if
|
2020-08-17 18:59:46 +00:00
|
|
|
* - The last dive in the old dive table had a number itself (if there is a last dive).
|
2018-12-23 21:08:00 +00:00
|
|
|
* - None of the new dives has a number.
|
|
|
|
*/
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
last_old_dive_is_numbered = divelog.dives->nr == 0 || divelog.dives->dives[divelog.dives->nr - 1]->number > 0;
|
2020-08-17 18:59:46 +00:00
|
|
|
|
2018-12-23 21:08:00 +00:00
|
|
|
/* We counted the number of merged dives that were added to dives_to_add.
|
|
|
|
* Skip those. Since sequence_changed is false all added dives are *after*
|
|
|
|
* all merged dives. */
|
2020-08-17 18:59:46 +00:00
|
|
|
if (!sequence_changed && last_old_dive_is_numbered && !new_dive_has_number) {
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
nr = divelog.dives->nr > 0 ? divelog.dives->dives[divelog.dives->nr - 1]->number : 0;
|
2018-12-23 21:08:00 +00:00
|
|
|
for (i = start_renumbering_at; i < dives_to_add->nr; i++)
|
|
|
|
dives_to_add->dives[i]->number = ++nr;
|
|
|
|
}
|
2013-04-24 23:33:29 +00:00
|
|
|
}
|
2014-08-18 19:12:05 +00:00
|
|
|
|
2019-12-13 05:56:07 +00:00
|
|
|
static struct dive *get_last_valid_dive()
|
|
|
|
{
|
|
|
|
int i;
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
for (i = divelog.dives->nr - 1; i >= 0; i--) {
|
|
|
|
if (!divelog.dives->dives[i]->invalid)
|
|
|
|
return divelog.dives->dives[i];
|
2019-12-13 05:56:07 +00:00
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2018-07-19 20:35:25 +00:00
|
|
|
/* return the number a dive gets when inserted at the given index.
|
|
|
|
* this function is supposed to be called *before* a dive was added.
|
|
|
|
* this returns:
|
|
|
|
* - 1 for an empty log
|
|
|
|
* - last_nr+1 for addition at end of log (if last dive had a number)
|
|
|
|
* - 0 for all other cases
|
|
|
|
*/
|
2024-05-04 16:45:55 +00:00
|
|
|
int get_dive_nr_at_idx(int idx)
|
2018-07-19 20:35:25 +00:00
|
|
|
{
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
if (idx < divelog.dives->nr)
|
2020-04-12 11:44:08 +00:00
|
|
|
return 0;
|
|
|
|
struct dive *last_dive = get_last_valid_dive();
|
2019-12-13 05:56:07 +00:00
|
|
|
if (!last_dive)
|
2018-07-19 20:35:25 +00:00
|
|
|
return 1;
|
2019-12-13 05:56:07 +00:00
|
|
|
return last_dive->number ? last_dive->number + 1 : 0;
|
2018-07-19 20:35:25 +00:00
|
|
|
}
|
|
|
|
|
2015-06-20 13:45:12 +00:00
|
|
|
static int min_datafile_version;
|
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
int get_min_datafile_version()
|
2015-06-20 13:45:12 +00:00
|
|
|
{
|
|
|
|
return min_datafile_version;
|
|
|
|
}
|
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
void report_datafile_version(int version)
|
2015-06-20 13:45:12 +00:00
|
|
|
{
|
|
|
|
if (min_datafile_version == 0 || min_datafile_version > version)
|
|
|
|
min_datafile_version = version;
|
|
|
|
}
|
2015-07-24 20:18:30 +00:00
|
|
|
|
|
|
|
void clear_dive_file_data()
|
|
|
|
{
|
2020-02-16 21:26:47 +00:00
|
|
|
fulltext_unregister_all();
|
2024-05-01 16:11:35 +00:00
|
|
|
select_single_dive(NULL); // This is propagated up to the UI and clears all the information.
|
2020-02-16 21:26:47 +00:00
|
|
|
|
2019-11-15 19:16:02 +00:00
|
|
|
current_dive = NULL;
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
clear_divelog(&divelog);
|
2015-07-24 20:18:30 +00:00
|
|
|
|
2024-02-14 09:59:13 +00:00
|
|
|
clear_event_types();
|
2015-08-25 20:55:51 +00:00
|
|
|
|
2024-05-01 16:11:35 +00:00
|
|
|
min_datafile_version = 0;
|
2019-07-25 05:25:54 +00:00
|
|
|
clear_git_id();
|
cleanup: invert control-flow when resetting the core structures
To reset the core data structures, the mobile and desktop UIs
were calling into the dive-list models, which then reset the
core data structures, themselves and the unrelated
locationinformation model. The UI code then reset various other
things, such as the TankInformation model or the map. . This was
unsatisfying from a control-flow perspective, as the models should
display the core data, not act on it. Moreover, this meant lots
of intricate intermodule-dependencies.
Thus, straighten up the control flow: give the C core the
possibility to send a "all data reset" event. And do that
in those functions that reset the core data structures.
Let each module react to this event by itself. This removes
inter-module dependencies. For example, the MainWindow now
doesn't have to reset the TankInfoModel or the MapWidget.
Then, to reset the core data structures, let the UI code
simply directly call the respective core functions.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-04 22:12:36 +00:00
|
|
|
|
2024-05-03 21:18:45 +00:00
|
|
|
reset_tank_info_table(tank_info_table);
|
2020-12-11 21:34:35 +00:00
|
|
|
|
cleanup: invert control-flow when resetting the core structures
To reset the core data structures, the mobile and desktop UIs
were calling into the dive-list models, which then reset the
core data structures, themselves and the unrelated
locationinformation model. The UI code then reset various other
things, such as the TankInformation model or the map. . This was
unsatisfying from a control-flow perspective, as the models should
display the core data, not act on it. Moreover, this meant lots
of intricate intermodule-dependencies.
Thus, straighten up the control flow: give the C core the
possibility to send a "all data reset" event. And do that
in those functions that reset the core data structures.
Let each module react to this event by itself. This removes
inter-module dependencies. For example, the MainWindow now
doesn't have to reset the TankInfoModel or the MapWidget.
Then, to reset the core data structures, let the UI code
simply directly call the respective core functions.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-04 22:12:36 +00:00
|
|
|
/* Inform frontend of reset data. This should reset all the models. */
|
|
|
|
emit_reset_signal();
|
2015-07-24 20:18:30 +00:00
|
|
|
}
|
2018-08-01 19:57:24 +00:00
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
bool dive_less_than(const struct dive *a, const struct dive *b)
|
2018-08-26 12:42:38 +00:00
|
|
|
{
|
|
|
|
return comp_dives(a, b) < 0;
|
|
|
|
}
|
|
|
|
|
2018-11-10 08:07:42 +00:00
|
|
|
/* When comparing a dive to a trip, use the first dive of the trip. */
|
|
|
|
static int comp_dive_to_trip(struct dive *a, struct dive_trip *b)
|
|
|
|
{
|
|
|
|
/* This should never happen, nevertheless don't crash on trips
|
|
|
|
* with no (or worse a negative number of) dives. */
|
2019-10-27 19:58:39 +00:00
|
|
|
if (!b || b->dives.nr <= 0)
|
2018-11-10 08:07:42 +00:00
|
|
|
return -1;
|
|
|
|
return comp_dives(a, b->dives.dives[0]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int comp_dive_or_trip(struct dive_or_trip a, struct dive_or_trip b)
|
|
|
|
{
|
2019-10-27 20:29:22 +00:00
|
|
|
/* we should only be called with both a and b having exactly one of
|
|
|
|
* dive or trip not NULL. But in an abundance of caution, make sure
|
|
|
|
* we still give a consistent answer even when called with invalid
|
|
|
|
* arguments, as otherwise we might be hunting down crashes at a later
|
|
|
|
* time...
|
|
|
|
*/
|
|
|
|
if (!a.dive && !a.trip && !b.dive && !b.trip)
|
|
|
|
return 0;
|
|
|
|
if (!a.dive && !a.trip)
|
|
|
|
return -1;
|
|
|
|
if (!b.dive && !b.trip)
|
|
|
|
return 1;
|
2018-11-10 08:07:42 +00:00
|
|
|
if (a.dive && b.dive)
|
|
|
|
return comp_dives(a.dive, b.dive);
|
|
|
|
if (a.trip && b.trip)
|
|
|
|
return comp_trips(a.trip, b.trip);
|
|
|
|
if (a.dive)
|
|
|
|
return comp_dive_to_trip(a.dive, b.trip);
|
|
|
|
else
|
|
|
|
return -comp_dive_to_trip(b.dive, a.trip);
|
|
|
|
}
|
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
bool dive_or_trip_less_than(struct dive_or_trip a, struct dive_or_trip b)
|
2018-11-10 08:07:42 +00:00
|
|
|
{
|
|
|
|
return comp_dive_or_trip(a, b) < 0;
|
|
|
|
}
|
|
|
|
|
2018-10-06 07:21:27 +00:00
|
|
|
/*
|
|
|
|
* Calculate surface interval for dive starting at "when". Currently, we
|
|
|
|
* might display dives which are not yet in the divelist, therefore the
|
|
|
|
* input parameter is a timestamp.
|
|
|
|
* If the given dive starts during a different dive, the surface interval
|
|
|
|
* is 0. If we can't determine a surface interval (first dive), <0 is
|
|
|
|
* returned. This does *not* consider pathological cases such as dives
|
|
|
|
* that happened inside other dives. The interval will always be calculated
|
|
|
|
* with respect to the dive that started previously.
|
|
|
|
*/
|
2024-05-04 16:45:55 +00:00
|
|
|
timestamp_t get_surface_interval(timestamp_t when)
|
2018-10-06 07:21:27 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
timestamp_t prev_end;
|
|
|
|
|
|
|
|
/* find previous dive. might want to use a binary search. */
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
for (i = divelog.dives->nr - 1; i >= 0; --i) {
|
|
|
|
if (divelog.dives->dives[i]->when < when)
|
2018-10-06 07:21:27 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i < 0)
|
|
|
|
return -1;
|
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
prev_end = dive_endtime(divelog.dives->dives[i]);
|
2018-10-06 07:21:27 +00:00
|
|
|
if (prev_end > when)
|
|
|
|
return 0;
|
|
|
|
return when - prev_end;
|
|
|
|
}
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
|
|
|
|
/* Find visible dive close to given date. First search towards older,
|
|
|
|
* then newer dives. */
|
2024-05-04 16:45:55 +00:00
|
|
|
struct dive *find_next_visible_dive(timestamp_t when)
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
if (!divelog.dives->nr)
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* we might want to use binary search here */
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
for (i = 0; i < divelog.dives->nr; i++) {
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
if (when <= get_dive(i)->when)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (j = i - 1; j > 0; j--) {
|
|
|
|
if (!get_dive(j)->hidden_by_filter)
|
|
|
|
return get_dive(j);
|
|
|
|
}
|
|
|
|
|
core: introduce divelog structure
The parser API was very annoying, as a number of tables
to-be-filled were passed in as pointers. The goal of this
commit is to collect all these tables in a single struct.
This should make it (more or less) clear what is actually
written into the divelog files.
Moreover, it should now be rather easy to search for
instances, where the global logfile is accessed (and it
turns out that there are many!).
The divelog struct does not contain the tables as substructs,
but only collects pointers. The idea is that the "divelog.h"
file can be included without all the other files describing
the numerous tables.
To make it easier to use from C++ parts of the code, the
struct implements a constructor and a destructor. Sadly,
we can't use smart pointers, since the pointers are accessed
from C code. Therfore the constructor and destructor are
quite complex.
The whole commit is large, but was mostly an automatic
conversion.
One oddity of note: the divelog structure also contains
the "autogroup" flag, since that is saved in the divelog.
This actually fixes a bug: Before, when importing dives
from a different log, the autogroup flag was overwritten.
This was probably not intended and does not happen anymore.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2022-11-08 20:31:08 +00:00
|
|
|
for (j = i; j < divelog.dives->nr; j++) {
|
Undo: select dives after add, remove, merge, split dive commands
Select the proper dives after the add, remove, split and merge
dives commands on undo *and* redo. Generally, select the added
dives. For undo of add, remember the pre-addition selection.
For redo of remove, select the closest dive to the first removed
dive.
The biggest part of the commit is the signal-interface between
the dive commands and the dive-list model and dive-list view.
This is done in two steps:
1) To the DiveTripModel in batches of trips. The dive trip model
transforms the dives into indices.
2) To the DiveListView. The DiveListView has to translate the
DiveTripModel indexes to actual indexes via its QSortFilterProxy-
model.
For code-reuse, derive all divelist-changing commands from a new base-class,
which has a flag that describes whether the divelist changed. The helper
functions which add and remove dives are made members of the base class and
set the flag is a selected dive is added or removed.
To properly detect when the current dive was deleted it
became necessary to turn the current dive from an index
to a pointer, because indices are not stable.
Unfortunately, in some cases an index was expected and these
places now have to transform the dive into an index. These
should be converted in due course.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-08-03 09:35:43 +00:00
|
|
|
if (!get_dive(j)->hidden_by_filter)
|
|
|
|
return get_dive(j);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2021-10-30 19:39:36 +00:00
|
|
|
|
2024-05-04 16:45:55 +00:00
|
|
|
bool has_dive(unsigned int deviceid, unsigned int diveid)
|
2021-10-30 19:39:36 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
|
|
for_each_dive (i, dive) {
|
|
|
|
struct divecomputer *dc;
|
|
|
|
|
|
|
|
for_each_dc (dive, dc) {
|
|
|
|
if (dc->deviceid != deviceid)
|
|
|
|
continue;
|
|
|
|
if (dc->diveid != diveid)
|
|
|
|
continue;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|