Changeset 50 in tspsg-svn for trunk/src/mainwindow.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/mainwindow.cpp (modified) (11 diffs)

trunk/src/mainwindow.cpp

@@ -46 +46 @@
         actionSettingsLanguageEnglish->setActionGroup(groupSettingsLanguageList);
         loadLangList();
-        spinCities->setValue(settings->value("NumCities",5).toInt());
+        spinCities->setMaximum(MAX_NUM_CITIES);
         actionSettingsLanguageAutodetect->setChecked(settings->value("Language","").toString().isEmpty());
         connect(actionFileNew,SIGNAL(triggered()),this,SLOT(actionFileNewTriggered()));
         connect(actionFileOpen,SIGNAL(triggered()),this,SLOT(actionFileOpenTriggered()));
+        connect(actionFileSave,SIGNAL(triggered()),this,SLOT(actionFileSaveTriggered()));
         connect(actionFileSaveAsTask,SIGNAL(triggered()),this,SLOT(actionFileSaveAsTaskTriggered()));
         connect(actionFileSaveAsSolution,SIGNAL(triggered()),this,SLOT(actionFileSaveAsSolutionTriggered()));
@@ -62 +63 @@
         connect(buttonSolve,SIGNAL(clicked()),this,SLOT(buttonSolveClicked()));
         connect(buttonRandom,SIGNAL(clicked()),this,SLOT(buttonRandomClicked()));
+        connect(buttonBackToTask,SIGNAL(clicked()),this,SLOT(buttonBackToTaskClicked()));
         connect(spinCities,SIGNAL(valueChanged(int)),this,SLOT(spinCitiesValueChanged(int)));
+        setCentralWidget(tabWidget);
 QRect rect = geometry();
-        setCentralWidget(tabWidget);
 #ifndef Q_OS_WINCE
         if (settings->value("SavePos",false).toBool()) {
@@ -82 +84 @@
         qsrand(QDateTime().currentDateTime().toTime_t());
         tspmodel = new CTSPModel();
-        tspmodel->setNumCities(spinCities->value());
-        taskView->setModel(tspmodel);
         connect(tspmodel,SIGNAL(numCitiesChanged(int)),this,SLOT(numCitiesChanged(int)));
         connect(tspmodel,SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),this,SLOT(dataChanged()));
         connect(tspmodel,SIGNAL(layoutChanged()),this,SLOT(dataChanged()));
-        if ((QCoreApplication::arguments().count() > 1) && (tspmodel->loadTask(QCoreApplication::arguments().at(1)))) {
+        if ((QCoreApplication::arguments().count() > 1) && (tspmodel->loadTask(QCoreApplication::arguments().at(1))))
                 setFileName(QCoreApplication::arguments().at(1));
-                setWindowModified(false);
-        } else
+        else {
                 setFileName();
-#ifdef Q_OS_WINCE
+                spinCities->setValue(settings->value("NumCities",DEF_NUM_CITIES).toInt());
+        }
+        taskView->setModel(tspmodel);
+        setWindowModified(false);
         taskView->resizeColumnsToContents();
         taskView->resizeRowsToContents();
-#endif // Q_OS_WINCE
 }
 
 void MainWindow::enableSolutionActions(bool enable)
 {
+        buttonSaveSolution->setEnabled(enable);
         actionFileSaveAsSolution->setEnabled(enable);
         solutionText->setEnabled(enable);
@@ -173 +175 @@
 void MainWindow::spinCitiesValueChanged(int n)
 {
-#ifdef Q_OS_WINCE
 int count = tspmodel->numCities();
-#endif // Q_OS_WINCE
         tspmodel->setNumCities(n);
-#ifdef Q_OS_WINCE
         if (n > count)
                 for (int k = count; k < n; k++) {
@@ -183 +182 @@
                         taskView->resizeRowToContents(k);
                 }
-#endif // Q_OS_WINCE
 }
 
@@ -204 +202 @@
                 return;
         tspmodel->clear();
-#ifdef Q_OS_WINCE
         taskView->resizeColumnsToContents();
         taskView->resizeRowsToContents();
-#endif
         setFileName();
         setWindowModified(false);
@@ -238 +234 @@
         }
         setFileName(files.first());
-#ifdef Q_OS_WINCE
         taskView->resizeColumnsToContents();
         taskView->resizeRowsToContents();
-#endif
         tabWidget->setCurrentIndex(0);
         setWindowModified(false);
@@ -247 +241 @@
         enableSolutionActions(false);
         QApplication::restoreOverrideCursor();
+}
+
+void MainWindow::actionFileSaveTriggered()
+{
+        if ((fileName == trUtf8("Untitled") + ".tspt") || (!fileName.endsWith(".tspt",Qt::CaseInsensitive)))
+                saveTask();
+        else {
+                QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+                if (tspmodel->saveTask(fileName))
+                        setWindowModified(false);
+                QApplication::restoreOverrideCursor();
+        }
 }
 
@@ -350 +356 @@
         tspmodel->randomize();
         setWindowModified(true);
-#ifdef Q_OS_WINCE
         taskView->resizeColumnsToContents();
         taskView->resizeRowsToContents();
-#endif // Q_OS_WINCE
+}
+
+void MainWindow::buttonBackToTaskClicked()
+{
+        tabWidget->setCurrentIndex(0);
 }
 
@@ -395 +404 @@
         }
 CTSPSolver solver;
-sStep *root = solver.solve(spinCities->value(),matrix);
+sStep *root = solver.solve(n,matrix,this);
         if (!root)
                 return;
@@ -542 +551 @@
 void MainWindow::numCitiesChanged(int nCities)
 {
+        blockSignals(true);
         spinCities->setValue(nCities);
-}
+        blockSignals(false);
+}