Changeset 12 in tspsg-svn

Timestamp:

Oct 20, 2007, 9:16:42 PM (17 years ago)

Author:

laleppa

Message:

Started writing solving algorithm

Location:

trunk

Files:

• src/mainwindow.cpp (modified) (3 diffs)
• src/mainwindow.h (modified) (1 diff)
• src/settingsdialog.h (modified) (1 diff)
• src/tspsolver.cpp (added)
• src/tspsolver.h (added)
• tspsg.pro (modified) (2 diffs)

trunk/src/mainwindow.cpp

@@ -25 +25 @@
 #include "mainwindow.h"
 
-// TODO: Saving window state on close.
+// TODO: Saving window state on close
 
 MainWindow::MainWindow(QWidget *parent)
@@ -83 +83 @@
 //              tableTask->setColumnWidth(k,tableTask->viewport()->width() / n);
         // If number of cities increased we need to reset headers and set
-        // appropriate sizes for new column and row.
+        // appropriate sizes for new column and row
         if (increased) {
 QTableWidgetItem *item = new QTableWidgetItem(trUtf8("Город ") + QVariant(n).toString());
@@ -130 +130 @@
 void MainWindow::Solve()
 {
-        tabWidget->setCurrentIndex(1);
+        // tabWidget->setCurrentIndex(1);
+CTSPSolver solver;
+        solver.solve(spinCities->value(),NULL);
         // TODO: Task solving goes here :-)
 }

trunk/src/mainwindow.h

@@ -28 +28 @@
 #include "ui_mainwindow.h"
 #include "settingsdialog.h"
+#include "tspsolver.h"
 
 class MainWindow: public QMainWindow, Ui::MainWindow

trunk/src/settingsdialog.h

@@ -41 +41 @@
 };
 
-#endif //  SETTINGSDIALOG_H
+#endif // SETTINGSDIALOG_H
 

trunk/tspsg.pro

@@ -1 +1 @@
 ######################################################################
-# Automatically generated by qmake (2.01a) ?? 13. ??? 03:18:10 2007
+# Automatically generated by qmake (2.01a) ?? 20. ??? 18:37:06 2007
 ######################################################################
 
@@ -9 +9 @@
 
 # Input
-HEADERS += src/mainwindow.h src/settingsdialog.h
+HEADERS += src/mainwindow.h src/settingsdialog.h src/tspsolver.h
 FORMS += ui/mainwindow.ui ui/settingsdialog.ui
-SOURCES += src/main.cpp src/mainwindow.cpp src/settingsdialog.cpp
+SOURCES += src/main.cpp \
+           src/mainwindow.cpp \
+           src/settingsdialog.cpp \
+           src/tspsolver.cpp
 RESOURCES += resources/tspsg.qrc
 TRANSLATIONS += i18n/English.ts i18n/Ukrainian.ts