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

undo: make adding of pictures undoable

Browse source 
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:
Berthold Stoeger 2020-04-19 18:48:23 +02:00 • committed by Dirk Hohndel
parent 6ae2d36e38
commit 4374605c12
7 changed files with 129 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
desktop-widgets/divelistview.cpp
View file

@ -891,20 +891,27 @@ void DiveListView::matchImagesToDives(QStringList fileNames)
return;
updateLastImageTimeOffset(shiftDialog.amount());
// Create the data structure of pictures to be added: a list of pictures per dive.
std::vector<Command::PictureListForAddition> pics;
for (const QString &fileName: fileNames) {
struct dive *d;
picture *pic = create_picture(qPrintable(fileName), shiftDialog.amount(), shiftDialog.matchAll(), &d);
if (!pic)
continue;
add_picture(&d->pictures, *pic);
dive_set_geodata_from_picture(d, pic, &dive_site_table);
invalidate_dive_cache(d);
PictureObj pObj(*pic);
free(pic);
auto it = std::find_if(pics.begin(), pics.end(), [d](const Command::PictureListForAddition &l) { return l.d == d; });
if (it == pics.end())
pics.push_back(Command::PictureListForAddition { d, { pObj } });
else
it->pics.push_back(pObj);
}
mark_divelist_changed(true);
copy_dive(current_dive, &displayed_dive);
DivePictureModel::instance()->updateDivePictures();
if (pics.empty())
return;
Command::addPictures(pics);
}
void DiveListView::loadWebImages()