From efe1727170e55dd3553c37b1d70d1a267c160be6 Mon Sep 17 00:00:00 2001
From: Rafael <Syping@users.noreply.github.com>
Date: Mon, 21 Mar 2016 22:40:03 +0100
Subject: [PATCH] added json error msgs

---
 PictureDialog.cpp | 31 +++++++++++++++++++++++++------
 main.cpp          |  1 +
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/PictureDialog.cpp b/PictureDialog.cpp
index d673b64..c15abb0 100755
--- a/PictureDialog.cpp
+++ b/PictureDialog.cpp
@@ -42,7 +42,17 @@ PictureDialog::~PictureDialog()
 
 void PictureDialog::setSnapmaticPicture(SnapmaticPicture *picture, bool readOk)
 {
-    if (readOk)
+    // Showing error if reading error
+    if (!readOk)
+    {
+        QMessageBox::warning(this,tr("Snapmatic Picture Viewer"),tr("Failed at %1").arg(picture->getLastStep())); return;
+    }
+
+    if (picture->isPicOk())
+    {
+        ui->labPicture->setPixmap(picture->getPixmap());
+    }
+    if (picture->isJsonOk())
     {
         QString locX = QString::number(picture->getLocationX());
         QString locY = QString::number(picture->getLocationY());
@@ -51,19 +61,28 @@ void PictureDialog::setSnapmaticPicture(SnapmaticPicture *picture, bool readOk)
         QStringList plyrsList = picture->getPlayers();
 
         QString plyrsStr;
-        foreach (const QString &player, plyrsList)
+        if (plyrsList.length() >= 1)
         {
-            plyrsStr.append(", ");
-            plyrsStr.append(player);
+            foreach (const QString &player, plyrsList)
+            {
+                plyrsStr.append(", ");
+                plyrsStr.append(player);
+            }
+            plyrsStr.remove(0,2);
         }
-        if (plyrsStr.length() >= 1) { plyrsStr.remove(0,2); }
+        else
+        {
+            plyrsStr = tr("No player");
+        }
+
+        if (crewID == "") { crewID = tr("No crew"); }
 
         this->setWindowTitle(windowTitleStr.arg(picture->getPictureStr()));
         ui->labJSON->setText(jsonDrawString.arg(locX, locY, locZ, plyrsStr, crewID));
-        ui->labPicture->setPixmap(picture->getPixmap());
     }
     else
     {
+        ui->labJSON->setText(jsonDrawString.arg("0.0", "0.0", "0.0", tr("No player"), tr("No crew")));
         QMessageBox::warning(this,tr("Snapmatic Picture Viewer"),tr("Failed at %1").arg(picture->getLastStep()));
     }
 }
diff --git a/main.cpp b/main.cpp
index cf654c8..5232f9d 100755
--- a/main.cpp
+++ b/main.cpp
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
         bool readOk = picture.readingPictureFromFile(arg1);
         picDialog.setWindowFlags(picDialog.windowFlags()^Qt::WindowContextHelpButtonHint);
         picDialog.setSnapmaticPicture(&picture, readOk);
+        if (!readOk) { return 1; }
         picDialog.show();
 
         return a.exec();