2011-09-20 19:40:34 +00:00
|
|
|
/* divelist.c */
|
2013-04-07 03:49:06 +00:00
|
|
|
/* core logic for the dive list -
|
|
|
|
* accessed through the following interfaces:
|
2011-09-22 15:21:32 +00:00
|
|
|
*
|
2013-04-07 03:49:06 +00:00
|
|
|
* dive_trip_t *dive_trip_list;
|
|
|
|
* unsigned int amount_selected;
|
|
|
|
* void dump_selection(void)
|
|
|
|
* dive_trip_t *find_trip_by_idx(int idx)
|
|
|
|
* int trip_has_selected_dives(dive_trip_t *trip)
|
|
|
|
* void get_dive_gas(struct dive *dive, int *o2_p, int *he_p, int *o2low_p)
|
|
|
|
* int total_weight(struct dive *dive)
|
|
|
|
* int get_divenr(struct dive *dive)
|
|
|
|
* double init_decompression(struct dive *dive)
|
|
|
|
* void update_cylinder_related_info(struct dive *dive)
|
|
|
|
* void dump_trip_list(void)
|
|
|
|
* dive_trip_t *find_matching_trip(timestamp_t when)
|
|
|
|
* void insert_trip(dive_trip_t **dive_trip_p)
|
|
|
|
* void remove_dive_from_trip(struct dive *dive)
|
|
|
|
* void add_dive_to_trip(struct dive *dive, dive_trip_t *trip)
|
|
|
|
* dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive)
|
|
|
|
* void autogroup_dives(void)
|
|
|
|
* void delete_single_dive(int idx)
|
|
|
|
* void add_single_dive(int idx, struct dive *dive)
|
2013-09-24 04:57:28 +00:00
|
|
|
* void merge_two_dives(struct dive *a, struct dive *b)
|
2013-04-07 03:49:06 +00:00
|
|
|
* void select_dive(int idx)
|
|
|
|
* void deselect_dive(int idx)
|
2011-09-21 04:29:09 +00:00
|
|
|
* void mark_divelist_changed(int changed)
|
|
|
|
* int unsaved_changes()
|
2013-04-07 03:49:06 +00:00
|
|
|
* void remove_autogen_trips()
|
2011-09-20 19:40:34 +00:00
|
|
|
*/
|
2013-03-20 13:25:09 +00:00
|
|
|
#include <unistd.h>
|
2011-08-31 17:27:58 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
2011-09-04 18:14:33 +00:00
|
|
|
#include <string.h>
|
2011-08-31 17:27:58 +00:00
|
|
|
#include <time.h>
|
2011-09-22 20:45:53 +00:00
|
|
|
#include <math.h>
|
2013-10-06 15:55:58 +00:00
|
|
|
#include "gettext.h"
|
2012-11-10 18:51:03 +00:00
|
|
|
#include <assert.h>
|
2013-03-10 08:24:49 +00:00
|
|
|
#include <zip.h>
|
|
|
|
#include <libxslt/transform.h>
|
2011-08-31 17:27:58 +00:00
|
|
|
|
|
|
|
#include "dive.h"
|
2013-04-07 03:49:06 +00:00
|
|
|
#include "divelist.h"
|
2011-08-31 17:27:58 +00:00
|
|
|
#include "display.h"
|
2014-07-18 06:39:53 +00:00
|
|
|
#include "planner.h"
|
2015-06-12 13:48:51 +00:00
|
|
|
#include "qthelperfromc.h"
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2014-01-15 18:54:41 +00:00
|
|
|
static short dive_list_changed = false;
|
2012-08-30 00:24:15 +00:00
|
|
|
|
2014-01-15 18:54:41 +00:00
|
|
|
short autogroup = false;
|
2013-05-03 18:04:51 +00:00
|
|
|
|
2012-11-26 04:06:54 +00:00
|
|
|
dive_trip_t *dive_trip_list;
|
2012-08-08 16:35:38 +00:00
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
unsigned int amount_selected;
|
2012-08-08 16:35:38 +00:00
|
|
|
|
2012-08-16 23:31:53 +00:00
|
|
|
#if DEBUG_SELECTION_TRACKING
|
|
|
|
void dump_selection(void)
|
|
|
|
{
|
|
|
|
int i;
|
2012-08-20 12:48:07 +00:00
|
|
|
struct dive *dive;
|
2012-08-16 23:31:53 +00:00
|
|
|
|
2012-09-18 23:51:48 +00:00
|
|
|
printf("currently selected are %u dives:", amount_selected);
|
2012-08-21 22:51:34 +00:00
|
|
|
for_each_dive(i, dive) {
|
2012-08-20 12:48:07 +00:00
|
|
|
if (dive->selected)
|
|
|
|
printf(" %d", i);
|
|
|
|
}
|
2012-08-16 23:31:53 +00:00
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-10-05 07:29:09 +00:00
|
|
|
void set_autogroup(bool value)
|
2013-05-03 18:04:51 +00:00
|
|
|
{
|
|
|
|
/* if we keep the UI paradigm, this needs to toggle
|
|
|
|
* the checkbox on the autogroup menu item */
|
|
|
|
autogroup = value;
|
|
|
|
}
|
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
dive_trip_t *find_trip_by_idx(int idx)
|
2013-02-19 21:46:37 +00:00
|
|
|
{
|
|
|
|
dive_trip_t *trip = dive_trip_list;
|
|
|
|
|
|
|
|
if (idx >= 0)
|
|
|
|
return NULL;
|
|
|
|
idx = -idx;
|
|
|
|
while (trip) {
|
|
|
|
if (trip->index == idx)
|
|
|
|
return trip;
|
|
|
|
trip = trip->next;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
int trip_has_selected_dives(dive_trip_t *trip)
|
2012-08-20 13:27:04 +00:00
|
|
|
{
|
2013-02-19 21:46:37 +00:00
|
|
|
struct dive *dive;
|
|
|
|
for (dive = trip->dives; dive; dive = dive->next) {
|
2012-08-20 13:27:04 +00:00
|
|
|
if (dive->selected)
|
2013-02-19 21:46:37 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
2012-08-20 13:27:04 +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.
|
|
|
|
*/
|
2015-01-06 20:49:42 +00:00
|
|
|
void get_dive_gas(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
|
|
|
|
2013-03-18 14:22:14 +00:00
|
|
|
|
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
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
2011-12-12 17:20:22 +00:00
|
|
|
cylinder_t *cyl = dive->cylinder + i;
|
2014-05-08 21:10:47 +00:00
|
|
|
int o2 = get_o2(&cyl->gasmix);
|
|
|
|
int he = get_he(&cyl->gasmix);
|
2013-03-18 14:22:14 +00:00
|
|
|
|
2014-07-17 15:19:19 +00:00
|
|
|
if (!is_cylinder_used(dive, i))
|
2013-03-18 14:22:14 +00:00
|
|
|
continue;
|
2011-12-12 17:20:22 +00:00
|
|
|
if (cylinder_none(cyl))
|
|
|
|
continue;
|
2015-01-06 20:49:42 +00:00
|
|
|
if (o2 > maxo2)
|
|
|
|
maxo2 = o2;
|
2011-12-12 05:28:18 +00:00
|
|
|
if (he > maxhe)
|
|
|
|
goto newmax;
|
|
|
|
if (he < maxhe)
|
|
|
|
continue;
|
|
|
|
if (o2 <= maxo2)
|
|
|
|
continue;
|
2014-02-28 04:09:57 +00:00
|
|
|
newmax:
|
2011-12-12 05:28:18 +00:00
|
|
|
maxhe = he;
|
2015-01-06 20:49:42 +00:00
|
|
|
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
|
|
|
}
|
|
|
|
|
2013-01-02 20:16:42 +00:00
|
|
|
int total_weight(struct dive *dive)
|
2012-08-07 18:24:40 +00:00
|
|
|
{
|
|
|
|
int i, total_grams = 0;
|
|
|
|
|
|
|
|
if (dive)
|
2014-02-28 04:09:57 +00:00
|
|
|
for (i = 0; i < MAX_WEIGHTSYSTEMS; i++)
|
2012-08-07 18:24:40 +00:00
|
|
|
total_grams += dive->weightsystem[i].weight.grams;
|
|
|
|
return total_grams;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
static int active_o2(struct dive *dive, struct divecomputer *dc, duration_t time)
|
|
|
|
{
|
2014-07-19 01:37:28 +00:00
|
|
|
struct gasmix gas;
|
2014-07-18 06:39:53 +00:00
|
|
|
get_gas_at_time(dive, dc, time, &gas);
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2013-04-09 17:25:21 +00:00
|
|
|
/* calculate OTU for a dive - this only takes the first divecomputer into account */
|
2013-02-08 06:48:07 +00:00
|
|
|
static int calculate_otu(struct dive *dive)
|
2011-09-22 20:45:53 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
double otu = 0.0;
|
2013-02-08 06:48:07 +00:00
|
|
|
struct divecomputer *dc = &dive->dc;
|
2011-09-22 20:45:53 +00:00
|
|
|
|
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;
|
2013-02-02 18:38:51 +00:00
|
|
|
int po2;
|
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;
|
2014-10-19 14:07:07 +00:00
|
|
|
if (sample->setpoint.mbar) {
|
|
|
|
po2 = sample->setpoint.mbar;
|
2012-12-21 01:42:10 +00:00
|
|
|
} else {
|
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
|
|
|
int o2 = active_o2(dive, dc, sample->time);
|
2014-02-11 21:08:29 +00:00
|
|
|
po2 = o2 * depth_to_atm(sample->depth.mm, dive);
|
2012-12-21 01:42:10 +00:00
|
|
|
}
|
2013-02-02 18:38:51 +00:00
|
|
|
if (po2 >= 500)
|
|
|
|
otu += pow((po2 - 500) / 1000.0, 0.83) * t / 30.0;
|
2011-09-22 20:45:53 +00:00
|
|
|
}
|
2014-02-12 22:19:53 +00:00
|
|
|
return rint(otu);
|
2011-09-22 20:45:53 +00:00
|
|
|
}
|
2013-04-09 17:25:21 +00:00
|
|
|
/* calculate CNS for a dive - this only takes the first divecomputer into account */
|
|
|
|
int const cns_table[][3] = {
|
2014-02-28 04:09:57 +00:00
|
|
|
/* po2, Maximum Single Exposure, Maximum 24 hour Exposure */
|
|
|
|
{ 1600, 45 * 60, 150 * 60 },
|
|
|
|
{ 1500, 120 * 60, 180 * 60 },
|
|
|
|
{ 1400, 150 * 60, 180 * 60 },
|
|
|
|
{ 1300, 180 * 60, 210 * 60 },
|
|
|
|
{ 1200, 210 * 60, 240 * 60 },
|
|
|
|
{ 1100, 240 * 60, 270 * 60 },
|
|
|
|
{ 1000, 300 * 60, 300 * 60 },
|
|
|
|
{ 900, 360 * 60, 360 * 60 },
|
|
|
|
{ 800, 450 * 60, 450 * 60 },
|
|
|
|
{ 700, 570 * 60, 570 * 60 },
|
|
|
|
{ 600, 720 * 60, 720 * 60 }
|
2013-04-09 17:25:21 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* 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, j, divenr;
|
|
|
|
double cns = 0.0;
|
|
|
|
struct divecomputer *dc = &dive->dc;
|
|
|
|
struct dive *prev_dive;
|
|
|
|
timestamp_t endtime;
|
|
|
|
|
|
|
|
/* shortcut */
|
|
|
|
if (dive->cns)
|
|
|
|
return dive->cns;
|
|
|
|
/*
|
2013-12-31 22:32:15 +00:00
|
|
|
* Do we start with a cns loading from a previous dive?
|
2013-04-09 17:25:21 +00:00
|
|
|
* Check if we did a dive 12 hours prior, and what cns we had from that.
|
|
|
|
* Then apply ha 90min halftime to see whats left.
|
|
|
|
*/
|
|
|
|
divenr = get_divenr(dive);
|
|
|
|
if (divenr) {
|
2014-02-28 04:09:57 +00:00
|
|
|
prev_dive = get_dive(divenr - 1);
|
2013-12-11 13:26:47 +00:00
|
|
|
if (prev_dive) {
|
|
|
|
endtime = prev_dive->when + prev_dive->duration.seconds;
|
|
|
|
if (dive->when < (endtime + 3600 * 12)) {
|
|
|
|
cns = calculate_cns(prev_dive);
|
2014-02-28 04:09:57 +00:00
|
|
|
cns = cns * 1 / pow(2, (dive->when - endtime) / (90.0 * 60.0));
|
2013-12-11 13:26:47 +00:00
|
|
|
}
|
2013-04-09 17:25:21 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Caclulate the cns for each sample in this dive and sum them */
|
|
|
|
for (i = 1; i < dc->samples; i++) {
|
|
|
|
int t;
|
|
|
|
int po2;
|
|
|
|
struct sample *sample = dc->sample + i;
|
|
|
|
struct sample *psample = sample - 1;
|
|
|
|
t = sample->time.seconds - psample->time.seconds;
|
2014-10-19 14:07:07 +00:00
|
|
|
if (sample->setpoint.mbar) {
|
|
|
|
po2 = sample->setpoint.mbar;
|
2013-04-09 17:25:21 +00:00
|
|
|
} else {
|
|
|
|
int o2 = active_o2(dive, dc, sample->time);
|
2014-06-12 20:26:58 +00:00
|
|
|
po2 = o2 * depth_to_atm(sample->depth.mm, dive);
|
2013-04-09 17:25:21 +00:00
|
|
|
}
|
2014-06-17 18:01:16 +00:00
|
|
|
/* CNS don't increse when below 500 matm */
|
|
|
|
if (po2 < 500)
|
|
|
|
continue;
|
2013-04-09 17:25:21 +00:00
|
|
|
/* Find what table-row we should calculate % for */
|
2014-02-28 04:09:57 +00:00
|
|
|
for (j = 1; j < sizeof(cns_table) / (sizeof(int) * 3); j++)
|
2013-04-09 17:25:21 +00:00
|
|
|
if (po2 > cns_table[j][0])
|
|
|
|
break;
|
|
|
|
j--;
|
2014-02-28 04:09:57 +00:00
|
|
|
cns += ((double)t) / ((double)cns_table[j][1]) * 100;
|
2013-04-09 17:25:21 +00:00
|
|
|
}
|
|
|
|
/* save calculated cns in dive struct */
|
|
|
|
dive->cns = cns;
|
|
|
|
return dive->cns;
|
|
|
|
}
|
2011-09-19 23:11:38 +00:00
|
|
|
/*
|
|
|
|
* Return air usage (in liters).
|
|
|
|
*/
|
|
|
|
static double calculate_airuse(struct dive *dive)
|
|
|
|
{
|
2013-02-25 23:23:16 +00:00
|
|
|
int airuse = 0;
|
2011-09-19 23:11:38 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
2011-11-09 15:51:00 +00:00
|
|
|
pressure_t start, end;
|
2011-09-19 23:11:38 +00:00
|
|
|
cylinder_t *cyl = dive->cylinder + i;
|
|
|
|
|
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;
|
2014-04-26 17:55:17 +00:00
|
|
|
if (!end.mbar || start.mbar <= end.mbar)
|
|
|
|
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 */
|
|
|
|
static int calculate_sac(struct dive *dive)
|
2011-09-19 20:32:10 +00:00
|
|
|
{
|
2013-02-08 06:48:07 +00:00
|
|
|
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.. */
|
2011-11-02 02:56:14 +00:00
|
|
|
return 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 */
|
|
|
|
static void add_dive_to_deco(struct dive *dive)
|
|
|
|
{
|
|
|
|
struct divecomputer *dc = &dive->dc;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!dc)
|
|
|
|
return;
|
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);
|
2015-08-31 21:39:43 +00:00
|
|
|
add_segment(depth_to_bar(depth, dive),
|
2014-10-24 14:40:21 +00:00
|
|
|
&dive->cylinder[sample->sensor].gasmix, 1, sample->setpoint.mbar, dive, dive->sac);
|
2013-01-04 04:45:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
int get_divenr(struct dive *dive)
|
2013-01-14 04:41:48 +00:00
|
|
|
{
|
2013-11-16 21:21:54 +00:00
|
|
|
int i;
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2015-06-02 02:13:51 +00:00
|
|
|
int get_divesite_idx(struct dive_site *ds)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct dive_site *d;
|
|
|
|
// tempting as it may be, don't die when called with dive=NULL
|
|
|
|
if (ds)
|
|
|
|
for_each_dive_site(i, d) {
|
|
|
|
if (d->uuid == ds->uuid) // don't compare pointers, we could be passing in a copy of the dive
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
Deco artefacts with low GFlow
In a dive, when you choose a very low GFlow (like 5 or 9) and a trimix
with quite some He (12/48 in the example) and descend fast, the ceiling
seems to do strange things in the first minutes of the dive (very very
deep for example or jumping around).
To understand what is going on we have to recall what gradient factors do
in detail: Plain Buehlmann gives you for each tissue a maximal inert gas
pressure that is a straight line when plotted against the ambient
pressure. So for each depth (=ambient pressure) there is a maximally
allowed over-pressure.
The idea of gradient factors is that one does not use all the possible
over-pressure that Buehlmann gives us but only a depth dependent fraction.
GFhigh is the fraction of the possible over-pressure at the surface while
GFlow is the fraction at the first deco stop. In between, the fraction is
linearly interpolated. As the Buehlmann over-pressure is increasing with
depth and typically also the allowed overpressure after applications of
gradient factors increases with depth or said differently: the tissue
saturation has to be lower if the diver wants to ascent.
The main problem is: What is the first stop (where to apply GFlow)? In a
planned dive, we could take the first deco stop, but in a real dive from a
dive computer download it is impossible to say what constitutes a stop and
what is only a slow ascent?
What I have used so far is not exactly the first stop but rather the first
theoretical stop: During all of the dive, I have calculated the ceiling
under the assumption that GFlow applies everywhere (and not just at a
single depth). The deepest of these ceilings I have used as the “first
stop depth”, the depth at which GFlow applies.
Even more, I only wanted to use the information that a diver has during
the dive, so I actually only considered the ceilings in the past (and not
in the future of a given sample).
But this brings with it the problem that early in the dive, in particular
during the descent the lowest ceiling so far is very shallow (as not much
gas has built up in the body so far).
This problem now interferes with a second one: If at the start of the dive
when the all compartments have 790mbar N2 the diver starts breathing a
He-heavy mix (like 12/48) and descents fast the He builds up in the
tissues before the N2 can diffuse out. So right at the start, we already
encounter high tissue loadings.
If now we have a large difference between GFhigh and GFlow but they apply
at very similar depth (the surface and a very shallow depth of the deepest
ceiling (which for a non-decompression dive would be theoretically at
negative depth) so far) it can happen that the linear interpolation as
opposite slope then in the typical case above: The allowed over-pressure
is degreasing with depth, shallower depth do not require lower gas loading
in the tissue (i.e. can be reached after further off-gasing) but but
tolerate higher loadings. In that situation the ceiling disappears (or is
rather a floor).
So far, I got rid of that problem, by stating that the minimum depth for
GFlow was 20m (after all, GFlow is about deep stops, so it should better
not be too shallow). Now the dive reported in ticket #549 takes values to
an extreme in such away that 20m (which is determined by
buehlmann_config.gf_low_position_min in deco.c) was not enough to prevent
this inversion problem (or in a milder form that the interpolation of
gradient factors is in fact an extrapolation with quite extreme values).
This patch that gets rid of the problem for the dive described above but
still it is possible to find (more extreme) parameter choices that lead to
non-realistic ceilings.
Let me close by pointing out that all this is only about the descent, as
it is about too shallow depth for GFlow. So no real deco (i.e. later part
of the dive) is inflicted. This is only about a theoretical ceiling
displayed possibly in the first minutes of a dive. So this is more an
aesthetically than a practical problem.
Fixes #549
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-06-18 15:11:54 +00:00
|
|
|
static struct gasmix air = { .o2.permille = O2_IN_AIR, .he.permille = 0 };
|
2013-01-04 04:45:20 +00:00
|
|
|
|
|
|
|
/* take into account previous dives until there is a 48h gap between dives */
|
2013-01-05 07:11:42 +00:00
|
|
|
double init_decompression(struct dive *dive)
|
2013-01-04 04:45:20 +00:00
|
|
|
{
|
|
|
|
int i, divenr = -1;
|
2013-01-14 03:37:41 +00:00
|
|
|
unsigned int surface_time;
|
2014-11-04 11:15:27 +00:00
|
|
|
timestamp_t when, lasttime = 0, laststart = 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)
|
2013-01-05 07:11:42 +00:00
|
|
|
return 0.0;
|
2014-03-09 00:47:06 +00:00
|
|
|
|
2015-08-31 21:25:28 +00:00
|
|
|
surface_pressure = get_surface_pressure_in_mbar(dive, true) / 1000.0;
|
2013-01-14 04:41:48 +00:00
|
|
|
divenr = get_divenr(dive);
|
2013-01-04 04:45:20 +00:00
|
|
|
when = dive->when;
|
|
|
|
i = divenr;
|
2014-07-08 19:42:17 +00:00
|
|
|
if (i < 0) {
|
|
|
|
i = dive_table.nr - 1;
|
|
|
|
while (i >= 0 && get_dive(i)->when > when)
|
|
|
|
--i;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
while (i--) {
|
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 */
|
|
|
|
if (dive->divetrip && pdive->divetrip != dive->divetrip)
|
|
|
|
continue;
|
2014-11-04 11:15:27 +00:00
|
|
|
if (!pdive || pdive->when >= when || pdive->when + pdive->duration.seconds + 48 * 60 * 60 < when)
|
2013-01-04 04:45:20 +00:00
|
|
|
break;
|
2014-11-04 11:15:27 +00:00
|
|
|
/* For simultaneous dives, only consider the first */
|
|
|
|
if (pdive->when == laststart)
|
|
|
|
continue;
|
2013-01-04 04:45:20 +00:00
|
|
|
when = pdive->when;
|
2013-02-09 15:12:30 +00:00
|
|
|
lasttime = when + pdive->duration.seconds;
|
2013-01-04 04:45:20 +00:00
|
|
|
}
|
2014-07-08 19:42:17 +00:00
|
|
|
while (++i < (divenr >= 0 ? divenr : dive_table.nr)) {
|
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 */
|
|
|
|
if (dive->divetrip && dive->divetrip != pdive->divetrip)
|
|
|
|
continue;
|
2014-01-15 18:54:41 +00:00
|
|
|
surface_pressure = get_surface_pressure_in_mbar(pdive, true) / 1000.0;
|
2013-01-04 04:45:20 +00:00
|
|
|
if (!deco_init) {
|
|
|
|
clear_deco(surface_pressure);
|
2014-01-15 18:54:41 +00:00
|
|
|
deco_init = true;
|
2013-01-04 19:56:43 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2013-01-04 04:45:20 +00:00
|
|
|
dump_tissues();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
add_dive_to_deco(pdive);
|
2014-11-04 11:15:27 +00:00
|
|
|
laststart = pdive->when;
|
2013-01-04 19:56:43 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2013-01-04 04:45:20 +00:00
|
|
|
printf("added dive #%d\n", pdive->number);
|
|
|
|
dump_tissues();
|
|
|
|
#endif
|
2013-01-14 03:37:41 +00:00
|
|
|
if (pdive->when > lasttime) {
|
|
|
|
surface_time = pdive->when - lasttime;
|
2013-02-09 15:12:30 +00:00
|
|
|
lasttime = pdive->when + pdive->duration.seconds;
|
2015-08-31 21:25:28 +00:00
|
|
|
add_segment(surface_pressure, &air, surface_time, 0, dive, prefs.decosac);
|
2013-01-14 03:37:41 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2014-02-28 04:09:57 +00:00
|
|
|
printf("after surface intervall of %d:%02u\n", FRACTION(surface_time, 60));
|
2013-01-14 03:37:41 +00:00
|
|
|
dump_tissues();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* add the final surface time */
|
|
|
|
if (lasttime && dive->when > lasttime) {
|
|
|
|
surface_time = dive->when - lasttime;
|
2014-01-15 18:54:41 +00:00
|
|
|
surface_pressure = get_surface_pressure_in_mbar(dive, true) / 1000.0;
|
2015-08-31 21:25:28 +00:00
|
|
|
add_segment(surface_pressure, &air, surface_time, 0, dive, prefs.decosac);
|
2013-01-04 19:56:43 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2014-02-28 04:09:57 +00:00
|
|
|
printf("after surface intervall of %d:%02u\n", FRACTION(surface_time, 60));
|
2013-01-04 04:45:20 +00:00
|
|
|
dump_tissues();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
if (!deco_init) {
|
2014-01-15 18:54:41 +00:00
|
|
|
surface_pressure = get_surface_pressure_in_mbar(dive, true) / 1000.0;
|
2013-01-04 04:45:20 +00:00
|
|
|
clear_deco(surface_pressure);
|
2013-01-04 19:56:43 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2013-01-04 04:45:20 +00:00
|
|
|
printf("no previous dive\n");
|
|
|
|
dump_tissues();
|
|
|
|
#endif
|
|
|
|
}
|
2015-08-31 21:25:28 +00:00
|
|
|
return tissue_tolerance_calc(dive, surface_pressure);
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-20 13:07:57 +00:00
|
|
|
#define MAX_GAS_STRING 80
|
2013-05-02 17:38:34 +00:00
|
|
|
#define UTF8_ELLIPSIS "\xE2\x80\xA6"
|
|
|
|
|
|
|
|
/* callers needs to free the string */
|
2014-07-20 13:07:57 +00:00
|
|
|
char *get_dive_gas_string(struct dive *dive)
|
2013-05-02 17:38:34 +00:00
|
|
|
{
|
2015-01-06 20:49:42 +00:00
|
|
|
int o2, he, o2max;
|
2014-07-20 13:07:57 +00:00
|
|
|
char *buffer = malloc(MAX_GAS_STRING);
|
2013-05-02 17:38:34 +00:00
|
|
|
|
|
|
|
if (buffer) {
|
2015-01-06 20:49:42 +00:00
|
|
|
get_dive_gas(dive, &o2, &he, &o2max);
|
2013-05-02 17:38:34 +00:00
|
|
|
o2 = (o2 + 5) / 10;
|
|
|
|
he = (he + 5) / 10;
|
2015-01-06 20:49:42 +00:00
|
|
|
o2max = (o2max + 5) / 10;
|
2013-05-02 17:38:34 +00:00
|
|
|
|
|
|
|
if (he)
|
2015-01-06 20:49:42 +00:00
|
|
|
if (o2 == o2max)
|
|
|
|
snprintf(buffer, MAX_GAS_STRING, "%d/%d", o2, he);
|
|
|
|
else
|
|
|
|
snprintf(buffer, MAX_GAS_STRING, "%d/%d" UTF8_ELLIPSIS "%d%%", o2, he, o2max);
|
2013-05-02 17:38:34 +00:00
|
|
|
else if (o2)
|
2015-01-06 20:49:42 +00:00
|
|
|
if (o2 == o2max)
|
2014-08-16 21:50:28 +00:00
|
|
|
snprintf(buffer, MAX_GAS_STRING, "%d%%", o2);
|
2013-05-02 17:38:34 +00:00
|
|
|
else
|
2015-01-06 20:49:42 +00:00
|
|
|
snprintf(buffer, MAX_GAS_STRING, "%d" UTF8_ELLIPSIS "%d%%", o2, o2max);
|
2013-05-02 17:38:34 +00:00
|
|
|
else
|
2014-02-28 04:09:57 +00:00
|
|
|
strcpy(buffer, translate("gettextFromC", "air"));
|
2013-05-02 17:38:34 +00:00
|
|
|
}
|
2013-04-18 20:18:09 +00:00
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
2012-09-20 16:56:48 +00:00
|
|
|
/*
|
|
|
|
* helper functions for dive_trip handling
|
|
|
|
*/
|
|
|
|
#ifdef DEBUG_TRIP
|
2013-04-07 03:49:06 +00:00
|
|
|
void dump_trip_list(void)
|
2012-09-20 16:56:48 +00:00
|
|
|
{
|
2012-11-26 04:06:54 +00:00
|
|
|
dive_trip_t *trip;
|
2014-02-28 04:09:57 +00:00
|
|
|
int i = 0;
|
2012-09-20 19:30:58 +00:00
|
|
|
timestamp_t last_time = 0;
|
2012-11-26 04:06:54 +00:00
|
|
|
|
|
|
|
for (trip = dive_trip_list; trip; trip = trip->next) {
|
2012-09-20 20:08:50 +00:00
|
|
|
struct tm tm;
|
2012-11-26 04:06:54 +00:00
|
|
|
utc_mkdate(trip->when, &tm);
|
|
|
|
if (trip->when < last_time)
|
2012-09-20 16:56:48 +00:00
|
|
|
printf("\n\ndive_trip_list OUT OF ORDER!!!\n\n\n");
|
2012-11-10 18:51:03 +00:00
|
|
|
printf("%s trip %d to \"%s\" on %04u-%02u-%02u %02u:%02u:%02u (%d dives - %p)\n",
|
2014-02-28 04:09:57 +00:00
|
|
|
trip->autogen ? "autogen " : "",
|
|
|
|
++i, trip->location,
|
|
|
|
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
|
|
|
|
trip->nrdives, trip);
|
2012-11-26 04:06:54 +00:00
|
|
|
last_time = trip->when;
|
2012-09-20 16:56:48 +00:00
|
|
|
}
|
|
|
|
printf("-----\n");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* this finds the last trip that at or before the time given */
|
2013-04-07 03:49:06 +00:00
|
|
|
dive_trip_t *find_matching_trip(timestamp_t when)
|
2012-08-31 23:26:04 +00:00
|
|
|
{
|
2012-11-26 04:06:54 +00:00
|
|
|
dive_trip_t *trip = dive_trip_list;
|
|
|
|
|
|
|
|
if (!trip || trip->when > when) {
|
2012-09-20 03:42:11 +00:00
|
|
|
#ifdef DEBUG_TRIP
|
2012-09-20 16:56:48 +00:00
|
|
|
printf("no matching trip\n");
|
2012-09-20 03:42:11 +00:00
|
|
|
#endif
|
2012-08-31 23:26:04 +00:00
|
|
|
return NULL;
|
2012-09-20 03:42:11 +00:00
|
|
|
}
|
2012-11-26 04:06:54 +00:00
|
|
|
while (trip->next && trip->next->when <= when)
|
2012-08-31 23:26:04 +00:00
|
|
|
trip = trip->next;
|
2012-09-20 03:42:11 +00:00
|
|
|
#ifdef DEBUG_TRIP
|
|
|
|
{
|
2012-09-20 20:08:50 +00:00
|
|
|
struct tm tm;
|
2012-11-26 04:06:54 +00:00
|
|
|
utc_mkdate(trip->when, &tm);
|
2012-11-10 18:51:03 +00:00
|
|
|
printf("found trip %p @ %04d-%02d-%02d %02d:%02d:%02d\n",
|
2014-02-28 04:09:57 +00:00
|
|
|
trip,
|
|
|
|
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
|
|
|
|
tm.tm_hour, tm.tm_min, tm.tm_sec);
|
2012-09-20 03:42:11 +00:00
|
|
|
}
|
|
|
|
#endif
|
2012-08-31 23:26:04 +00:00
|
|
|
return trip;
|
|
|
|
}
|
|
|
|
|
2012-09-20 16:56:48 +00:00
|
|
|
/* insert the trip into the dive_trip_list - but ensure you don't have
|
|
|
|
* two trips for the same date; but if you have, make sure you don't
|
|
|
|
* keep the one with less information */
|
|
|
|
void insert_trip(dive_trip_t **dive_trip_p)
|
2012-08-31 23:26:04 +00:00
|
|
|
{
|
2012-09-20 16:56:48 +00:00
|
|
|
dive_trip_t *dive_trip = *dive_trip_p;
|
2012-11-26 04:06:54 +00:00
|
|
|
dive_trip_t **p = &dive_trip_list;
|
|
|
|
dive_trip_t *trip;
|
2012-12-06 21:04:37 +00:00
|
|
|
struct dive *divep;
|
2012-11-26 04:06:54 +00:00
|
|
|
|
|
|
|
/* Walk the dive trip list looking for the right location.. */
|
|
|
|
while ((trip = *p) != NULL && trip->when < dive_trip->when)
|
|
|
|
p = &trip->next;
|
|
|
|
|
|
|
|
if (trip && trip->when == dive_trip->when) {
|
2014-02-28 04:09:57 +00:00
|
|
|
if (!trip->location)
|
2012-11-26 04:06:54 +00:00
|
|
|
trip->location = dive_trip->location;
|
2014-02-28 04:09:57 +00:00
|
|
|
if (!trip->notes)
|
2012-12-06 21:04:37 +00:00
|
|
|
trip->notes = dive_trip->notes;
|
|
|
|
divep = dive_trip->dives;
|
|
|
|
while (divep) {
|
|
|
|
add_dive_to_trip(divep, trip);
|
|
|
|
divep = divep->next;
|
|
|
|
}
|
2012-11-26 04:06:54 +00:00
|
|
|
*dive_trip_p = trip;
|
2012-09-20 16:56:48 +00:00
|
|
|
} else {
|
2012-11-26 04:06:54 +00:00
|
|
|
dive_trip->next = trip;
|
|
|
|
*p = dive_trip;
|
2012-09-20 16:56:48 +00:00
|
|
|
}
|
|
|
|
#ifdef DEBUG_TRIP
|
|
|
|
dump_trip_list();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2012-11-10 18:51:03 +00:00
|
|
|
static void delete_trip(dive_trip_t *trip)
|
|
|
|
{
|
2012-11-26 04:06:54 +00:00
|
|
|
dive_trip_t **p, *tmp;
|
2012-11-10 18:51:03 +00:00
|
|
|
|
2012-11-26 02:53:15 +00:00
|
|
|
assert(!trip->dives);
|
2012-11-26 04:06:54 +00:00
|
|
|
|
|
|
|
/* Remove the trip from the list of trips */
|
|
|
|
p = &dive_trip_list;
|
|
|
|
while ((tmp = *p) != NULL) {
|
|
|
|
if (tmp == trip) {
|
|
|
|
*p = trip->next;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
p = &tmp->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* .. and free it */
|
2014-05-12 17:58:15 +00:00
|
|
|
free(trip->location);
|
|
|
|
free(trip->notes);
|
2012-11-10 18:51:03 +00:00
|
|
|
free(trip);
|
|
|
|
}
|
|
|
|
|
2013-11-19 22:16:33 +00:00
|
|
|
void find_new_trip_start_time(dive_trip_t *trip)
|
2012-11-09 18:46:39 +00:00
|
|
|
{
|
2012-11-26 02:53:15 +00:00
|
|
|
struct dive *dive = trip->dives;
|
|
|
|
timestamp_t when = dive->when;
|
2012-11-10 18:51:03 +00:00
|
|
|
|
2012-11-26 02:53:15 +00:00
|
|
|
while ((dive = dive->next) != NULL) {
|
|
|
|
if (dive->when < when)
|
|
|
|
when = dive->when;
|
2012-11-10 18:51:03 +00:00
|
|
|
}
|
2012-11-26 02:53:15 +00:00
|
|
|
trip->when = when;
|
2012-11-10 18:51:03 +00:00
|
|
|
}
|
|
|
|
|
2014-05-24 15:27:42 +00:00
|
|
|
/* check if we have a trip right before / after this dive */
|
|
|
|
bool is_trip_before_after(struct dive *dive, bool before)
|
|
|
|
{
|
|
|
|
int idx = get_idx_by_uniq_id(dive->id);
|
|
|
|
if (before) {
|
|
|
|
if (idx > 0 && get_dive(idx - 1)->divetrip)
|
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
if (idx < dive_table.nr - 1 && get_dive(idx + 1)->divetrip)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct dive *first_selected_dive()
|
|
|
|
{
|
|
|
|
int idx;
|
|
|
|
struct dive *d;
|
|
|
|
|
|
|
|
for_each_dive (idx, d) {
|
|
|
|
if (d->selected)
|
|
|
|
return d;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct dive *last_selected_dive()
|
|
|
|
{
|
|
|
|
int idx;
|
|
|
|
struct dive *d, *ret = NULL;
|
|
|
|
|
|
|
|
for_each_dive (idx, d) {
|
|
|
|
if (d->selected)
|
|
|
|
ret = d;
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2013-12-12 23:03:25 +00:00
|
|
|
void remove_dive_from_trip(struct dive *dive, short was_autogen)
|
2012-11-10 18:51:03 +00:00
|
|
|
{
|
2012-11-26 02:53:15 +00:00
|
|
|
struct dive *next, **pprev;
|
2012-11-10 18:51:03 +00:00
|
|
|
dive_trip_t *trip = dive->divetrip;
|
|
|
|
|
|
|
|
if (!trip)
|
|
|
|
return;
|
2012-11-26 02:53:15 +00:00
|
|
|
|
|
|
|
/* Remove the dive from the trip's list of dives */
|
|
|
|
next = dive->next;
|
|
|
|
pprev = dive->pprev;
|
|
|
|
*pprev = next;
|
|
|
|
if (next)
|
|
|
|
next->pprev = pprev;
|
|
|
|
|
2012-11-10 18:51:03 +00:00
|
|
|
dive->divetrip = NULL;
|
2013-12-12 23:03:25 +00:00
|
|
|
if (was_autogen)
|
|
|
|
dive->tripflag = TF_NONE;
|
|
|
|
else
|
|
|
|
dive->tripflag = NO_TRIP;
|
2012-11-10 18:51:03 +00:00
|
|
|
assert(trip->nrdives > 0);
|
|
|
|
if (!--trip->nrdives)
|
|
|
|
delete_trip(trip);
|
|
|
|
else if (trip->when == dive->when)
|
|
|
|
find_new_trip_start_time(trip);
|
|
|
|
}
|
|
|
|
|
|
|
|
void add_dive_to_trip(struct dive *dive, dive_trip_t *trip)
|
|
|
|
{
|
|
|
|
if (dive->divetrip == trip)
|
|
|
|
return;
|
2014-01-15 18:54:41 +00:00
|
|
|
remove_dive_from_trip(dive, false);
|
2012-11-10 18:51:03 +00:00
|
|
|
trip->nrdives++;
|
|
|
|
dive->divetrip = trip;
|
2012-11-26 04:06:54 +00:00
|
|
|
dive->tripflag = ASSIGNED_TRIP;
|
2012-11-26 02:53:15 +00:00
|
|
|
|
|
|
|
/* Add it to the trip's list of dives*/
|
|
|
|
dive->next = trip->dives;
|
|
|
|
if (dive->next)
|
|
|
|
dive->next->pprev = &dive->next;
|
|
|
|
trip->dives = dive;
|
|
|
|
dive->pprev = &trip->dives;
|
|
|
|
|
2012-11-10 18:51:03 +00:00
|
|
|
if (dive->when && trip->when > dive->when)
|
|
|
|
trip->when = dive->when;
|
2012-11-09 18:46:39 +00:00
|
|
|
}
|
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive)
|
2012-08-31 23:26:04 +00:00
|
|
|
{
|
2014-02-10 15:04:37 +00:00
|
|
|
dive_trip_t *dive_trip = calloc(1, sizeof(dive_trip_t));
|
2015-02-12 20:49:25 +00:00
|
|
|
|
2012-08-31 23:26:04 +00:00
|
|
|
dive_trip->when = dive->when;
|
2015-02-12 20:49:25 +00:00
|
|
|
dive_trip->location = copy_string(get_dive_location(dive));
|
2012-09-05 20:54:22 +00:00
|
|
|
insert_trip(&dive_trip);
|
2012-11-10 18:51:03 +00:00
|
|
|
|
2012-08-31 23:26:04 +00:00
|
|
|
dive->tripflag = IN_TRIP;
|
2012-11-10 18:51:03 +00:00
|
|
|
add_dive_to_trip(dive, dive_trip);
|
2012-08-31 23:26:04 +00:00
|
|
|
return dive_trip;
|
|
|
|
}
|
|
|
|
|
2012-11-26 04:06:54 +00:00
|
|
|
/*
|
|
|
|
* Walk the dives from the oldest dive, and see if we can autogroup them
|
|
|
|
*/
|
2013-04-07 03:49:06 +00:00
|
|
|
void autogroup_dives(void)
|
2012-09-10 18:04:58 +00:00
|
|
|
{
|
2012-11-26 04:06:54 +00:00
|
|
|
int i;
|
|
|
|
struct dive *dive, *lastdive = NULL;
|
2012-09-10 18:04:58 +00:00
|
|
|
|
2012-11-26 04:06:54 +00:00
|
|
|
for_each_dive(i, dive) {
|
|
|
|
dive_trip_t *trip;
|
2012-09-10 18:04:58 +00:00
|
|
|
|
2012-11-26 04:06:54 +00:00
|
|
|
if (dive->divetrip) {
|
|
|
|
lastdive = dive;
|
|
|
|
continue;
|
2012-09-10 18:04:58 +00:00
|
|
|
}
|
2012-11-26 04:06:54 +00:00
|
|
|
|
|
|
|
if (!DIVE_NEEDS_TRIP(dive)) {
|
|
|
|
lastdive = NULL;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Do we have a trip we can combine this into? */
|
|
|
|
if (lastdive && dive->when < lastdive->when + TRIP_THRESHOLD) {
|
|
|
|
dive_trip_t *trip = lastdive->divetrip;
|
|
|
|
add_dive_to_trip(dive, trip);
|
2015-02-13 03:02:06 +00:00
|
|
|
if (get_dive_location(dive) && !trip->location)
|
2015-02-12 20:49:25 +00:00
|
|
|
trip->location = copy_string(get_dive_location(dive));
|
2012-11-26 04:06:54 +00:00
|
|
|
lastdive = dive;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
lastdive = dive;
|
|
|
|
trip = create_and_hookup_trip_from_dive(dive);
|
2012-11-26 18:04:14 +00:00
|
|
|
trip->autogen = 1;
|
2012-09-10 18:04:58 +00:00
|
|
|
}
|
2012-11-26 04:06:54 +00:00
|
|
|
|
|
|
|
#ifdef DEBUG_TRIP
|
|
|
|
dump_trip_list();
|
|
|
|
#endif
|
2012-09-10 18:04:58 +00:00
|
|
|
}
|
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
/* this implements the mechanics of removing the dive from the table,
|
|
|
|
* but doesn't deal with updating dive trips, etc */
|
|
|
|
void delete_single_dive(int idx)
|
2011-09-07 19:01:37 +00:00
|
|
|
{
|
2013-04-07 03:49:06 +00:00
|
|
|
int i;
|
|
|
|
struct dive *dive = get_dive(idx);
|
|
|
|
if (!dive)
|
|
|
|
return; /* this should never happen */
|
2014-01-15 18:54:41 +00:00
|
|
|
remove_dive_from_trip(dive, false);
|
2013-09-24 19:32:18 +00:00
|
|
|
if (dive->selected)
|
|
|
|
deselect_dive(idx);
|
2013-04-07 03:49:06 +00:00
|
|
|
for (i = idx; i < dive_table.nr - 1; i++)
|
2014-02-28 04:09:57 +00:00
|
|
|
dive_table.dives[i] = dive_table.dives[i + 1];
|
2013-04-07 03:49:06 +00:00
|
|
|
dive_table.dives[--dive_table.nr] = NULL;
|
|
|
|
/* free all allocations */
|
|
|
|
free(dive->dc.sample);
|
2014-05-12 17:58:15 +00:00
|
|
|
free((void *)dive->notes);
|
|
|
|
free((void *)dive->divemaster);
|
|
|
|
free((void *)dive->buddy);
|
|
|
|
free((void *)dive->suit);
|
|
|
|
taglist_free(dive->tag_list);
|
2013-04-07 03:49:06 +00:00
|
|
|
free(dive);
|
2011-08-31 17:27:58 +00:00
|
|
|
}
|
|
|
|
|
2015-10-02 01:13:48 +00:00
|
|
|
struct dive **grow_dive_table(struct dive_table *table)
|
|
|
|
{
|
|
|
|
int nr = table->nr, allocated = table->allocated;
|
|
|
|
struct dive **dives = table->dives;
|
|
|
|
|
|
|
|
if (nr >= allocated) {
|
|
|
|
allocated = (nr + 32) * 3 / 2;
|
|
|
|
dives = realloc(dives, allocated * sizeof(struct dive *));
|
|
|
|
if (!dives)
|
|
|
|
exit(1);
|
|
|
|
table->dives = dives;
|
|
|
|
table->allocated = allocated;
|
|
|
|
}
|
|
|
|
return dives;
|
|
|
|
}
|
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
void add_single_dive(int idx, struct dive *dive)
|
2011-08-31 17:27:58 +00:00
|
|
|
{
|
2013-04-07 03:49:06 +00:00
|
|
|
int i;
|
2015-10-02 01:13:48 +00:00
|
|
|
grow_dive_table(&dive_table);
|
2013-04-07 03:49:06 +00:00
|
|
|
dive_table.nr++;
|
|
|
|
if (dive->selected)
|
|
|
|
amount_selected++;
|
2014-02-28 04:09:57 +00:00
|
|
|
for (i = idx; i < dive_table.nr; i++) {
|
2013-04-07 03:49:06 +00:00
|
|
|
struct dive *tmp = dive_table.dives[i];
|
|
|
|
dive_table.dives[i] = dive;
|
|
|
|
dive = tmp;
|
|
|
|
}
|
2011-09-05 19:12:58 +00:00
|
|
|
}
|
|
|
|
|
2013-09-24 10:42:40 +00:00
|
|
|
bool consecutive_selected()
|
|
|
|
{
|
|
|
|
struct dive *d;
|
|
|
|
int i;
|
2014-01-15 18:54:41 +00:00
|
|
|
bool consecutive = true;
|
|
|
|
bool firstfound = false;
|
|
|
|
bool lastfound = false;
|
2013-09-24 10:42:40 +00:00
|
|
|
|
|
|
|
if (amount_selected == 0 || amount_selected == 1)
|
2014-01-15 18:54:41 +00:00
|
|
|
return true;
|
2013-09-24 10:42:40 +00:00
|
|
|
|
|
|
|
for_each_dive(i, d) {
|
|
|
|
if (d->selected) {
|
|
|
|
if (!firstfound)
|
2014-01-15 18:54:41 +00:00
|
|
|
firstfound = true;
|
2013-09-24 10:42:40 +00:00
|
|
|
else if (lastfound)
|
2014-01-15 18:54:41 +00:00
|
|
|
consecutive = false;
|
2013-09-24 10:42:40 +00:00
|
|
|
} else if (firstfound) {
|
2014-01-15 18:54:41 +00:00
|
|
|
lastfound = true;
|
2013-09-24 10:42:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return consecutive;
|
|
|
|
}
|
|
|
|
|
2013-09-24 04:57:28 +00:00
|
|
|
struct dive *merge_two_dives(struct dive *a, struct dive *b)
|
2012-12-29 06:04:43 +00:00
|
|
|
{
|
2013-04-07 03:49:06 +00:00
|
|
|
struct dive *res;
|
2014-02-28 04:09:57 +00:00
|
|
|
int i, j;
|
2014-03-09 00:49:34 +00:00
|
|
|
int id;
|
2012-12-29 06:04:43 +00:00
|
|
|
|
2013-09-24 04:57:28 +00:00
|
|
|
if (!a || !b)
|
|
|
|
return NULL;
|
2014-03-09 00:49:34 +00:00
|
|
|
|
|
|
|
id = a->id;
|
2013-11-16 21:21:54 +00:00
|
|
|
i = get_divenr(a);
|
|
|
|
j = get_divenr(b);
|
2015-10-02 21:36:23 +00:00
|
|
|
if (i < 0 || j < 0)
|
|
|
|
// something is wrong with those dives. Bail
|
|
|
|
return NULL;
|
2014-01-15 18:54:41 +00:00
|
|
|
res = merge_dives(a, b, b->when - a->when, false);
|
2013-04-07 03:49:06 +00:00
|
|
|
if (!res)
|
2013-09-24 04:57:28 +00:00
|
|
|
return NULL;
|
2012-12-29 06:04:43 +00:00
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
add_single_dive(i, res);
|
2014-02-28 04:09:57 +00:00
|
|
|
delete_single_dive(i + 1);
|
2013-09-24 04:57:28 +00:00
|
|
|
delete_single_dive(j);
|
2014-01-07 01:35:17 +00:00
|
|
|
// now make sure that we keep the id of the first dive.
|
|
|
|
// why?
|
|
|
|
// because this way one of the previously selected ids is still around
|
|
|
|
res->id = id;
|
2014-01-15 18:54:41 +00:00
|
|
|
mark_divelist_changed(true);
|
2013-09-24 04:57:28 +00:00
|
|
|
return res;
|
2012-12-29 06:04:43 +00:00
|
|
|
}
|
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
void select_dive(int idx)
|
2011-09-20 04:39:15 +00:00
|
|
|
{
|
2013-04-07 03:49:06 +00:00
|
|
|
struct dive *dive = get_dive(idx);
|
2013-05-14 11:18:26 +00:00
|
|
|
if (dive) {
|
2013-04-10 17:04:50 +00:00
|
|
|
/* never select an invalid dive that isn't displayed */
|
Merge branch 'Qt'
After the 3.1 release it is time to shift the focus on the Qt effort - and
the best way to do this is to merge the changes in the Qt branch into
master.
Linus was extremely nice and did a merge for me. I decided to do my own
merge instead (which by accident actually based on a different version of
the Qt branch) and then used his merge to double check what I was doing.
I resolved a few things differently but overall what we did was very much
the same (and I say this with pride since Linus is a professional git
merger)
Here's his merge commit message:
This is a rough and tumble merge of the Qt branch into 'master',
trying to sort out the conflicts as best as I could.
There were two major kinds of conflicts:
- the Makefile changes, in particular the split of the single
Makefile into Rules.mk and Configure.mk, along with the obvious Qt
build changes themselves.
Those changes conflicted with some of the updates done in mainline
wrt "release" targets and some helper macros ($(NAME) etc).
Resolved by largely taking the Qt branch versions, and then editing
in the most obvious parts of the Makefile updates from mainline.
NOTE! The script/get_version shell script was made to just fail
silently on not finding a git repository, which avoided having to
take some particularly ugly Makefile changes.
- Various random updates in mainline to support things like dive tags.
The conflicts were mainly to the gtk GUI parts, which obviously
looked different afterwards. I fixed things up to look like the
newer code, but since the gtk files themselves are actually dead in
the Qt branch, this is largely irrelevant.
NOTE! This does *NOT* introduce the equivalent Qt functionality.
The fields are there in the code now, but there's no Qt UI for the
whole dive tag stuff etc.
This seems to compile for me (although I have to force
"QMAKE=qmake-qt4" on f19), and results in a Linux binary that seems to
work, but it is otherwise largely untested.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-05-18 05:01:41 +00:00
|
|
|
if (!dive->selected) {
|
2013-05-14 11:18:26 +00:00
|
|
|
dive->selected = 1;
|
|
|
|
amount_selected++;
|
|
|
|
}
|
2013-04-07 03:49:06 +00:00
|
|
|
selected_dive = idx;
|
2012-08-13 22:07:38 +00:00
|
|
|
}
|
2011-09-22 17:28:57 +00:00
|
|
|
}
|
|
|
|
|
2013-04-07 03:49:06 +00:00
|
|
|
void deselect_dive(int idx)
|
Don't deselect all dives on all selection "change" events
gtk sends the selection change events all the time, for pretty much any
"divelist changed - so selection changed". The expansion of a trip, the
switch to a new model, yadda yadda. But we actually want selections to
be sticky across these events, so we can't just forget all of our old
selection state and repopulate it.
So we re-introduce the "am I allowed to change this row" callback, which
we used to use to create a list of every actual selection that was
changed. But instead of remembering the list (and having the stale
entries issue with that remembered list that caused problems), we now
just use that as a "that *particular* selection cleared" event.
So this callback works as the "which part of the visible, currently
selected state got cleared" notifier, and handles unselection.
Then, when the selection is over, we use the new model of "let's just
traverse the list of things gtk thinks are selected" and use that to
handle new selections in the visible state that gtk actually tracks
well. So that logic handles the new selections.
This way, dives that aren't visible to gtk don't ever get modified: gtk
won't ask about them being selected or not, and gtk won't track them in
its selection logic, so with this model their state never changes for
us.
gtk selections are annoying. They are simple for the case gtk knows
about (ie they are *visually* selected in the GUI), but since we very
much want to track selection across events that change the visual state,
we need to have this insane "impedance match".
Reported-by: Dirk Hohdnel <dirk@hohndel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-29 19:15:23 +00:00
|
|
|
{
|
|
|
|
struct dive *dive = get_dive(idx);
|
|
|
|
if (dive && dive->selected) {
|
|
|
|
dive->selected = 0;
|
2013-12-07 12:25:18 +00:00
|
|
|
if (amount_selected)
|
|
|
|
amount_selected--;
|
2013-01-29 20:05:30 +00:00
|
|
|
if (selected_dive == idx && amount_selected > 0) {
|
|
|
|
/* pick a different dive as selected */
|
2013-01-29 21:10:46 +00:00
|
|
|
while (--selected_dive >= 0) {
|
2013-01-29 20:05:30 +00:00
|
|
|
dive = get_dive(selected_dive);
|
|
|
|
if (dive && dive->selected)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
selected_dive = idx;
|
2013-01-29 21:10:46 +00:00
|
|
|
while (++selected_dive < dive_table.nr) {
|
2013-01-29 20:05:30 +00:00
|
|
|
dive = get_dive(selected_dive);
|
|
|
|
if (dive && dive->selected)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (amount_selected == 0)
|
|
|
|
selected_dive = -1;
|
Don't deselect all dives on all selection "change" events
gtk sends the selection change events all the time, for pretty much any
"divelist changed - so selection changed". The expansion of a trip, the
switch to a new model, yadda yadda. But we actually want selections to
be sticky across these events, so we can't just forget all of our old
selection state and repopulate it.
So we re-introduce the "am I allowed to change this row" callback, which
we used to use to create a list of every actual selection that was
changed. But instead of remembering the list (and having the stale
entries issue with that remembered list that caused problems), we now
just use that as a "that *particular* selection cleared" event.
So this callback works as the "which part of the visible, currently
selected state got cleared" notifier, and handles unselection.
Then, when the selection is over, we use the new model of "let's just
traverse the list of things gtk thinks are selected" and use that to
handle new selections in the visible state that gtk actually tracks
well. So that logic handles the new selections.
This way, dives that aren't visible to gtk don't ever get modified: gtk
won't ask about them being selected or not, and gtk won't track them in
its selection logic, so with this model their state never changes for
us.
gtk selections are annoying. They are simple for the case gtk knows
about (ie they are *visually* selected in the GUI), but since we very
much want to track selection across events that change the visual state,
we need to have this insane "impedance match".
Reported-by: Dirk Hohdnel <dirk@hohndel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-29 19:15:23 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-24 20:19:05 +00:00
|
|
|
void deselect_dives_in_trip(struct dive_trip *trip)
|
|
|
|
{
|
|
|
|
struct dive *dive;
|
|
|
|
if (!trip)
|
|
|
|
return;
|
|
|
|
for (dive = trip->dives; dive; dive = dive->next)
|
|
|
|
deselect_dive(get_divenr(dive));
|
|
|
|
}
|
|
|
|
|
|
|
|
void select_dives_in_trip(struct dive_trip *trip)
|
|
|
|
{
|
|
|
|
struct dive *dive;
|
|
|
|
if (!trip)
|
|
|
|
return;
|
|
|
|
for (dive = trip->dives; dive; dive = dive->next)
|
2014-11-11 21:40:36 +00:00
|
|
|
if (!dive->hidden_by_filter)
|
|
|
|
select_dive(get_divenr(dive));
|
2014-05-24 20:19:05 +00:00
|
|
|
}
|
|
|
|
|
2014-11-12 06:59:04 +00:00
|
|
|
void filter_dive(struct dive *d, bool shown)
|
|
|
|
{
|
|
|
|
if (!d)
|
|
|
|
return;
|
|
|
|
d->hidden_by_filter = !shown;
|
|
|
|
if (!shown && d->selected)
|
|
|
|
deselect_dive(get_divenr(d));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-05-24 21:02:08 +00:00
|
|
|
/* This only gets called with non-NULL trips.
|
|
|
|
* It does not combine notes or location, just picks the first one
|
|
|
|
* (or the second one if the first one is empty */
|
|
|
|
void combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b)
|
|
|
|
{
|
|
|
|
if (same_string(trip_a->location, "") && trip_b->location) {
|
|
|
|
free(trip_a->location);
|
|
|
|
trip_a->location = strdup(trip_b->location);
|
|
|
|
}
|
|
|
|
if (same_string(trip_a->notes, "") && trip_b->notes) {
|
|
|
|
free(trip_a->notes);
|
|
|
|
trip_a->notes = strdup(trip_b->notes);
|
|
|
|
}
|
|
|
|
/* this also removes the dives from trip_b and eventually
|
|
|
|
* calls delete_trip(trip_b) when the last dive has been moved */
|
|
|
|
while (trip_b->dives)
|
|
|
|
add_dive_to_trip(trip_b->dives, trip_a);
|
|
|
|
}
|
|
|
|
|
2011-09-21 04:29:09 +00:00
|
|
|
void mark_divelist_changed(int changed)
|
|
|
|
{
|
2013-04-07 03:49:06 +00:00
|
|
|
dive_list_changed = changed;
|
2015-06-12 13:48:51 +00:00
|
|
|
updateWindowTitle();
|
2011-09-21 04:29:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int unsaved_changes()
|
|
|
|
{
|
2013-04-07 03:49:06 +00:00
|
|
|
return dive_list_changed;
|
2011-09-21 04:29:09 +00:00
|
|
|
}
|
2012-09-03 04:48:30 +00:00
|
|
|
|
|
|
|
void remove_autogen_trips()
|
|
|
|
{
|
2012-11-26 03:04:45 +00:00
|
|
|
int i;
|
|
|
|
struct dive *dive;
|
2012-09-03 04:48:30 +00:00
|
|
|
|
2012-11-26 03:04:45 +00:00
|
|
|
for_each_dive(i, dive) {
|
|
|
|
dive_trip_t *trip = dive->divetrip;
|
|
|
|
|
2012-11-26 18:04:14 +00:00
|
|
|
if (trip && trip->autogen)
|
2014-01-15 18:54:41 +00:00
|
|
|
remove_dive_from_trip(dive, true);
|
2012-09-20 03:42:11 +00:00
|
|
|
}
|
2012-09-03 04:48:30 +00:00
|
|
|
}
|
2013-01-01 16:22:46 +00:00
|
|
|
|
2013-04-24 23:33:29 +00:00
|
|
|
/*
|
|
|
|
* When adding dives to the dive table, we try to renumber
|
|
|
|
* the new dives based on any old dives in the dive table.
|
|
|
|
*
|
|
|
|
* But we only do it if:
|
|
|
|
*
|
|
|
|
* - there are no dives in the dive table
|
|
|
|
*
|
|
|
|
* OR
|
|
|
|
*
|
|
|
|
* - the last dive in the old dive table was numbered
|
|
|
|
*
|
|
|
|
* - all the new dives are strictly at the end (so the
|
|
|
|
* "last dive" is at the same location in the dive table
|
|
|
|
* after re-sorting the dives.
|
|
|
|
*
|
|
|
|
* - none of the new dives have any numbers
|
|
|
|
*
|
|
|
|
* This catches the common case of importing new dives from
|
|
|
|
* a dive computer, and gives them proper numbers based on
|
|
|
|
* your old dive list. But it tries to be very conservative
|
|
|
|
* and not give numbers if there is *any* question about
|
|
|
|
* what the numbers should be - in which case you need to do
|
|
|
|
* a manual re-numbering.
|
|
|
|
*/
|
|
|
|
static void try_to_renumber(struct dive *last, int preexisting)
|
|
|
|
{
|
|
|
|
int i, nr;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the new dives aren't all strictly at the end,
|
|
|
|
* we're going to expect the user to do a manual
|
|
|
|
* renumbering.
|
|
|
|
*/
|
2014-02-28 04:09:57 +00:00
|
|
|
if (preexisting && get_dive(preexisting - 1) != last)
|
2013-04-24 23:33:29 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If any of the new dives already had a number,
|
|
|
|
* we'll have to do a manual renumbering.
|
|
|
|
*/
|
|
|
|
for (i = preexisting; i < dive_table.nr; i++) {
|
|
|
|
struct dive *dive = get_dive(i);
|
|
|
|
if (dive->number)
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Ok, renumber..
|
|
|
|
*/
|
|
|
|
if (last)
|
|
|
|
nr = last->number;
|
|
|
|
else
|
|
|
|
nr = 0;
|
|
|
|
for (i = preexisting; i < dive_table.nr; i++) {
|
|
|
|
struct dive *dive = get_dive(i);
|
|
|
|
dive->number = ++nr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void process_dives(bool is_imported, bool prefer_imported)
|
|
|
|
{
|
2013-06-17 22:58:26 +00:00
|
|
|
int i;
|
2013-04-24 23:33:29 +00:00
|
|
|
int preexisting = dive_table.preexisting;
|
|
|
|
struct dive *last;
|
|
|
|
|
|
|
|
/* check if we need a nickname for the divecomputer for newly downloaded dives;
|
|
|
|
* since we know they all came from the same divecomputer we just check for the
|
|
|
|
* first one */
|
|
|
|
if (preexisting < dive_table.nr && dive_table.dives[preexisting]->downloaded)
|
|
|
|
set_dc_nickname(dive_table.dives[preexisting]);
|
|
|
|
else
|
|
|
|
/* they aren't downloaded, so record / check all new ones */
|
|
|
|
for (i = preexisting; i < dive_table.nr; i++)
|
|
|
|
set_dc_nickname(dive_table.dives[i]);
|
|
|
|
|
2014-05-14 06:30:07 +00:00
|
|
|
for (i = preexisting; i < dive_table.nr; i++)
|
|
|
|
dive_table.dives[i]->downloaded = true;
|
|
|
|
|
2013-04-24 23:33:29 +00:00
|
|
|
/* This does the right thing for -1: NULL */
|
2014-02-28 04:09:57 +00:00
|
|
|
last = get_dive(preexisting - 1);
|
2013-04-24 23:33:29 +00:00
|
|
|
|
|
|
|
sort_table(&dive_table);
|
|
|
|
|
|
|
|
for (i = 1; i < dive_table.nr; i++) {
|
2014-02-28 04:09:57 +00:00
|
|
|
struct dive **pp = &dive_table.dives[i - 1];
|
2013-04-24 23:33:29 +00:00
|
|
|
struct dive *prev = pp[0];
|
|
|
|
struct dive *dive = pp[1];
|
|
|
|
struct dive *merged;
|
2014-01-07 01:35:17 +00:00
|
|
|
int id;
|
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 &&
|
|
|
|
prev->when + prev->duration.seconds < dive->when)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
merged = try_to_merge(prev, dive, prefer_imported);
|
|
|
|
if (!merged)
|
|
|
|
continue;
|
|
|
|
|
2014-01-07 01:35:17 +00:00
|
|
|
// remember the earlier dive's id
|
|
|
|
id = prev->id;
|
|
|
|
|
2013-04-24 23:33:29 +00:00
|
|
|
/* careful - we might free the dive that last points to. Oops... */
|
|
|
|
if (last == prev || last == dive)
|
|
|
|
last = merged;
|
|
|
|
|
|
|
|
/* Redo the new 'i'th dive */
|
|
|
|
i--;
|
|
|
|
add_single_dive(i, merged);
|
2014-02-28 04:09:57 +00:00
|
|
|
delete_single_dive(i + 1);
|
|
|
|
delete_single_dive(i + 1);
|
2014-01-07 01:35:17 +00:00
|
|
|
// keep the id or the first dive for the merged dive
|
|
|
|
merged->id = id;
|
2013-04-24 23:33:29 +00:00
|
|
|
}
|
|
|
|
/* make sure no dives are still marked as downloaded */
|
|
|
|
for (i = 1; i < dive_table.nr; i++)
|
2014-01-15 18:54:41 +00:00
|
|
|
dive_table.dives[i]->downloaded = false;
|
2013-04-24 23:33:29 +00:00
|
|
|
|
|
|
|
if (is_imported) {
|
|
|
|
/* If there are dives in the table, are they numbered */
|
|
|
|
if (!last || last->number)
|
|
|
|
try_to_renumber(last, preexisting);
|
|
|
|
|
|
|
|
/* did we add dives to the dive table? */
|
|
|
|
if (preexisting != dive_table.nr)
|
2014-01-15 18:54:41 +00:00
|
|
|
mark_divelist_changed(true);
|
2013-04-24 23:33:29 +00:00
|
|
|
}
|
|
|
|
}
|
2014-08-18 19:12:05 +00:00
|
|
|
|
|
|
|
void set_dive_nr_for_current_dive()
|
|
|
|
{
|
|
|
|
if (dive_table.nr == 1)
|
|
|
|
current_dive->number = 1;
|
|
|
|
else if (selected_dive == dive_table.nr - 1 && get_dive(dive_table.nr - 2)->number)
|
|
|
|
current_dive->number = get_dive(dive_table.nr - 2)->number + 1;
|
|
|
|
}
|
2015-06-20 13:45:12 +00:00
|
|
|
|
|
|
|
static int min_datafile_version;
|
|
|
|
|
|
|
|
int get_min_datafile_version()
|
|
|
|
{
|
|
|
|
return min_datafile_version;
|
|
|
|
}
|
|
|
|
|
|
|
|
void reset_min_datafile_version()
|
|
|
|
{
|
|
|
|
min_datafile_version = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void report_datafile_version(int version)
|
|
|
|
{
|
|
|
|
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()
|
|
|
|
{
|
|
|
|
while (dive_table.nr)
|
|
|
|
delete_single_dive(0);
|
|
|
|
while (dive_site_table.nr)
|
|
|
|
delete_dive_site(get_dive_site(0)->uuid);
|
|
|
|
|
2015-08-25 20:55:51 +00:00
|
|
|
clear_dive(&displayed_dive);
|
|
|
|
clear_dive_site(&displayed_dive_site);
|
|
|
|
|
2015-07-24 20:18:30 +00:00
|
|
|
free((void *)existing_filename);
|
|
|
|
existing_filename = NULL;
|
|
|
|
|
|
|
|
reset_min_datafile_version();
|
|
|
|
}
|