Changeset 50 in tspsg-svn for trunk/src/tspmodel.cpp

Timestamp:

Aug 3, 2009, 5:15:46 PM (15 years ago)

Author:

laleppa

Message:

+ Implemented File/Save? action.
+ Added "Save Solution" and "Back to Task" buttons to Solution tab for better usability.

• Increased maximum number of cities to 20. Solving for 18-20 cities is already takes much time, so I thought it doesn't make sense to increase more.
• Columns and rows are now resized to contents on all platforms.

File:

• trunk/src/tspmodel.cpp (modified) (3 diffs)

trunk/src/tspmodel.cpp

@@ -206 +206 @@
         if (loadError(ds->status()))
                 return false;
-        // Cities number
+        // Number of cities
 quint16 size;
         *ds >> size;
         if (loadError(ds->status()))
                 return false;
-        if (size < 3) {
+        if ((size < 3) || (size > MAX_NUM_CITIES)) {
                 QMessageBox(QMessageBox::Critical,trUtf8("Task Load"),trUtf8("Unable to load task:") + "\n" + trUtf8("Unexpected data read.\nFile is possibly corrupted."),QMessageBox::Ok).exec();
                 return false;
         }
-        if (nCities != size)
+        if (nCities != size) {
+                setNumCities(size);
                 emit numCitiesChanged(size);
-        // Costs
+        }
+        // Travel costs
         for (int r = 0; r < size; r++)
                 for (int c = 0; c < size; c++)
@@ -246 +248 @@
                 return false;
         }
-        // Cities number
+        // Number of cities
 quint8 size;
         ds->readRawData(reinterpret_cast<char *>(&size),1);
@@ -255 +257 @@
                 return false;
         }
-        if (nCities != size)
+        if (nCities != size) {
+                setNumCities(size);
                 emit numCitiesChanged(size);
-        // Costs
+        }
+        // Travel costs
 double val;
         for (int r = 0; r < 5; r++)