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

Dive media: add media to closest dive

Browse source 
Currently, when selecting "Load media files even if time does not
match the dive time", the media are added to *all* selected dives.
Instead add it to the closest dive.

This seems like the less surprising behavior. Of course now if the
user really wants to add a media file to multiple dives, they will
have to do it manually.

To avoid a messy interface, this is solved by moving the iterate-
over-selected-dives loop to the core. Thus, a helper-function can
be made local to its translation unit.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-12-11 22:30:57 +01:00 • committed by Robert C. Helling
parent 09a9fa1ae5
commit 3cdc2661d2
4 changed files with 57 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/testpicture.cpp
View file

@ -25,13 +25,15 @@ void TestPicture::addPicture()
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test44.xml", &dive_table), 0);
dive = get_dive(0);
// Pictures will be added to selected dives
dive->selected = true;
QVERIFY(dive != NULL);
pic1 = dive->picture_list;
// So far no picture in dive
QVERIFY(pic1 == NULL);
dive_create_picture(dive, SUBSURFACE_TEST_DATA "/dives/images/wreck.jpg", 0, false);
dive_create_picture(dive, SUBSURFACE_TEST_DATA "/dives/images/data_after_EOI.jpg", 0, false);
create_picture(SUBSURFACE_TEST_DATA "/dives/images/wreck.jpg", 0, false);
create_picture(SUBSURFACE_TEST_DATA "/dives/images/data_after_EOI.jpg", 0, false);
pic1 = dive->picture_list;
pic2 = pic1->next;
// Now there are two picture2