From b95a1cae68635f0f41c026c15c21ce5aecff2ed3 Mon Sep 17 00:00:00 2001 From: Rafael Date: Tue, 29 Mar 2016 12:23:21 +0200 Subject: [PATCH] export file name added --- PictureDialog.cpp | 32 ++++++++++++++++++++++++++++++++ PictureDialog.h | 1 + 2 files changed, 33 insertions(+) diff --git a/PictureDialog.cpp b/PictureDialog.cpp index 9e7f5a7..abf54d2 100755 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -46,6 +46,7 @@ PictureDialog::PictureDialog(ProfileDatabase *profileDB, QWidget *parent) : locX = ""; locY = ""; locZ = ""; + smpic = 0; } PictureDialog::~PictureDialog() @@ -56,6 +57,7 @@ PictureDialog::~PictureDialog() void PictureDialog::setSnapmaticPicture(SnapmaticPicture *picture, bool readOk) { // Showing error if reading error + smpic = picture; if (!readOk) { QMessageBox::warning(this, tr("Snapmatic Picture Viewer"), tr("Failed at %1").arg(picture->getLastStep())); @@ -193,6 +195,36 @@ fileDialogPreSave: fileDialog.setSidebarUrls(sidebarUrls); fileDialog.restoreState(settings.value("ExportPicture","").toByteArray()); + if (smpic != 0) + { + QString newPictureFileName; + QString pictureStr = smpic->getPictureStr(); + QStringList pictureStrList = pictureStr.split(" - "); + if (pictureStrList.length() <= 2) + { + QString dtStr = pictureStrList.at(1); + QStringList dtStrList = dtStr.split(" "); + if (dtStrList.length() <= 2) + { + QString dayStr; + QString yearStr; + QString monthStr; + QString dateStr = dtStrList.at(0); + QString timeStr = dtStrList.at(1); + timeStr.replace(":",""); + QStringList dateStrList = dateStr.split("/"); + if (dateStrList.length() <= 3) + { + dayStr = dateStrList.at(1); + yearStr = dateStrList.at(2); + monthStr = dateStrList.at(0); + } + newPictureFileName = yearStr + "-" + monthStr + "-" + dayStr + "_" + timeStr + ".jpg"; + } + } + fileDialog.selectFile(newPictureFileName); + } + if (fileDialog.exec()) { QStringList selectedFiles = fileDialog.selectedFiles(); diff --git a/PictureDialog.h b/PictureDialog.h index 93d728d..16d0af4 100755 --- a/PictureDialog.h +++ b/PictureDialog.h @@ -45,6 +45,7 @@ private slots: private: ProfileDatabase *profileDB; Ui::PictureDialog *ui; + SnapmaticPicture *smpic; QString jsonDrawString; QString windowTitleStr; QStringList plyrsList;