Changeset d97db6d321 in tspsg for src/tspmodel.cpp

Timestamp:

Mar 22, 2011, 9:31:18 PM (13 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

a885c3d9d2

Parents:

d8a3826f87

git-author:

Oleksii Serdiuk <contacts@…> (03/22/11 21:31:18)

git-committer:

Oleksii Serdiuk <contacts@…> (06/29/12 19:45:58)

Message:

• Improved some error messages: now they are more verbose.
• Handheld version now includes larger icons (48x48 instead of 32x32).
• Fixed bug #2: Solution graph is too small on high resolution screens.

File:

• src/tspmodel.cpp (modified) (5 diffs)

src/tspmodel.cpp

@@ -376 +376 @@
         return false;
     else if (status == QDataStream::ReadPastEnd)
-        err = tr("Unexpected end of file.");
+        err = tr("Unexpected end of file. The file could be corrupted.");
     else if (status == QDataStream::ReadCorruptData)
-        err = tr("Corrupt data read. File possibly corrupted.");
+        err = tr("Corrupt data read. The file could be corrupted.");
     else
-        err = tr("Unknown error.");
+        err = tr("Unknown error. The file could be corrupted.");
     QApplication::restoreOverrideCursor();
     QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
@@ -402 +402 @@
         QApplication::restoreOverrideCursor();
         QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
-        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n" + tr("File version is newer than application supports.\nPlease, try to update application."));
+        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
+            + tr("File version (%1) is newer than this version of %3 supports (%2).\n"
+                 "Please, try to update the application. Also, the file might be corrupted.")
+                 .arg(version).arg(TSPT_VERSION).arg(QApplication::applicationName()));
         QApplication::restoreOverrideCursor();
         return false;
@@ -415 +418 @@
     if (loadError(ds->status()))
         return false;
-    if ((size < 3) || (size > MAX_NUM_CITIES)) {
-        QApplication::restoreOverrideCursor();
-        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
-        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n" + tr("Unexpected data read.\nFile is possibly corrupted."));
+    if (size < 3) {
+        QApplication::restoreOverrideCursor();
+        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
+        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
+            + tr("Unexpected data read. The file could be corrupted."));
+        QApplication::restoreOverrideCursor();
+        return false;
+    }
+    if (size > MAX_NUM_CITIES) {
+        QApplication::restoreOverrideCursor();
+        QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
+        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
+            + tr("The task contains more cities (%1) than this version of %3 supports (%2).\n"
+                 "You might be using an old version of the application or the file could be corrupted.")
+                 .arg(size).arg(MAX_NUM_CITIES).arg(QApplication::applicationName()));
         QApplication::restoreOverrideCursor();
         return false;
@@ -458 +472 @@
         QApplication::restoreOverrideCursor();
         QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
-        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n" + tr("File version is newer than application supports.\nPlease, try to update application."));
+        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
+            + tr("File version (%1) is newer than this version of %3 supports (%2).\n"
+                 "Please, try to update the application. Also, the file could be corrupted.")
+                 .arg(version).arg(TSPT_VERSION).arg(QApplication::applicationName()));
         QApplication::restoreOverrideCursor();
         return false;
@@ -470 +487 @@
         QApplication::restoreOverrideCursor();
         QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
-        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n" + tr("Unexpected data read.\nFile is possibly corrupted."));
+        QMessageBox::critical(QApplication::activeWindow(), tr("Task Load"), tr("Unable to load task:") + "\n"
+            + tr("Unexpected data read. The file could be corrupted."));
         QApplication::restoreOverrideCursor();
         return false;