From 93f023b89e4ed3aa66159ef794f0a7c49e4f0b6e Mon Sep 17 00:00:00 2001 From: Rafael Date: Mon, 21 Mar 2016 22:14:32 +0100 Subject: [PATCH] open error msg added --- PictureDialog.cpp | 40 ++++++++++++++++++++++++---------------- PictureDialog.h | 2 +- main.cpp | 4 ++-- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/PictureDialog.cpp b/PictureDialog.cpp index 93a5b47..d673b64 100755 --- a/PictureDialog.cpp +++ b/PictureDialog.cpp @@ -20,6 +20,7 @@ #include "ui_PictureDialog.h" #include +#include #include #include #include @@ -39,25 +40,32 @@ PictureDialog::~PictureDialog() delete ui; } -void PictureDialog::setSnapmaticPicture(SnapmaticPicture *picture) +void PictureDialog::setSnapmaticPicture(SnapmaticPicture *picture, bool readOk) { - QString locX = QString::number(picture->getLocationX()); - QString locY = QString::number(picture->getLocationY()); - QString locZ = QString::number(picture->getLocationZ()); - QString crewID = QString::number(picture->getCrewNumber()); - QStringList plyrsList = picture->getPlayers(); - - QString plyrsStr; - foreach (const QString &player, plyrsList) + if (readOk) { - plyrsStr.append(", "); - plyrsStr.append(player); - } - if (plyrsStr.length() >= 1) { plyrsStr.remove(0,2); } + QString locX = QString::number(picture->getLocationX()); + QString locY = QString::number(picture->getLocationY()); + QString locZ = QString::number(picture->getLocationZ()); + QString crewID = QString::number(picture->getCrewNumber()); + QStringList plyrsList = picture->getPlayers(); - this->setWindowTitle(windowTitleStr.arg(picture->getPictureStr())); - ui->labJSON->setText(jsonDrawString.arg(locX, locY, locZ, plyrsStr, crewID)); - ui->labPicture->setPixmap(picture->getPixmap()); + QString plyrsStr; + foreach (const QString &player, plyrsList) + { + plyrsStr.append(", "); + plyrsStr.append(player); + } + if (plyrsStr.length() >= 1) { plyrsStr.remove(0,2); } + + this->setWindowTitle(windowTitleStr.arg(picture->getPictureStr())); + ui->labJSON->setText(jsonDrawString.arg(locX, locY, locZ, plyrsStr, crewID)); + ui->labPicture->setPixmap(picture->getPixmap()); + } + else + { + QMessageBox::warning(this,tr("Snapmatic Picture Viewer"),tr("Failed at %1").arg(picture->getLastStep())); + } } void PictureDialog::on_cmdClose_clicked() diff --git a/PictureDialog.h b/PictureDialog.h index ebdccf4..df2b2b4 100755 --- a/PictureDialog.h +++ b/PictureDialog.h @@ -31,7 +31,7 @@ class PictureDialog : public QDialog Q_OBJECT public: explicit PictureDialog(QWidget *parent = 0); - void setSnapmaticPicture(SnapmaticPicture *picture); + void setSnapmaticPicture(SnapmaticPicture *picture, bool readOk); ~PictureDialog(); private slots: diff --git a/main.cpp b/main.cpp index 05b4ff9..ddbbe7b 100755 --- a/main.cpp +++ b/main.cpp @@ -46,9 +46,9 @@ int main(int argc, char *argv[]) { PictureDialog picDialog; SnapmaticPicture picture; - picture.readingPictureFromFile(arg1); + bool readOk = picture.readingPictureFromFile(arg1); picDialog.setWindowFlags(picDialog.windowFlags()^Qt::WindowContextHelpButtonHint); - picDialog.setSnapmaticPicture(&picture); + picDialog.setSnapmaticPicture(&picture, readOk); picDialog.show(); return a.exec();