mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-27 20:58:47 +00:00
9c253ee6c5
The parser API was very annoying, as a number of tables to-be-filled were passed in as pointers. The goal of this commit is to collect all these tables in a single struct. This should make it (more or less) clear what is actually written into the divelog files. Moreover, it should now be rather easy to search for instances, where the global logfile is accessed (and it turns out that there are many!). The divelog struct does not contain the tables as substructs, but only collects pointers. The idea is that the "divelog.h" file can be included without all the other files describing the numerous tables. To make it easier to use from C++ parts of the code, the struct implements a constructor and a destructor. Sadly, we can't use smart pointers, since the pointers are accessed from C code. Therfore the constructor and destructor are quite complex. The whole commit is large, but was mostly an automatic conversion. One oddity of note: the divelog structure also contains the "autogroup" flag, since that is saved in the divelog. This actually fixes a bug: Before, when importing dives from a different log, the autogroup flag was overwritten. This was probably not intended and does not happen anymore. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
68 lines
2.1 KiB
C++
68 lines
2.1 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include "testpicture.h"
|
|
#include "core/device.h"
|
|
#include "core/dive.h"
|
|
#include "core/divelog.h"
|
|
#include "core/errorhelper.h"
|
|
#include "core/picture.h"
|
|
#include "core/file.h"
|
|
#include "core/pref.h"
|
|
#include <QString>
|
|
#include <core/qthelper.h>
|
|
|
|
void TestPicture::initTestCase()
|
|
{
|
|
/* we need to manually tell that the resource exists, because we are using it as library. */
|
|
Q_INIT_RESOURCE(subsurface);
|
|
prefs.cloud_base_url = strdup(default_prefs.cloud_base_url);
|
|
}
|
|
|
|
#define PIC1_NAME "/dives/images/wreck.jpg"
|
|
#define PIC2_NAME "/dives/images/data_after_EOI.jpg"
|
|
#define PIC1_HASH "929ad9499b7ae7a9e39ef63eb6c239604ac2adfa"
|
|
#define PIC2_HASH "fa8bd48f8f24017a81e1204f52300bd98b43d4a7"
|
|
|
|
void TestPicture::addPicture()
|
|
{
|
|
struct dive *dive, *dive1, *dive2;
|
|
struct picture *pic1, *pic2;
|
|
verbose = 1;
|
|
|
|
QCOMPARE(parse_file(SUBSURFACE_TEST_DATA "/dives/test44.xml", &divelog), 0);
|
|
dive = get_dive(0);
|
|
// Pictures will be added to selected dives
|
|
dive->selected = true;
|
|
QVERIFY(dive != NULL);
|
|
// So far no picture in dive
|
|
QVERIFY(dive->pictures.nr == 0);
|
|
|
|
pic1 = create_picture(SUBSURFACE_TEST_DATA "/dives/images/wreck.jpg", 0, false, &dive1);
|
|
pic2 = create_picture(SUBSURFACE_TEST_DATA "/dives/images/data_after_EOI.jpg", 0, false, &dive2);
|
|
QVERIFY(pic1 != NULL);
|
|
QVERIFY(pic2 != NULL);
|
|
QVERIFY(dive1 == dive);
|
|
QVERIFY(dive2 == dive);
|
|
|
|
add_picture(&dive->pictures, *pic1);
|
|
add_picture(&dive->pictures, *pic2);
|
|
free(pic1);
|
|
free(pic2);
|
|
|
|
// Now there are two pictures
|
|
QVERIFY(dive->pictures.nr == 2);
|
|
pic1 = &dive->pictures.pictures[0];
|
|
pic2 = &dive->pictures.pictures[1];
|
|
// 1st appearing at time 21:01
|
|
// 2nd appearing at time 22:01
|
|
QVERIFY(pic1->offset.seconds == 1261);
|
|
QVERIFY(pic1->location.lat.udeg == 47934500);
|
|
QVERIFY(pic1->location.lon.udeg == 11334500);
|
|
QVERIFY(pic2->offset.seconds == 1321);
|
|
|
|
learnPictureFilename(pic1->filename, PIC1_NAME);
|
|
learnPictureFilename(pic2->filename, PIC2_NAME);
|
|
QCOMPARE(localFilePath(pic1->filename), QString(PIC1_NAME));
|
|
QCOMPARE(localFilePath(pic2->filename), QString(PIC2_NAME));
|
|
}
|
|
|
|
QTEST_GUILESS_MAIN(TestPicture)
|