2017-04-27 18:18:03 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
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
|
|
|
*
|
2018-09-23 10:53:35 +00:00
|
|
|
* void process_loaded_dives();
|
|
|
|
* void process_imported_dives(bool prefer_imported);
|
2013-04-07 03:49:06 +00:00
|
|
|
* dive_trip_t *dive_trip_list;
|
|
|
|
* unsigned int amount_selected;
|
|
|
|
* void dump_selection(void)
|
|
|
|
* void get_dive_gas(struct dive *dive, int *o2_p, int *he_p, int *o2low_p)
|
2018-08-23 17:18:43 +00:00
|
|
|
* int total_weight(const struct dive *dive)
|
|
|
|
* int get_divenr(const struct dive *dive)
|
|
|
|
* int get_divesite_idx(const struct dive_site *ds)
|
2017-10-02 09:17:10 +00:00
|
|
|
* int init_decompression(struct dive *dive)
|
2013-04-07 03:49:06 +00:00
|
|
|
* void update_cylinder_related_info(struct dive *dive)
|
|
|
|
* void dump_trip_list(void)
|
|
|
|
* void insert_trip(dive_trip_t **dive_trip_p)
|
2018-07-28 19:26:59 +00:00
|
|
|
* void insert_trip_dont_merge(dive_trip_t *dive_trip_p)
|
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
|
|
|
* void unregister_trip(dive_trip_t *trip)
|
|
|
|
* void free_trip(dive_trip_t *trip)
|
|
|
|
* void remove_dive_from_trip(struct dive *dive)
|
2018-09-28 08:21:23 +00:00
|
|
|
* void remove_dive_from_trip(struct dive *dive, bool was_autogen)
|
2013-04-07 03:49:06 +00:00
|
|
|
* void add_dive_to_trip(struct dive *dive, dive_trip_t *trip)
|
|
|
|
* dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive)
|
2018-09-23 19:22:48 +00:00
|
|
|
* dive_trip_t *get_dives_to_autogroup(int start, int *from, int *to, bool *allocated)
|
2018-07-30 08:33:25 +00:00
|
|
|
* dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated)
|
2013-04-07 03:49:06 +00:00
|
|
|
* void autogroup_dives(void)
|
2018-09-23 19:22:48 +00:00
|
|
|
* void combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b)
|
|
|
|
* dive_trip_t *combine_trips_create(struct dive_trip *trip_a, struct dive_trip *trip_b)
|
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
|
|
|
* struct dive *unregister_dive(int idx)
|
2013-04-07 03:49:06 +00:00
|
|
|
* void delete_single_dive(int idx)
|
|
|
|
* void add_single_dive(int idx, struct dive *dive)
|
2018-07-21 16:28:33 +00:00
|
|
|
* struct dive *merge_two_dives(struct dive *a, struct dive *b)
|
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
|
|
|
* void select_dive(struct dive *dive)
|
|
|
|
* void deselect_dive(struct dive *dive)
|
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()
|
2018-08-26 12:42:38 +00:00
|
|
|
* bool dive_less_than(const struct dive *a, const struct dive *b)
|
2018-08-01 19:57:24 +00:00
|
|
|
* void sort_table(struct dive_table *table)
|
2018-08-23 17:18:43 +00:00
|
|
|
* bool is_trip_before_after(const struct dive *dive, bool before)
|
2018-09-28 08:21:23 +00:00
|
|
|
* void delete_dive_from_table(struct dive_table *table, int idx)
|
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 find_next_visible_dive(timestamp_t when);
|
2018-10-14 13:33:46 +00:00
|
|
|
* void clear_dive_file_data()
|
|
|
|
* void clear_table(struct dive_table *table)
|
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"
|
2018-05-11 15:25:41 +00:00
|
|
|
#include "subsurface-string.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"
|
2018-02-24 22:28:13 +00:00
|
|
|
#include "qthelper.h"
|
2016-03-23 19:09:18 +00:00
|
|
|
#include "git-access.h"
|
2011-08-31 17:27:58 +00:00
|
|
|
|
2017-12-11 21:23:52 +00:00
|
|
|
static bool dive_list_changed = false;
|
2012-08-30 00:24:15 +00:00
|
|
|
|
2017-12-29 10:49:56 +00:00
|
|
|
bool 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
|
|
|
|
2017-04-18 17:14:03 +00:00
|
|
|
// We need to stop using globals, really.
|
|
|
|
struct dive_table downloadTable;
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
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;
|
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;
|
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
|
|
|
}
|
|
|
|
|
2018-08-23 17:18:43 +00:00
|
|
|
int total_weight(const 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;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2013-04-09 17:25:21 +00:00
|
|
|
/* calculate OTU for a dive - this only takes the first divecomputer into account */
|
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;
|
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);
|
2017-03-09 16:07:30 +00:00
|
|
|
po2 = lrint(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
|
|
|
}
|
2017-03-08 06:41:41 +00:00
|
|
|
return lrint(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
|
|
|
};
|
|
|
|
|
2017-10-02 18:35:21 +00:00
|
|
|
/* Calculate the CNS for a single dive */
|
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;
|
2016-03-10 02:20:19 +00:00
|
|
|
size_t j;
|
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;
|
2018-05-13 22:29:54 +00:00
|
|
|
|
2017-10-02 18:35:21 +00:00
|
|
|
/* Caclulate the CNS for each sample in this dive and sum them */
|
|
|
|
for (n = 1; n < dc->samples; n++) {
|
2013-04-09 17:25:21 +00:00
|
|
|
int t;
|
|
|
|
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;
|
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);
|
2017-03-09 16:07:30 +00:00
|
|
|
po2 = lrint(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
|
|
|
}
|
2018-05-13 22:29:54 +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);
|
|
|
|
i = divenr >= 0 ? divenr : dive_table.nr;
|
|
|
|
#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 */
|
|
|
|
while (i < dive_table.nr - 1) {
|
|
|
|
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 */
|
|
|
|
while (++i < dive_table.nr) {
|
|
|
|
#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;
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
2011-11-09 15:51:00 +00:00
|
|
|
pressure_t start, end;
|
2018-08-23 17:18:43 +00:00
|
|
|
const cylinder_t *cyl = dive->cylinder + 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 */
|
2017-11-22 19:42:33 +00:00
|
|
|
static void add_dive_to_deco(struct deco_state *ds, struct dive *dive)
|
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,
|
2018-04-07 15:52:16 +00:00
|
|
|
get_current_divemode(&dive->dc, j, &evd, ¤t_divemode), dive->sac);
|
2013-01-04 04:45:20 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-23 17:18:43 +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
|
|
|
}
|
|
|
|
|
2018-08-23 17:18:43 +00:00
|
|
|
int get_divesite_idx(const struct dive_site *ds)
|
2015-06-02 02:13:51 +00:00
|
|
|
{
|
|
|
|
int i;
|
2018-08-23 17:18:43 +00:00
|
|
|
const struct dive_site *d;
|
2015-06-02 02:13:51 +00:00
|
|
|
// 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 */
|
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 */
|
|
|
|
int init_decompression(struct deco_state *ds, struct dive *dive)
|
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);
|
2017-10-02 09:17:10 +00:00
|
|
|
i = divenr >= 0 ? divenr : dive_table.nr;
|
|
|
|
#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 */
|
|
|
|
while (i < dive_table.nr - 1) {
|
|
|
|
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 */
|
|
|
|
while (++i < dive_table.nr) {
|
|
|
|
#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
|
2017-11-22 19:42:33 +00:00
|
|
|
clear_deco(ds, 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
|
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
|
|
|
|
}
|
2017-10-02 09:17:10 +00:00
|
|
|
else {
|
|
|
|
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;
|
|
|
|
}
|
2018-08-16 17:10:10 +00:00
|
|
|
add_segment(ds, surface_pressure, air, surface_time, 0, dive->dc.divemode, prefs.decosac);
|
2013-01-14 03:37:41 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
2017-10-02 09:17:10 +00:00
|
|
|
printf("Tissues after surface intervall of %d:%02u:\n", FRACTION(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
|
|
|
|
2017-11-22 19:42:33 +00:00
|
|
|
add_dive_to_deco(ds, pdive);
|
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
|
2017-11-22 19:42:33 +00:00
|
|
|
clear_deco(ds, surface_pressure);
|
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
|
|
|
|
}
|
2017-10-02 09:17:10 +00:00
|
|
|
else {
|
|
|
|
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;
|
|
|
|
}
|
2018-08-16 17:10:10 +00:00
|
|
|
add_segment(ds, surface_pressure, air, surface_time, 0, dive->dc.divemode, prefs.decosac);
|
2017-10-02 09:17:10 +00:00
|
|
|
#if DECO_CALC_DEBUG & 2
|
|
|
|
printf("Tissues after surface intervall of %d:%02u:\n", FRACTION(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.
|
2017-11-22 19:42:33 +00:00
|
|
|
tissue_tolerance_calc(ds, dive, surface_pressure);
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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,
|
2016-04-28 22:13:30 +00:00
|
|
|
tm.tm_year, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec,
|
2014-02-28 04:09:57 +00:00
|
|
|
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
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
}
|
|
|
|
|
2018-07-28 19:26:59 +00:00
|
|
|
/* same as insert_trip, but don't merge trips with the same date.
|
|
|
|
* this is cruical for the merge undo-command, because there we
|
|
|
|
* add a new trip with the same date and then remove the old one. */
|
|
|
|
void insert_trip_dont_merge(dive_trip_t *dive_trip)
|
|
|
|
{
|
|
|
|
dive_trip_t **p = &dive_trip_list;
|
|
|
|
dive_trip_t *trip;
|
|
|
|
|
|
|
|
/* Walk the dive trip list looking for the right location.. */
|
|
|
|
while ((trip = *p) != NULL && trip->when < dive_trip->when)
|
|
|
|
p = &trip->next;
|
|
|
|
|
|
|
|
dive_trip->next = trip;
|
|
|
|
*p = dive_trip;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/* free resources associated with a trip structure */
|
|
|
|
void free_trip(dive_trip_t *trip)
|
2018-07-18 17:31:59 +00:00
|
|
|
{
|
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
|
|
|
free(trip->location);
|
|
|
|
free(trip->notes);
|
|
|
|
free(trip);
|
2018-07-18 17:31:59 +00:00
|
|
|
}
|
|
|
|
|
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
|
|
|
/* remove trip from the trip-list, but don't free its memory.
|
|
|
|
* caller takes ownership of the trip. */
|
|
|
|
void unregister_trip(dive_trip_t *trip)
|
2012-11-10 18:51:03 +00:00
|
|
|
{
|
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;
|
|
|
|
}
|
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
|
|
|
}
|
2012-11-26 04:06:54 +00:00
|
|
|
|
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
|
|
|
static void delete_trip(dive_trip_t *trip)
|
|
|
|
{
|
|
|
|
unregister_trip(trip);
|
|
|
|
free_trip(trip);
|
2012-11-10 18:51:03 +00:00
|
|
|
}
|
|
|
|
|
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 */
|
2018-08-23 17:18:43 +00:00
|
|
|
bool is_trip_before_after(const struct dive *dive, bool before)
|
2014-05-24 15:27:42 +00:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
/* remove a dive from the trip it's associated to, but don't delete the
|
|
|
|
* trip if this was the last dive in the trip. the caller is responsible
|
|
|
|
* for removing the trip, if the trip->nrdives went to 0.
|
|
|
|
*/
|
|
|
|
struct dive_trip *unregister_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)
|
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;
|
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);
|
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
|
|
|
--trip->nrdives;
|
|
|
|
if (trip->nrdives > 0 && trip->when == dive->when)
|
2012-11-10 18:51:03 +00:00
|
|
|
find_new_trip_start_time(trip);
|
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 trip;
|
|
|
|
}
|
|
|
|
|
|
|
|
void remove_dive_from_trip(struct dive *dive, short was_autogen)
|
|
|
|
{
|
|
|
|
struct dive_trip *trip = unregister_dive_from_trip(dive, was_autogen);
|
|
|
|
if (trip && trip->nrdives == 0)
|
|
|
|
delete_trip(trip);
|
2012-11-10 18:51:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
2018-09-23 19:22:48 +00:00
|
|
|
dive_trip_t *alloc_trip(void)
|
|
|
|
{
|
|
|
|
return calloc(1, sizeof(dive_trip_t));
|
|
|
|
}
|
|
|
|
|
|
|
|
dive_trip_t *create_trip_from_dive(struct dive *dive)
|
|
|
|
{
|
|
|
|
dive_trip_t *trip;
|
|
|
|
|
|
|
|
trip = alloc_trip();
|
|
|
|
trip->when = dive->when;
|
|
|
|
trip->location = copy_string(get_dive_location(dive));
|
|
|
|
|
|
|
|
return trip;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2018-09-23 19:22:48 +00:00
|
|
|
dive_trip_t *dive_trip = alloc_trip();
|
2015-02-12 20:49:25 +00:00
|
|
|
|
2018-09-23 19:22:48 +00:00
|
|
|
dive_trip = create_trip_from_dive(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;
|
|
|
|
}
|
|
|
|
|
2018-07-30 08:33:25 +00:00
|
|
|
/*
|
|
|
|
* Find a trip a new dive should be autogrouped with. If no such trips
|
|
|
|
* exist, allocate a new trip. The bool "*allocated" is set to true
|
|
|
|
* if a new trip was allocated.
|
|
|
|
*/
|
|
|
|
dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated)
|
|
|
|
{
|
|
|
|
struct dive *d;
|
|
|
|
dive_trip_t *trip;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Find dive that is within TRIP_THRESHOLD of current dive */
|
|
|
|
for_each_dive(i, d) {
|
|
|
|
/* Check if we're past the range of possible dives */
|
|
|
|
if (d->when >= new_dive->when + TRIP_THRESHOLD)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (d->when + TRIP_THRESHOLD >= new_dive->when && d->divetrip) {
|
|
|
|
/* Found a dive with trip in the range */
|
|
|
|
*allocated = false;
|
|
|
|
return d->divetrip;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Didn't find a trip -> allocate a new one */
|
|
|
|
trip = create_trip_from_dive(new_dive);
|
|
|
|
trip->autogen = true;
|
|
|
|
*allocated = true;
|
|
|
|
return trip;
|
|
|
|
}
|
|
|
|
|
2012-11-26 04:06:54 +00:00
|
|
|
/*
|
2018-09-23 19:22:48 +00:00
|
|
|
* Collect dives for auto-grouping. Pass in first dive which should be checked.
|
|
|
|
* Returns range of dives that should be autogrouped and trip it should be
|
|
|
|
* associated to. If the returned trip was newly allocated, the last bool
|
|
|
|
* is set to true. Caller still has to register it in the system. Note
|
|
|
|
* whereas this looks complicated - it is needed by the undo-system, which
|
|
|
|
* manually injects the new trips. If there are no dives to be autogrouped,
|
|
|
|
* return NULL.
|
2012-11-26 04:06:54 +00:00
|
|
|
*/
|
2018-09-23 19:22:48 +00:00
|
|
|
dive_trip_t *get_dives_to_autogroup(int start, int *from, int *to, bool *allocated)
|
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
|
|
|
|
2018-09-23 19:22:48 +00:00
|
|
|
/* Find first dive that should be merged and remember any previous
|
|
|
|
* dive that could be merged into.
|
|
|
|
*/
|
|
|
|
for (i = start; (dive = get_dive(i)) != NULL; i++) {
|
2012-11-26 04:06:54 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2018-09-23 19:22:48 +00:00
|
|
|
/* We found a dive, let's see if we have to allocate a new trip */
|
|
|
|
if (!lastdive || dive->when >= lastdive->when + TRIP_THRESHOLD) {
|
|
|
|
/* allocate new trip */
|
|
|
|
trip = create_trip_from_dive(dive);
|
|
|
|
trip->autogen = true;
|
|
|
|
*allocated = true;
|
|
|
|
} else {
|
|
|
|
/* use trip of previous dive */
|
|
|
|
trip = lastdive->divetrip;
|
|
|
|
*allocated = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now, find all dives that will be added to this trip
|
|
|
|
lastdive = dive;
|
|
|
|
*from = i;
|
|
|
|
for (*to = *from + 1; (dive = get_dive(*to)) != NULL; (*to)++) {
|
|
|
|
if (dive->divetrip || !DIVE_NEEDS_TRIP(dive) ||
|
|
|
|
dive->when >= lastdive->when + TRIP_THRESHOLD)
|
|
|
|
break;
|
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;
|
|
|
|
}
|
2018-09-23 19:22:48 +00:00
|
|
|
return trip;
|
2012-09-10 18:04:58 +00:00
|
|
|
}
|
2012-11-26 04:06:54 +00:00
|
|
|
|
2018-09-23 19:22:48 +00:00
|
|
|
/* Did not find anyhting - mark as end */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2018-10-14 06:20:59 +00:00
|
|
|
* Walk the dives from the oldest dive, and see if we can autogroup them.
|
|
|
|
* But only do this when the user selected autogrouping.
|
2018-09-23 19:22:48 +00:00
|
|
|
*/
|
|
|
|
void autogroup_dives(void)
|
|
|
|
{
|
|
|
|
int from, to;
|
|
|
|
dive_trip_t *trip;
|
|
|
|
int i, j;
|
|
|
|
bool alloc;
|
|
|
|
|
2018-10-14 06:20:59 +00:00
|
|
|
if (!autogroup)
|
|
|
|
return;
|
|
|
|
|
2018-09-23 19:22:48 +00:00
|
|
|
for(i = 0; (trip = get_dives_to_autogroup(i, &from, &to, &alloc)) != NULL; i = to) {
|
|
|
|
/* If this was newly allocated, add trip to list */
|
|
|
|
if (alloc)
|
|
|
|
insert_trip(&trip);
|
|
|
|
for (j = from; j < to; ++j)
|
|
|
|
add_dive_to_trip(get_dive(j), trip);
|
|
|
|
}
|
2012-11-26 04:06:54 +00:00
|
|
|
#ifdef DEBUG_TRIP
|
|
|
|
dump_trip_list();
|
|
|
|
#endif
|
2012-09-10 18:04:58 +00:00
|
|
|
}
|
|
|
|
|
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
|
|
|
static void unregister_dive_from_table(struct dive_table *table, int idx)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = idx; i < table->nr - 1; i++)
|
|
|
|
table->dives[i] = table->dives[i + 1];
|
|
|
|
table->dives[--table->nr] = NULL;
|
|
|
|
}
|
|
|
|
|
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 */
|
|
|
|
void delete_dive_from_table(struct dive_table *table, int idx)
|
|
|
|
{
|
|
|
|
free_dive(table->dives[idx]);
|
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
|
|
|
unregister_dive_from_table(table, idx);
|
2018-09-28 08:21:23 +00:00
|
|
|
}
|
|
|
|
|
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
|
|
|
/* this removes a dive from the dive table and trip-list but doesn't
|
|
|
|
* free the resources associated with the dive. It returns a pointer
|
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
|
|
|
* to the unregistered dive. The returned dive has the selection-
|
|
|
|
* and hidden-flags cleared. */
|
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
|
|
|
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 */
|
2014-01-15 18:54:41 +00:00
|
|
|
remove_dive_from_trip(dive, 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
|
|
|
unregister_dive_from_table(&dive_table, 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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
2018-08-01 08:47:09 +00:00
|
|
|
struct dive *dive = get_dive(idx);
|
|
|
|
if (!dive)
|
|
|
|
return; /* this should never happen */
|
|
|
|
if (dive->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
|
|
|
deselect_dive(dive);
|
2018-08-01 08:47:09 +00:00
|
|
|
dive = unregister_dive(idx);
|
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
|
|
|
free_dive(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;
|
|
|
|
}
|
|
|
|
|
2018-07-19 20:35:25 +00:00
|
|
|
/* get the index where we want to insert the dive so that everything stays
|
|
|
|
* ordered reverse-chronologically */
|
|
|
|
int dive_get_insertion_index(struct dive *dive)
|
|
|
|
{
|
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
|
|
|
/* we might want to use binary search here */
|
2018-07-19 20:35:25 +00:00
|
|
|
for (int i = 0; i < dive_table.nr; i++) {
|
|
|
|
if (dive->when <= dive_table.dives[i]->when)
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
return dive_table.nr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add a dive at the given index. if the index is negative, the dive will
|
|
|
|
* be added according to reverse chronological order */
|
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;
|
2018-07-19 20:35:25 +00:00
|
|
|
if (idx < 0)
|
|
|
|
idx = dive_get_insertion_index(dive);
|
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++;
|
2016-03-02 12:50:00 +00:00
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
Be smarter about dive renumbering when merging dives
We really have two different cases for merging dives:
(a) downloading a new dive from a dive computer, and merging it with an
existing dive that we had already created using a different dive
computer. This is the "try_to_merge()" case, called from
"process_dives()
(b) merging two different dives into one longer dive. This is the
"merge_two_dives()" case when you explicitly merge dives using the
divelist.
While a lot of the issues are the same, many details differ, and one of
the details is how dive numbering should be handled.
In particular, when you download from a dive computer and merge with an
existing dive, you want too take the *maximum* dive number, because the
dive computer notion of which dive it is may well not match what the
user dive number is.
On the other hand, when you explicitly merge in the dive list, you end
up renumbering not just the dive you are merging, but also all
subsequent dives, since you now have one fewer dives overall. So that
case already has to be handled by the caller.
Now, the simpler "download from dive computer" case was broken by commit
ce3a78efcac2 ("Assign lower number to a merged dive instead of higher
one"). It fixed the numbering for the divelist case, but broke the
download case.
So this commit reverts commit ce3a78efcac2, and instead extends and
clarifies the dive renumbering that "merge_two_dives()" already did. It
now explicitly renumbers not just the following dives, but also
renumbers the merged dive itself, so now we can go back to the old "take
the bigger dive number" for the core merging, which fixes the download
case.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-30 19:42:27 +00:00
|
|
|
/*
|
|
|
|
* Merge two dives. 'a' is always before 'b' in the dive list
|
|
|
|
* (and thus in time).
|
|
|
|
*/
|
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;
|
Be smarter about dive renumbering when merging dives
We really have two different cases for merging dives:
(a) downloading a new dive from a dive computer, and merging it with an
existing dive that we had already created using a different dive
computer. This is the "try_to_merge()" case, called from
"process_dives()
(b) merging two different dives into one longer dive. This is the
"merge_two_dives()" case when you explicitly merge dives using the
divelist.
While a lot of the issues are the same, many details differ, and one of
the details is how dive numbering should be handled.
In particular, when you download from a dive computer and merge with an
existing dive, you want too take the *maximum* dive number, because the
dive computer notion of which dive it is may well not match what the
user dive number is.
On the other hand, when you explicitly merge in the dive list, you end
up renumbering not just the dive you are merging, but also all
subsequent dives, since you now have one fewer dives overall. So that
case already has to be handled by the caller.
Now, the simpler "download from dive computer" case was broken by commit
ce3a78efcac2 ("Assign lower number to a merged dive instead of higher
one"). It fixed the numbering for the divelist case, but broke the
download case.
So this commit reverts commit ce3a78efcac2, and instead extends and
clarifies the dive renumbering that "merge_two_dives()" already did. It
now explicitly renumbers not just the following dives, but also
renumbers the merged dive itself, so now we can go back to the old "take
the bigger dive number" for the core merging, which fixes the download
case.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-30 19:42:27 +00:00
|
|
|
int i, j, nr, nrdiff;
|
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;
|
2018-07-21 16:28:33 +00:00
|
|
|
res = merge_dives(a, b, b->when - a->when, false, NULL);
|
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
|
|
|
|
Be smarter about dive renumbering when merging dives
We really have two different cases for merging dives:
(a) downloading a new dive from a dive computer, and merging it with an
existing dive that we had already created using a different dive
computer. This is the "try_to_merge()" case, called from
"process_dives()
(b) merging two different dives into one longer dive. This is the
"merge_two_dives()" case when you explicitly merge dives using the
divelist.
While a lot of the issues are the same, many details differ, and one of
the details is how dive numbering should be handled.
In particular, when you download from a dive computer and merge with an
existing dive, you want too take the *maximum* dive number, because the
dive computer notion of which dive it is may well not match what the
user dive number is.
On the other hand, when you explicitly merge in the dive list, you end
up renumbering not just the dive you are merging, but also all
subsequent dives, since you now have one fewer dives overall. So that
case already has to be handled by the caller.
Now, the simpler "download from dive computer" case was broken by commit
ce3a78efcac2 ("Assign lower number to a merged dive instead of higher
one"). It fixed the numbering for the divelist case, but broke the
download case.
So this commit reverts commit ce3a78efcac2, and instead extends and
clarifies the dive renumbering that "merge_two_dives()" already did. It
now explicitly renumbers not just the following dives, but also
renumbers the merged dive itself, so now we can go back to the old "take
the bigger dive number" for the core merging, which fixes the download
case.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-30 19:42:27 +00:00
|
|
|
/*
|
|
|
|
* If 'a' and 'b' were numbered, and in proper order,
|
|
|
|
* then the resulting dive will get the first number,
|
|
|
|
* and the subsequent dives will be renumbered by the
|
|
|
|
* difference.
|
|
|
|
*
|
|
|
|
* So if you had a dive list 1 3 6 7 8, and you
|
|
|
|
* merge 1 and 3, the resulting numbered list will
|
|
|
|
* be 1 4 5 6, because we assume that there were
|
|
|
|
* some missing dives (originally dives 4 and 5),
|
|
|
|
* that now will still be missing (dives 2 and 3
|
|
|
|
* in the renumbered world).
|
|
|
|
*
|
|
|
|
* Obviously the normal case is that everything is
|
|
|
|
* consecutive, and the difference will be 1, so the
|
|
|
|
* above example is not supposed to be normal.
|
|
|
|
*/
|
|
|
|
nrdiff = 0;
|
|
|
|
nr = a->number;
|
|
|
|
if (a->number && b->number > a->number) {
|
|
|
|
res->number = nr;
|
|
|
|
nrdiff = b->number - nr;
|
|
|
|
}
|
|
|
|
|
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;
|
Renumber dive list after manual dive merging
As Linus pointed out in mail list, user is forced to manually renumber
his dives after doing a merge, unless the merged dives were those at
the list tail.
This patch try to manage the more usual cases, letting the user to deal
with those more complex, based on some assumptions:
1.- We are working on an time ordered list of type:
dive_table.nr ... 100 -- 101 -- 102 -- 103 -- 104 ...
dive_table.dives.number ... 234 -- 235 -- 236 -- 245 -- 246 ...
2.- It's unlikely to merge no consecutive dives, as merging is time
based.
3.- It's unlikely (although possible) to find consecutive dives with
no consecutive numbers.
4.- It would be rather bizarre to find that newer dive,of those to
merge, has lower number than older.
5.- It can be found that one (or both) dives to merge are zero
numbered.
6.- There is only need to renumber from merged dives in advance.
A variable, "factor", is fixed before reworking the dive table. This
number will be substracted from the original dive number.
If we are in point 5.- case, "factor" will be set to zero, meaning
that dive numbers will not change (if older dive is zero, merged one
will be numbered zero too and will let the user to manage this; if
newer dive is zero there won't be need of renumbering as following
dives will be correctly numbered, e.g. after splitting a dive which
is not at the tail of the table).
In most cases, "factor" *should* be set to 1.
While renumbering it can be found a dive with it's number set to zero,
this won't be changed and will remain zeroed to avoid negative
numbers. It, mostly, means that the user has pending work on his
dives.
I don't know why I've written such a big explanation for such a tiny
patch :-)
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-09 15:21:08 +00:00
|
|
|
|
|
|
|
// renumber dives from merged one in advance by difference between
|
|
|
|
// merged dives numbers. Do not renumber if actual number is zero.
|
Be smarter about dive renumbering when merging dives
We really have two different cases for merging dives:
(a) downloading a new dive from a dive computer, and merging it with an
existing dive that we had already created using a different dive
computer. This is the "try_to_merge()" case, called from
"process_dives()
(b) merging two different dives into one longer dive. This is the
"merge_two_dives()" case when you explicitly merge dives using the
divelist.
While a lot of the issues are the same, many details differ, and one of
the details is how dive numbering should be handled.
In particular, when you download from a dive computer and merge with an
existing dive, you want too take the *maximum* dive number, because the
dive computer notion of which dive it is may well not match what the
user dive number is.
On the other hand, when you explicitly merge in the dive list, you end
up renumbering not just the dive you are merging, but also all
subsequent dives, since you now have one fewer dives overall. So that
case already has to be handled by the caller.
Now, the simpler "download from dive computer" case was broken by commit
ce3a78efcac2 ("Assign lower number to a merged dive instead of higher
one"). It fixed the numbering for the divelist case, but broke the
download case.
So this commit reverts commit ce3a78efcac2, and instead extends and
clarifies the dive renumbering that "merge_two_dives()" already did. It
now explicitly renumbers not just the following dives, but also
renumbers the merged dive itself, so now we can go back to the old "take
the bigger dive number" for the core merging, which fixes the download
case.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-03-30 19:42:27 +00:00
|
|
|
for (; j < dive_table.nr; j++) {
|
|
|
|
struct dive *dive = dive_table.dives[j];
|
|
|
|
int newnr;
|
|
|
|
|
|
|
|
if (!dive->number)
|
|
|
|
continue;
|
|
|
|
newnr = dive->number - nrdiff;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't renumber stuff that isn't in order!
|
|
|
|
*
|
|
|
|
* So if the new dive number isn't larger than the
|
|
|
|
* previous dive number, just stop here.
|
|
|
|
*/
|
|
|
|
if (newnr <= nr)
|
|
|
|
break;
|
|
|
|
dive->number = newnr;
|
|
|
|
nr = newnr;
|
|
|
|
}
|
Renumber dive list after manual dive merging
As Linus pointed out in mail list, user is forced to manually renumber
his dives after doing a merge, unless the merged dives were those at
the list tail.
This patch try to manage the more usual cases, letting the user to deal
with those more complex, based on some assumptions:
1.- We are working on an time ordered list of type:
dive_table.nr ... 100 -- 101 -- 102 -- 103 -- 104 ...
dive_table.dives.number ... 234 -- 235 -- 236 -- 245 -- 246 ...
2.- It's unlikely to merge no consecutive dives, as merging is time
based.
3.- It's unlikely (although possible) to find consecutive dives with
no consecutive numbers.
4.- It would be rather bizarre to find that newer dive,of those to
merge, has lower number than older.
5.- It can be found that one (or both) dives to merge are zero
numbered.
6.- There is only need to renumber from merged dives in advance.
A variable, "factor", is fixed before reworking the dive table. This
number will be substracted from the original dive number.
If we are in point 5.- case, "factor" will be set to zero, meaning
that dive numbers will not change (if older dive is zero, merged one
will be numbered zero too and will let the user to manage this; if
newer dive is zero there won't be need of renumbering as following
dives will be correctly numbered, e.g. after splitting a dive which
is not at the tail of the table).
In most cases, "factor" *should* be set to 1.
While renumbering it can be found a dive with it's number set to zero,
this won't be changed and will remain zeroed to avoid negative
numbers. It, mostly, means that the user has pending work on his
dives.
I don't know why I've written such a big explanation for such a tiny
patch :-)
Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-01-09 15:21:08 +00:00
|
|
|
|
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
|
|
|
}
|
|
|
|
|
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
|
|
|
void select_dive(struct dive *dive)
|
2011-09-20 04:39:15 +00:00
|
|
|
{
|
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 (dive && !dive->selected) {
|
|
|
|
dive->selected = 1;
|
|
|
|
amount_selected++;
|
|
|
|
current_dive = dive;
|
2012-08-13 22:07:38 +00:00
|
|
|
}
|
2011-09-22 17:28:57 +00:00
|
|
|
}
|
|
|
|
|
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
|
|
|
void deselect_dive(struct dive *dive)
|
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
|
|
|
{
|
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 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
|
|
|
if (dive && dive->selected) {
|
|
|
|
dive->selected = 0;
|
2013-12-07 12:25:18 +00:00
|
|
|
if (amount_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
|
|
|
if (current_dive == dive && amount_selected > 0) {
|
2013-01-29 20:05:30 +00:00
|
|
|
/* pick a different dive as 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
|
|
|
int selected_dive = idx = get_divenr(dive);
|
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);
|
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 (dive && dive->selected) {
|
|
|
|
current_dive = dive;
|
2013-01-29 20:05:30 +00:00
|
|
|
return;
|
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
|
|
|
}
|
2013-01-29 20:05:30 +00:00
|
|
|
}
|
|
|
|
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);
|
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 (dive && dive->selected) {
|
|
|
|
current_dive = dive;
|
2013-01-29 20:05:30 +00:00
|
|
|
return;
|
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
|
|
|
}
|
2013-01-29 20:05:30 +00:00
|
|
|
}
|
|
|
|
}
|
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
|
|
|
current_dive = NULL;
|
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)
|
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
|
|
|
deselect_dive(dive);
|
2014-05-24 20:19:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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)
|
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
|
|
|
select_dive(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)
|
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
|
|
|
deselect_dive(d);
|
2014-11-12 06:59:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
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)
|
|
|
|
{
|
2018-01-07 10:12:48 +00:00
|
|
|
if (empty_string(trip_a->location) && trip_b->location) {
|
2014-05-24 21:02:08 +00:00
|
|
|
free(trip_a->location);
|
|
|
|
trip_a->location = strdup(trip_b->location);
|
|
|
|
}
|
2018-01-07 10:12:48 +00:00
|
|
|
if (empty_string(trip_a->notes) && trip_b->notes) {
|
2014-05-24 21:02:08 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2018-09-23 19:22:48 +00:00
|
|
|
/* Out of two strings, copy the string that is not empty (if any). */
|
|
|
|
static char *copy_non_empty_string(const char *a, const char *b)
|
|
|
|
{
|
|
|
|
return copy_string(empty_string(b) ? a : b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Combine trips new. This combines two trips, generating a
|
|
|
|
* new trip. To support undo, we have to preserve the old trips. */
|
|
|
|
dive_trip_t *combine_trips_create(struct dive_trip *trip_a, struct dive_trip *trip_b)
|
|
|
|
{
|
|
|
|
dive_trip_t *trip;
|
|
|
|
|
|
|
|
trip = alloc_trip();
|
|
|
|
trip->when = trip_a->when;
|
|
|
|
trip->location = copy_non_empty_string(trip_a->location, trip_b->location);
|
|
|
|
trip->notes = copy_non_empty_string(trip_a->notes, trip_b->notes);
|
|
|
|
|
|
|
|
return trip;
|
|
|
|
}
|
|
|
|
|
2017-12-11 21:23:52 +00:00
|
|
|
void mark_divelist_changed(bool changed)
|
2011-09-21 04:29:09 +00:00
|
|
|
{
|
2017-12-11 21:28:02 +00:00
|
|
|
if (dive_list_changed == changed)
|
|
|
|
return;
|
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.
|
|
|
|
*/
|
2018-09-28 08:21:23 +00:00
|
|
|
static void try_to_renumber(int preexisting)
|
2013-04-24 23:33:29 +00:00
|
|
|
{
|
|
|
|
int i, nr;
|
2018-09-28 08:21:23 +00:00
|
|
|
struct dive *last = get_dive(preexisting - 1);
|
2013-04-24 23:33:29 +00:00
|
|
|
|
|
|
|
/*
|
2018-09-28 08:21:23 +00:00
|
|
|
* If there was a last dive, but it didn't have
|
|
|
|
* a number, give up.
|
2013-04-24 23:33:29 +00:00
|
|
|
*/
|
2018-09-28 08:21:23 +00:00
|
|
|
if (last && !last->number)
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-23 10:53:35 +00:00
|
|
|
void process_loaded_dives()
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
|
|
/* Register dive computer nick names */
|
|
|
|
for_each_dive(i, dive)
|
|
|
|
set_dc_nickname(dive);
|
|
|
|
|
|
|
|
sort_table(&dive_table);
|
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
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
|
|
|
|
* true on success. On success, the dive to add and the old dive
|
|
|
|
* will be deleted. On failure, they are untouched.
|
|
|
|
* If "prefer_imported" is true, use data of the new dive.
|
|
|
|
*/
|
|
|
|
static bool try_to_merge_into(struct dive *dive_to_add, int idx, bool prefer_imported)
|
|
|
|
{
|
|
|
|
struct dive *old_dive = dive_table.dives[idx];
|
|
|
|
struct dive_trip *trip = old_dive->divetrip;
|
|
|
|
struct dive *merged = try_to_merge(old_dive, dive_to_add, prefer_imported);
|
|
|
|
if (!merged)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
merged->id = old_dive->id;
|
|
|
|
merged->selected = old_dive->selected;
|
|
|
|
dive_table.dives[idx] = merged;
|
|
|
|
if (trip) {
|
|
|
|
remove_dive_from_trip(old_dive, false);
|
|
|
|
add_dive_to_trip(merged, trip);
|
|
|
|
}
|
|
|
|
free_dive(old_dive);
|
|
|
|
free_dive(dive_to_add);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add imported dive to global dive table. Overlapping dives will
|
|
|
|
* be merged if possible. If prefer_imported is true, data of the
|
|
|
|
* new dives are prioritized in such a case.
|
2018-10-03 19:45:50 +00:00
|
|
|
* If 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.
|
2018-09-28 08:21:23 +00:00
|
|
|
* Note: the dives in import_table are consumed! On return import_table
|
|
|
|
* has size 0.
|
|
|
|
*/
|
2018-10-03 19:45:50 +00:00
|
|
|
void process_imported_dives(struct dive_table *import_table, bool prefer_imported, bool downloaded)
|
2018-09-28 08:21:23 +00:00
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
int preexisting;
|
|
|
|
bool sequence_changed = false;
|
|
|
|
|
|
|
|
/* If no dives were imported, don't bother doing anything */
|
|
|
|
if (!import_table->nr)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* 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 */
|
2018-10-03 19:45:50 +00:00
|
|
|
if (downloaded)
|
2018-09-28 08:21:23 +00:00
|
|
|
set_dc_nickname(import_table->dives[0]);
|
|
|
|
else
|
|
|
|
/* they aren't downloaded, so record / check all new ones */
|
|
|
|
for (i = 0; i < import_table->nr; i++)
|
|
|
|
set_dc_nickname(import_table->dives[i]);
|
|
|
|
|
|
|
|
/* Sort the table of dives to be imported and combine mergable dives */
|
|
|
|
sort_table(import_table);
|
|
|
|
merge_imported_dives(import_table);
|
|
|
|
|
|
|
|
/* 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.
|
|
|
|
*/
|
|
|
|
j = 0; /* Index in old dives */
|
|
|
|
preexisting = dive_table.nr; /* Remember old size for renumbering */
|
|
|
|
for (i = 0; i < import_table->nr; i++) {
|
|
|
|
struct dive *dive_to_add = import_table->dives[i];
|
|
|
|
|
|
|
|
/* Find insertion point. */
|
|
|
|
while (j < dive_table.nr && dive_table.dives[j]->when < dive_to_add->when)
|
|
|
|
j++;
|
|
|
|
|
|
|
|
/* Try to merge into previous dive. */
|
|
|
|
if (j > 0 && dive_endtime(dive_table.dives[j - 1]) > dive_to_add->when) {
|
|
|
|
if (try_to_merge_into(dive_to_add, j - 1, prefer_imported))
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* That didn't merge into the previous dive. If we're
|
|
|
|
* at the end of the dive table, quit the loop and add
|
|
|
|
* all new dives at the end. */
|
|
|
|
if (j >= dive_table.nr)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Try to merge into next dive. */
|
|
|
|
if (dive_endtime(dive_to_add) > dive_table.dives[j]->when) {
|
|
|
|
if (try_to_merge_into(dive_to_add, j, prefer_imported))
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We couldnt merge dives, add at the given position. */
|
|
|
|
add_single_dive(j, dive_to_add);
|
|
|
|
j++;
|
|
|
|
sequence_changed = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If there are still dives to add, add them at the end of the dive table. */
|
|
|
|
for ( ; i < import_table->nr; i++)
|
|
|
|
add_single_dive(dive_table.nr, import_table->dives[i]);
|
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 */
|
|
|
|
import_table->nr = 0;
|
|
|
|
|
|
|
|
/* If the sequence wasn't changed, renumber */
|
|
|
|
if (!sequence_changed)
|
|
|
|
try_to_renumber(preexisting);
|
2013-04-24 23:33:29 +00:00
|
|
|
|
2018-09-23 10:53:35 +00:00
|
|
|
mark_divelist_changed(true);
|
2013-04-24 23:33:29 +00:00
|
|
|
}
|
2014-08-18 19:12:05 +00:00
|
|
|
|
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
|
|
|
|
*/
|
|
|
|
int get_dive_nr_at_idx(int idx)
|
|
|
|
{
|
|
|
|
if (dive_table.nr == 0)
|
|
|
|
return 1;
|
|
|
|
if (idx >= dive_table.nr) {
|
|
|
|
struct dive *last_dive = get_dive(dive_table.nr - 1);
|
|
|
|
return last_dive->number ? last_dive->number + 1 : 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-08-18 19:12:05 +00:00
|
|
|
void set_dive_nr_for_current_dive()
|
|
|
|
{
|
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 selected_dive = get_divenr(current_dive);
|
2014-08-18 19:12:05 +00:00
|
|
|
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
|
|
|
|
2016-04-14 12:34:19 +00:00
|
|
|
int get_dive_id_closest_to(timestamp_t when)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int nr = dive_table.nr;
|
|
|
|
|
|
|
|
// deal with pathological cases
|
|
|
|
if (nr == 0)
|
|
|
|
return 0;
|
|
|
|
else if (nr == 1)
|
|
|
|
return dive_table.dives[0]->id;
|
|
|
|
|
|
|
|
for (i = 0; i < nr && dive_table.dives[i]->when <= when; i++)
|
|
|
|
; // nothing
|
|
|
|
|
|
|
|
// again, capture the two edge cases first
|
|
|
|
if (i == nr)
|
|
|
|
return dive_table.dives[i - 1]->id;
|
|
|
|
else if (i == 0)
|
|
|
|
return dive_table.dives[0]->id;
|
|
|
|
|
|
|
|
if (when - dive_table.dives[i - 1]->when < dive_table.dives[i]->when - when)
|
|
|
|
return dive_table.dives[i - 1]->id;
|
|
|
|
else
|
|
|
|
return dive_table.dives[i]->id;
|
|
|
|
}
|
|
|
|
|
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);
|
|
|
|
|
2015-07-24 20:18:30 +00:00
|
|
|
reset_min_datafile_version();
|
2016-03-23 19:09:18 +00:00
|
|
|
saved_git_id = "";
|
2015-07-24 20:18:30 +00:00
|
|
|
}
|
2018-08-01 19:57:24 +00:00
|
|
|
|
2018-10-14 13:33:46 +00:00
|
|
|
/*
|
|
|
|
* Clear a dive_table
|
|
|
|
*/
|
|
|
|
void clear_table(struct dive_table *table)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < table->nr; i++)
|
2018-10-14 13:46:54 +00:00
|
|
|
free_dive(table->dives[i]);
|
2018-10-14 13:33:46 +00:00
|
|
|
table->nr = 0;
|
|
|
|
}
|
|
|
|
|
2018-08-26 12:42:38 +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 (start-time, id)
|
|
|
|
* tuple. "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).
|
|
|
|
*/
|
|
|
|
static int comp_dives(const struct dive *a, const struct dive *b)
|
2018-08-01 19:57:24 +00:00
|
|
|
{
|
|
|
|
if (a->when < b->when)
|
|
|
|
return -1;
|
|
|
|
if (a->when > b->when)
|
|
|
|
return 1;
|
2018-08-26 12:42:38 +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 */
|
|
|
|
}
|
|
|
|
|
|
|
|
bool dive_less_than(const struct dive *a, const struct dive *b)
|
|
|
|
{
|
|
|
|
return comp_dives(a, b) < 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sortfn(const void *_a, const void *_b)
|
|
|
|
{
|
|
|
|
const struct dive *a = (const struct dive *)*(const void **)_a;
|
|
|
|
const struct dive *b = (const struct dive *)*(const void **)_b;
|
|
|
|
return comp_dives(a, b);
|
2018-08-01 19:57:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void sort_table(struct dive_table *table)
|
|
|
|
{
|
|
|
|
qsort(table->dives, table->nr, sizeof(struct dive *), sortfn);
|
|
|
|
}
|
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.
|
|
|
|
*/
|
|
|
|
timestamp_t get_surface_interval(timestamp_t when)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
timestamp_t prev_end;
|
|
|
|
|
|
|
|
/* find previous dive. might want to use a binary search. */
|
|
|
|
for (i = dive_table.nr - 1; i >= 0; --i) {
|
|
|
|
if (dive_table.dives[i]->when < when)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (i < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
prev_end = dive_endtime(dive_table.dives[i]);
|
|
|
|
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. */
|
|
|
|
struct dive *find_next_visible_dive(timestamp_t when)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
if (!dive_table.nr)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* we might want to use binary search here */
|
|
|
|
for (i = 0; i < dive_table.nr; i++) {
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (j = i; j < dive_table.nr; j++) {
|
|
|
|
if (!get_dive(j)->hidden_by_filter)
|
|
|
|
return get_dive(j);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|