mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Refactored image timestamp checking.
Seperated getting image timestamp from picture_load_exif_data() and ShiftImageTimesDialog::syncCameraClicked() into picture_get_timestamp() and seperated checking timestamp from dive_create_picture() to dive_check_picture_time(). Signed-off-by: Jan Darowski <jan.darowski@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
838b450066
commit
7d37a3f5a6
4 changed files with 60 additions and 22 deletions
|
@ -272,9 +272,7 @@ void ShiftImageTimesDialog::buttonClicked(QAbstractButton *button)
|
|||
|
||||
void ShiftImageTimesDialog::syncCameraClicked()
|
||||
{
|
||||
struct memblock mem;
|
||||
EXIFInfo exiv;
|
||||
int retval;
|
||||
timestamp_t timestamp;
|
||||
QPixmap picture;
|
||||
QDateTime dcDateTime = QDateTime();
|
||||
QStringList fileNames = QFileDialog::getOpenFileNames(this,
|
||||
|
@ -290,13 +288,9 @@ void ShiftImageTimesDialog::syncCameraClicked()
|
|||
|
||||
scene->addPixmap(picture.scaled(ui.DCImage->size()));
|
||||
ui.DCImage->setScene(scene);
|
||||
if (readfile(fileNames.at(0).toUtf8().data(), &mem) <= 0)
|
||||
return;
|
||||
retval = exiv.parseFrom((const unsigned char *)mem.buffer, (unsigned)mem.size);
|
||||
free(mem.buffer);
|
||||
if (retval != PARSE_EXIF_SUCCESS)
|
||||
return;
|
||||
dcImageEpoch = exiv.epoch();
|
||||
|
||||
picture_get_timestamp(fileNames.at(0).toUtf8().data(), ×tamp);
|
||||
dcImageEpoch = timestamp;
|
||||
dcDateTime.setTime_t(dcImageEpoch);
|
||||
ui.dcTime->setDateTime(dcDateTime);
|
||||
connect(ui.dcTime, SIGNAL(dateTimeChanged(const QDateTime &)), this, SLOT(dcDateTimeChanged(const QDateTime &)));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue