mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
undo: make adding of pictures undoable
This one is a bit hairy, because two things might happen if the picture has a geo location: - A dive gets a newly generated dive site set. - The dive site of a dive is edited. Therefore the undo command has to store keep track of that. Oh my. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
6ae2d36e38
commit
4374605c12
7 changed files with 129 additions and 22 deletions
|
|
@ -372,4 +372,9 @@ void removePictures(const std::vector<PictureListForDeletion> &pictures)
|
|||
execute(new RemovePictures(pictures));
|
||||
}
|
||||
|
||||
void addPictures(const std::vector<PictureListForAddition> &pictures)
|
||||
{
|
||||
execute(new AddPictures(pictures));
|
||||
}
|
||||
|
||||
} // namespace Command
|
||||
|
|
|
|||
|
|
@ -131,6 +131,7 @@ struct PictureListForAddition {
|
|||
};
|
||||
void setPictureOffset(dive *d, const QString &filename, offset_t offset);
|
||||
void removePictures(const std::vector<PictureListForDeletion> &pictures);
|
||||
void addPictures(const std::vector<PictureListForAddition> &pictures);
|
||||
|
||||
} // namespace Command
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include "command_pictures.h"
|
||||
#include "core/subsurface-qt/divelistnotifier.h"
|
||||
#include "qt-models/divelocationmodel.h"
|
||||
|
||||
namespace Command {
|
||||
|
||||
|
|
@ -153,4 +154,87 @@ void RemovePictures::redo()
|
|||
picturesToAdd = removePictures(picturesToRemove);
|
||||
}
|
||||
|
||||
AddPictures::AddPictures(const std::vector<PictureListForAddition> &pictures) : picturesToAdd(pictures)
|
||||
{
|
||||
// Sort the pictures according to the backend-rules. Moreover see if we have to set / create divesites.
|
||||
size_t count = 0;
|
||||
for (PictureListForAddition &p: picturesToAdd) {
|
||||
count += p.pics.size();
|
||||
std::sort(p.pics.begin(), p.pics.end());
|
||||
|
||||
// Find a picture with a location
|
||||
auto it = std::find_if(p.pics.begin(), p.pics.end(), [](const PictureObj &p) { return has_location(&p.location); });
|
||||
if (it != p.pics.end()) {
|
||||
// There is a dive with a location, we might want to modify the dive accordingly.
|
||||
struct dive_site *ds = p.d->dive_site;
|
||||
if (!ds) {
|
||||
// This dive doesn't yet have a dive site -> add a new dive site.
|
||||
dive_site *ds = alloc_dive_site_with_gps("", &it->location);
|
||||
sitesToAdd.emplace_back(ds);
|
||||
sitesToSet.push_back({ p.d, ds });
|
||||
} else if (!dive_site_has_gps_location(ds)) {
|
||||
// This dive has a dive site, but without coordinates. Let's add them.
|
||||
sitesToEdit.push_back({ ds, it->location });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (count == 0) {
|
||||
picturesToAdd.clear(); // This signals that nothing is to be done
|
||||
return;
|
||||
}
|
||||
setText(Command::Base::tr("add %n pictures(s)", "", count));
|
||||
}
|
||||
|
||||
bool AddPictures::workToBeDone()
|
||||
{
|
||||
return !picturesToAdd.empty();
|
||||
}
|
||||
|
||||
void AddPictures::swapDiveSites()
|
||||
{
|
||||
for (DiveSiteEntry &entry: sitesToSet) {
|
||||
dive_site *ds = entry.d->dive_site;
|
||||
if (ds)
|
||||
unregister_dive_from_dive_site(entry.d); // the dive-site pointer in the dive is now NULL
|
||||
std::swap(ds, entry.ds);
|
||||
if (ds)
|
||||
add_dive_to_dive_site(entry.d, ds);
|
||||
emit diveListNotifier.divesChanged(QVector<dive *>{ entry.d }, DiveField::DIVESITE);
|
||||
}
|
||||
|
||||
for (DiveSiteEditEntry &entry: sitesToEdit) {
|
||||
std::swap(entry.ds->location, entry.location);
|
||||
emit diveListNotifier.diveSiteChanged(entry.ds, LocationInformationModel::LOCATION); // Inform frontend of changed dive site.
|
||||
}
|
||||
}
|
||||
|
||||
void AddPictures::undo()
|
||||
{
|
||||
swapDiveSites();
|
||||
picturesToAdd = removePictures(picturesToRemove);
|
||||
|
||||
// Remove dive sites
|
||||
for (dive_site *siteToRemove: sitesToRemove) {
|
||||
int idx = unregister_dive_site(siteToRemove);
|
||||
sitesToAdd.emplace_back(siteToRemove);
|
||||
emit diveListNotifier.diveSiteDeleted(siteToRemove, idx); // Inform frontend of removed dive site.
|
||||
}
|
||||
sitesToRemove.clear();
|
||||
}
|
||||
|
||||
void AddPictures::redo()
|
||||
{
|
||||
// Add dive sites
|
||||
for (OwningDiveSitePtr &siteToAdd: sitesToAdd) {
|
||||
sitesToRemove.push_back(siteToAdd.get());
|
||||
int idx = register_dive_site(siteToAdd.release()); // Return ownership to backend.
|
||||
emit diveListNotifier.diveSiteAdded(sitesToRemove.back(), idx); // Inform frontend of new dive site.
|
||||
}
|
||||
sitesToAdd.clear();
|
||||
|
||||
swapDiveSites();
|
||||
picturesToRemove = addPictures(picturesToAdd);
|
||||
}
|
||||
|
||||
} // namespace Command
|
||||
|
|
|
|||
|
|
@ -35,5 +35,31 @@ private:
|
|||
bool workToBeDone() override;
|
||||
};
|
||||
|
||||
class AddPictures final : public Base {
|
||||
public:
|
||||
AddPictures(const std::vector<PictureListForAddition> &pictures);
|
||||
private:
|
||||
struct DiveSiteEntry {
|
||||
dive *d;
|
||||
dive_site *ds;
|
||||
};
|
||||
struct DiveSiteEditEntry {
|
||||
dive_site *ds;
|
||||
location_t location;
|
||||
};
|
||||
std::vector<PictureListForAddition> picturesToAdd; // for redo
|
||||
std::vector<OwningDiveSitePtr> sitesToAdd; //for redo
|
||||
std::vector<PictureListForDeletion> picturesToRemove; // for undo
|
||||
std::vector<dive_site *> sitesToRemove; // for undo
|
||||
std::vector<DiveSiteEntry> sitesToSet; // for redo and undo
|
||||
std::vector<DiveSiteEditEntry> sitesToEdit; // for redo and undo
|
||||
|
||||
void swapDiveSites();
|
||||
|
||||
void undo() override;
|
||||
void redo() override;
|
||||
bool workToBeDone() override;
|
||||
};
|
||||
|
||||
} // namespace Command
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue