diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-12-11 22:30:57 +0100 |
|---|---|---|
| committer |  Robert C. Helling <helling@atdotde.de> | 2018-12-13 08:11:22 +0100 |
| commit | 3cdc2661d2a2417e557042abe1a0d9e5107822eb (patch) | |
| tree | 1862bc03bac773087093663e76372b72fc08603f /tests | |
| parent | 09a9fa1ae51bbca3246fb256f5acc2ace0b2b148 (diff) | |
| download | subsurface-3cdc2661d2a2417e557042abe1a0d9e5107822eb.tar.gz | |
Dive media: add media to closest dive
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testpicture.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/testpicture.cpp b/tests/testpicture.cpp index 695c965b0..a84925c72 100644 --- a/tests/testpicture.cpp +++ b/tests/testpicture.cpp @@ -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 |