mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

selection: move current dive and divecomputer to selection.cpp

Browse source 
This tries to encapsulate the management of the current dive and
divecomputer in the selection code. The current dive is alreay
set by setSelection(). Add a new parameter to also set the
current divecomputer. If -1 is passed, then the current
computer number is remained. This will allow us to audit the code.
Because for now, the whole "current dive computer" thing seems
to be ill-defined.

This fixes a bug: the dive-computer number wasn't validated
when making a new dive the current dive. The new code has some
drawbacks though: when selecting a whole trip, the validation
will be called for all dives in the trip and thus the dive computer
number will depend on the dive with the lowest amount of dive
computers in the trip. This will need to be fixed.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-04-04 18:57:28 +02:00 • committed by bstoeger
parent b56b7abcf5
commit 9f455b1457
23 changed files with 68 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/dive.h
View file

@ -111,8 +111,6 @@ extern depth_t gas_mod(struct gasmix mix, pressure_t po2_limit, const struct div
extern depth_t gas_mnd(struct gasmix mix, depth_t end, const struct dive *dive, int roundto);
extern struct dive displayed_dive;
extern unsigned int dc_number;
extern struct dive *current_dive;
extern struct dive *get_dive(int nr);
extern struct dive *get_dive_from_table(int nr, const struct dive_table *dt);

3
core/profile.c
View file

@ -30,9 +30,6 @@
extern int ascent_velocity(int depth, int avg_depth, int bottom_time);
struct dive *current_dive = NULL;
unsigned int dc_number = 0;
#ifdef DEBUG_PI
/* debugging tool - not normally used */
static void dump_pi(struct plot_info *pi)

24
core/selection.cpp
View file

@ -9,9 +9,21 @@
#include <QVector>
struct dive *current_dive = NULL;
unsigned int dc_number = 0;
int amount_selected;
static int amount_trips_selected;
static void fixup_current_dc()
{
// Every dive is guaranteed to have a dc
if (!current_dive || dc_number == 0)
return;
// Note that number_of_computers returns at least 1, so subtraction is valid.
dc_number = std::min(dc_number, number_of_computers(current_dive) - 1);
}
extern "C" void select_dive(struct dive *dive)
{
if (!dive)
@ -21,6 +33,7 @@ extern "C" void select_dive(struct dive *dive)
amount_selected++;
}
current_dive = dive;
fixup_current_dc();
}
extern "C" void deselect_dive(struct dive *dive)
@ -51,6 +64,7 @@ extern "C" void deselect_dive(struct dive *dive)
}
current_dive = NULL;
}
fixup_current_dc();
}
extern "C" struct dive *first_selected_dive()
@ -155,7 +169,7 @@ static void setClosestCurrentDive(timestamp_t when, const std::vector<dive *> &s
// Reset the selection to the dives of the "selection" vector and send the appropriate signals.
// Set the current dive to "currentDive". "currentDive" must be an element of "selection" (or
// null if "seletion" is empty). Return true if the selection or current dive changed.
void setSelection(const std::vector<dive *> &selection, dive *currentDive)
void setSelection(const std::vector<dive *> &selection, dive *currentDive, int currentDc)
{
// To do so, generate vectors of dives to be selected and deselected.
// We send signals batched by trip, so keep track of trip/dive pairs.
@ -203,6 +217,10 @@ void setSelection(const std::vector<dive *> &selection, dive *currentDive)
setClosestCurrentDive(currentDive->when, selection, divesToSelect);
}
if (currentDc >= 0)
dc_number = currentDc;
fixup_current_dc();
// Send the new selection
emit diveListNotifier.divesSelected(divesToSelect);
}
@ -210,9 +228,9 @@ void setSelection(const std::vector<dive *> &selection, dive *currentDive)
extern "C" void select_single_dive(dive *d)
{
if (d)
setSelection(std::vector<dive *>{ d }, d);
setSelection(std::vector<dive *>{ d }, d, -1);
else
setSelection(std::vector<dive *>(), nullptr);
setSelection(std::vector<dive *>(), nullptr, -1);
}
// Turn current selection into a vector.

9
core/selection.h
View file

@ -7,6 +7,8 @@
struct dive;
extern int amount_selected;
extern unsigned int dc_number;
extern struct dive *current_dive;
/*** C and C++ functions ***/
@ -40,9 +42,10 @@ extern void dump_selection(void);
#include <vector>
// Reset the selection to the dives of the "selection" vector and send the appropriate signals.
// Set the current dive to "currentDive". "currentDive" must be an element of "selection" (or
// null if "seletion" is empty).
void setSelection(const std::vector<dive *> &selection, dive *currentDive);
// Set the current dive to "currentDive" and the current dive computer to "currentDc".
// "currentDive" must be an element of "selection" (or null if "seletion" is empty).
// If "currentDc" is negative, an attempt will be made to keep the current computer number.
void setSelection(const std::vector<dive *> &selection, dive *currentDive, int currentDc);
// Get currently selectd dives
std::vector<dive *> getDiveSelection();