mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

undo: pass divecomputer number to EditProfile 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:30:57 +02:00 committed by bstoeger
parent 297befc6f8
commit d057af43b4
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commands/command.cpp
View file

@ -277,9 +277,9 @@ void replanDive(dive *d)
execute(new ReplanDive(d)); execute(new ReplanDive(d));
} }
void editProfile(const dive *d, EditProfileType type, int count) void editProfile(const dive *d, int dcNr, EditProfileType type, int count)
{ {
execute(new EditProfile(d, type, count)); execute(new EditProfile(d, dcNr, type, count));
} }
int addWeight(bool currentDiveOnly) int addWeight(bool currentDiveOnly)

2
commands/command.h
View file

@ -102,7 +102,7 @@ enum class EditProfileType {
MOVE, MOVE,
}; };
void replanDive(dive *d); // dive computer(s) and cylinder(s) of first argument will be consumed! void replanDive(dive *d); // dive computer(s) and cylinder(s) of first argument will be consumed!
void editProfile(const dive *d, EditProfileType type, int count); void editProfile(const dive *d, int dcNr, EditProfileType type, int count);
int addWeight(bool currentDiveOnly); int addWeight(bool currentDiveOnly);
int removeWeight(int index, bool currentDiveOnly); int removeWeight(int index, bool currentDiveOnly);
int editWeight(int index, weightsystem_t ws, bool currentDiveOnly); int editWeight(int index, weightsystem_t ws, bool currentDiveOnly);

4
commands/command_edit.cpp
View file

@ -882,8 +882,8 @@ QString editProfileTypeToString(EditProfileType type, int count)
} }
} }
EditProfile::EditProfile(const dive *source, EditProfileType type, int count) : d(current_dive), EditProfile::EditProfile(const dive *source, int dcNr, EditProfileType type, int count) : d(current_dive),
dcNr(dc_number), dcNr(dcNr),
maxdepth({0}), maxdepth({0}),
meandepth({0}), meandepth({0}),
dcmaxdepth({0}), dcmaxdepth({0}),

2
commands/command_edit.h
View file

@ -352,7 +352,7 @@ class EditProfile : public Base {
struct divecomputer dc; struct divecomputer dc;
public: public:
// Note: source must be clean (i.e. fixup_dive must have been called on it). // Note: source must be clean (i.e. fixup_dive must have been called on it).
EditProfile(const dive *source, EditProfileType type, int count); EditProfile(const dive *source, int dcNr, EditProfileType type, int count);
~EditProfile(); ~EditProfile();
private: private:
void undo() override; void undo() override;

6
desktop-widgets/profilewidget.cpp
View file

@ -297,7 +297,7 @@ void ProfileWidget::stopAdded()
return; return;
calcDepth(*editedDive, editedDc); calcDepth(*editedDive, editedDc);
Setter s(placingCommand, true); Setter s(placingCommand, true);
Command::editProfile(editedDive.get(), Command::EditProfileType::ADD, 0); Command::editProfile(editedDive.get(), editedDc, Command::EditProfileType::ADD, 0);
} }
void ProfileWidget::stopRemoved(int count) void ProfileWidget::stopRemoved(int count)
@ -306,7 +306,7 @@ void ProfileWidget::stopRemoved(int count)
return; return;
calcDepth(*editedDive, editedDc); calcDepth(*editedDive, editedDc);
Setter s(placingCommand, true); Setter s(placingCommand, true);
Command::editProfile(editedDive.get(), Command::EditProfileType::REMOVE, count); Command::editProfile(editedDive.get(), editedDc, Command::EditProfileType::REMOVE, count);
} }
void ProfileWidget::stopMoved(int count) void ProfileWidget::stopMoved(int count)
@ -315,5 +315,5 @@ void ProfileWidget::stopMoved(int count)
return; return;
calcDepth(*editedDive, editedDc); calcDepth(*editedDive, editedDc);
Setter s(placingCommand, true); Setter s(placingCommand, true);
Command::editProfile(editedDive.get(), Command::EditProfileType::MOVE, count); Command::editProfile(editedDive.get(), editedDc, Command::EditProfileType::MOVE, count);
} }