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

Cleanup: use getDiveSelection() for shifting time

Browse source 
There are two cases where dive-times are shifted: in an explicit
dialog and when editing the date/time of a dive.

In each of these cases, the selected dives were collected manually.
Instead use the getDiveSelection() function. Since this returns
a std::vector, change the argument of Command::ShiftTime() to
such a std::vector.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-01-03 16:04:54 +01:00 • committed by bstoeger
parent 62adc24d15
commit c495a49b1b
6 changed files with 14 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

13
commands/command_divelist.cpp
View file

@ -579,10 +579,10 @@ void DeleteDive::redoit()
}
ShiftTime::ShiftTime(const QVector<dive *> &changedDives, int amount)
ShiftTime::ShiftTime(std::vector<dive *> changedDives, int amount)
: diveList(changedDives), timeChanged(amount)
{
setText(tr("shift time of %n dives", "", changedDives.count()));
setText(tr("shift time of %n dives", "", changedDives.size()));
}
void ShiftTime::redoit()
@ -601,11 +601,12 @@ void ShiftTime::redoit()
sort_dive_table(&trip->dives); // Keep the trip-table in order
// Send signals
emit diveListNotifier.divesTimeChanged(timeChanged, diveList);
emit diveListNotifier.divesChanged(diveList, DiveField::DATETIME);
QVector<dive *> dives = QVector<dive *>::fromStdVector(diveList);
emit diveListNotifier.divesTimeChanged(timeChanged, dives);
emit diveListNotifier.divesChanged(dives, DiveField::DATETIME);
// Select the changed dives
setSelection(std::vector<dive *>(diveList.begin(), diveList.end()), diveList[0]);
setSelection(diveList, diveList[0]);
// Negate the time-shift so that the next call does the reverse
timeChanged = -timeChanged;
@ -613,7 +614,7 @@ void ShiftTime::redoit()
bool ShiftTime::workToBeDone()
{
return !diveList.isEmpty();
return !diveList.empty();
}
void ShiftTime::undoit()