mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-02 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

undo: pass divecomputer number to EditSensors command

Browse source 
Don't access the global variable dc_number, which might
not make sense on mobile.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-05-21 21:13:32 +02:00 committed by bstoeger
parent 996f85771a
commit 297befc6f8
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commands/command.cpp
View file

@ -312,9 +312,9 @@ int editCylinder(int index, cylinder_t cyl, EditCylinderType type, bool currentD
return execute_edit(new EditCylinder(index, cyl, type, currentDiveOnly)); return execute_edit(new EditCylinder(index, cyl, type, currentDiveOnly));
} }
void editSensors(int toCylinder, const int fromCylinder) void editSensors(int toCylinder, int fromCylinder, int dcNr)
{ {
execute(new EditSensors(toCylinder, fromCylinder)); execute(new EditSensors(toCylinder, fromCylinder, dcNr));
} }
// Trip editing related commands // Trip editing related commands

2
commands/command.h
View file

@ -114,7 +114,7 @@ enum class EditCylinderType {
GASMIX GASMIX
}; };
int editCylinder(int index, cylinder_t cyl, EditCylinderType type, bool currentDiveOnly); int editCylinder(int index, cylinder_t cyl, EditCylinderType type, bool currentDiveOnly);
void editSensors(int toCylinder, const int fromCylinder); void editSensors(int toCylinder, int fromCylinder, int dcNr);
#ifdef SUBSURFACE_MOBILE #ifdef SUBSURFACE_MOBILE
// Edits a dive and creates a divesite (if createDs != NULL) or edits a divesite (if changeDs != NULL). // Edits a dive and creates a divesite (if createDs != NULL) or edits a divesite (if changeDs != NULL).
// Takes ownership of newDive and createDs! // Takes ownership of newDive and createDs!

4
commands/command_edit.cpp
View file

@ -1351,8 +1351,8 @@ void EditCylinder::undo()
redo(); redo();
} }
EditSensors::EditSensors(int toCylinderIn, int fromCylinderIn) EditSensors::EditSensors(int toCylinderIn, int fromCylinderIn, int dcNr)
: d(current_dive), dc(get_dive_dc(d, dc_number)), toCylinder(toCylinderIn), fromCylinder(fromCylinderIn) : d(current_dive), dc(get_dive_dc(d, dcNr)), toCylinder(toCylinderIn), fromCylinder(fromCylinderIn)
{ {
if (!d || !dc) if (!d || !dc)
return; return;

2
commands/command_edit.h
View file

@ -444,7 +444,7 @@ private:
class EditSensors : public Base class EditSensors : public Base
{ {
public: public:
EditSensors(int cylIndex, int fromCylinder); EditSensors(int cylIndex, int fromCylinder, int dcNr);
private: private:
struct dive *d; struct dive *d;

2
qt-models/cylindermodel.cpp
View file

@ -475,7 +475,7 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
bool ok = false; bool ok = false;
int s = vString.toInt(&ok); int s = vString.toInt(&ok);
if (ok) { if (ok) {
Command::editSensors(index.row(), s); Command::editSensors(index.row(), s, dc_number);
// We don't use the edit cylinder command and editing sensors is not relevant for planner // We don't use the edit cylinder command and editing sensors is not relevant for planner
return true; return true;
} }