Changeset 15 in tspsg-svn for trunk

Timestamp:

Nov 5, 2007, 1:32:40 AM (17 years ago)

Author:

laleppa

Message:

Finished converting to Qt's model/view architecture

Location:

trunk

Files:

• src/mainwindow.cpp (modified) (3 diffs)
• src/mainwindow.h (modified) (2 diffs)
• src/tspmodel.cpp (modified) (7 diffs)
• src/tspmodel.h (modified) (3 diffs)
• src/tspsolver.cpp (modified) (2 diffs)
• src/tspsolver.h (modified) (1 diff)
• ui/mainwindow.ui (modified) (2 diffs)

trunk/src/mainwindow.cpp

@@ -38 +38 @@
         // TODO: Loading of saved window state
 QRect rect = geometry();
-    rect.moveCenter(QApplication::desktop()->screenGeometry(QApplication::desktop()->primaryScreen()).center());
+        rect.moveCenter(QApplication::desktop()->screenGeometry(QApplication::desktop()->primaryScreen()).center());
         setGeometry(rect);
         qsrand(QDateTime().currentDateTime().toTime_t());
-        PrepareTable();
-}
-
-int MainWindow::rand(int min, int max)
-{
-        return min + (int)(((float)qrand() / RAND_MAX) * max);
-}
-
-void MainWindow::PrepareTable()
-{
-QTableWidgetItem *item;
-        for (int y = 0; y < spinCities->value(); y++) {
-                item = new QTableWidgetItem(trUtf8("Город ") + QVariant(y + 1).toString());
-                tableTask->setVerticalHeaderItem(y,item);
-                item = new QTableWidgetItem(trUtf8("Город ") + QVariant(y + 1).toString());
-                tableTask->setHorizontalHeaderItem(y,item);
-                for (int x = 0; x < spinCities->value(); x++) {
-                        if (y == x) {
-                                item = new QTableWidgetItem("...");
-                                item->setFlags(item->flags() ^ Qt::ItemIsEditable);
-                        } else {
-                                item = new QTableWidgetItem(QVariant(rand(randMin,randMax)).toString());
-QFont font = item->font();
-                                font.setBold(true);
-                                item->setFont(font);
-                        }
-                        item->setTextAlignment(Qt::AlignCenter);
-                        tableTask->setItem(x,y,item);
-                }
-        }
-        tableTask->resizeRowsToContents();
-        tableTask->resizeColumnsToContents();
+        tspmodel = new CTSPModel();
+        tspmodel->randMin = randMin;
+        tspmodel->randMax = randMax;
+        tspmodel->setNumCities(spinCities->value());
+        taskView->setModel(tspmodel);
 }
 
 void MainWindow::CitiesNumberChanged(int n)
 {
-bool increased = tableTask->rowCount() < n ? true : false;
-        tableTask->setRowCount(n);
-        tableTask->setColumnCount(n);
-        for (int k = 0; k < n; k++)
-//              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
-        if (increased) {
-QTableWidgetItem *item = new QTableWidgetItem(trUtf8("Город ") + QVariant(n).toString());
-                tableTask->setVerticalHeaderItem(n - 1,item);
-                item = new QTableWidgetItem(trUtf8("Город ") + QVariant(n).toString());
-                tableTask->setHorizontalHeaderItem(n - 1,item);
-                tableTask->resizeRowToContents(n - 1);
-                tableTask->resizeColumnToContents(n - 1);
-                item = new QTableWidgetItem("...");
-                item->setFlags(item->flags() ^ Qt::ItemIsEditable);
-                tableTask->setItem(spinCities->value() - 1,spinCities->value() - 1,item);
-                for (int k = 0; k < spinCities->value() - 1; k++) {
-                        item = new QTableWidgetItem(QVariant(rand(randMin, randMax)).toString());
-QFont font = item->font();
-                        font.setBold(true);
-                        item->setFont(font);
-                        tableTask->setItem(k,spinCities->value() - 1,item);
-                        item = new QTableWidgetItem(QVariant(rand(randMin, randMax)).toString());
-                        font = item->font();
-                        font.setBold(true);
-                        item->setFont(font);
-                        tableTask->setItem(spinCities->value() - 1,k,item);
-                }
-        }
+        tspmodel->setNumCities(n);
 }
 
@@ -122 +66 @@
 void MainWindow::Random()
 {
-        for (int y = 0; y < spinCities->value(); y++)
-                for (int x = 0; x < spinCities->value(); x++)
-                        if (x != y)
-                                tableTask->item(x,y)->setText(QVariant(rand(randMin, randMax)).toString());
+        tspmodel->randomize();
 }
 
@@ -133 +74 @@
 tMatrix matrix;
 double *row;
+int n = spinCities->value();
 bool ok;
-        for (int x = 0; x < spinCities->value(); x++) {
-                row = new double[spinCities->value()];
-                for (int y = 0; y < spinCities->value(); y++) {
-                        if (x == y)
-                                row[y] = infinity;
-                        else {
-                                row[y] = tableTask->item(x,y)->text().toDouble(&ok);
-                                if (!ok) {
-                                        QMessageBox(QMessageBox::Critical,trUtf8("Ошибка в данных"),QString(trUtf8("Ошибка в ячейке [Строка %1; Колонка %2]: Неверный формат данных.")).arg(x + 1).arg(y + 1),QMessageBox::Ok,this).exec();
-                                        return;
-                                } else if (row[y] < 0) {
-                                        QMessageBox(QMessageBox::Critical,trUtf8("Ошибка в данных"),QString(trUtf8("Ошибка в ячейке [Строка %1; Колонка %2]: Значение не может быть меньше нуля.")).arg(x + 1).arg(y + 1),QMessageBox::Ok,this).exec();
-                                        return;
-                                }
+        for (int r = 0; r < n; r++) {
+                row = new double[n];
+                for (int c = 0; c < n; c++) {
+                        row[c] = tspmodel->index(r,c).data(Qt::UserRole).toDouble(&ok);
+                        if (!ok) {
+                                QMessageBox(QMessageBox::Critical,trUtf8("Ошибка в данных"),QString(trUtf8("Ошибка в ячейке [Строка %1; Колонка %2]: Неверный формат данных.")).arg(r + 1).arg(c + 1),QMessageBox::Ok,this).exec();
+                                return;
                         }
                 }

trunk/src/mainwindow.h

@@ -29 +29 @@
 #include "settingsdialog.h"
 #include "tspsolver.h"
+#include "tspmodel.h"
 
 class MainWindow: public QMainWindow, Ui::MainWindow
@@ -41 +42 @@
         void CitiesNumberChanged(int n);
 private:
-        void PrepareTable();
-        int rand(int, int);
+        CTSPModel *tspmodel;
         int randMin;
         int randMax;

trunk/src/tspmodel.cpp

@@ -1 +1 @@
 /*
  *  TSPSG - TSP Solver and Generator
- *  Copyright (C) 2007 L¸ppa <lacontacts[at]gmail[dot]com>
+ *  Copyright (C) 2007 Lёppa <lacontacts[at]gmail[dot]com>
  *
  *  $Id$
@@ -26 +26 @@
 
 CTSPModel::CTSPModel(QObject *parent)
-        : QAbstractTableModel(parent), randMin(1), randMax(10)
+        : QAbstractTableModel(parent), randMin(1), randMax(10), nCities(0)
 {
 }
@@ -48 +48 @@
 {
         if (role == Qt::DisplayRole)
-                return trUtf8("Ãîðîä %1").arg(section + 1);
+                return trUtf8("Город %1").arg(section + 1);
         return QVariant();
 }
@@ -58 +58 @@
         if (role == Qt::TextAlignmentRole)
                 return int(Qt::AlignCenter);
-        else if (role == Qt::DisplayRole) {
-                if (index.row() == index.column())
-                        return trUtf8("---");
+        else if (role == Qt::FontRole) {
+QFont font;
+                font.setBold(true);
+                return font;
+        } else if (role == Qt::DisplayRole || role == Qt::EditRole) {
                 if (index.row() < nCities && index.column() < nCities)
-                        return table.at(index.row())->at(index.column());
+                        if (table[index.row()][index.column()] == INFINITY)
+                                return trUtf8(INFSTR);
+                        else
+                                // HACK: Converting to string to prevent spinbox in edit mode
+                                return QVariant(table[index.row()][index.column()]).toString();
                 else
                         return QVariant();
-        }
+        } else if (role == Qt::UserRole)
+                return table[index.row()][index.column()];
         return QVariant();
 }
@@ -71 +78 @@
 bool CTSPModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-        return true;
+        if (!index.isValid())
+                return false;
+        if (role == Qt::EditRole && index.row() != index.column()) {
+                if (value.toString().compare(INFSTR) == 0)
+                        table[index.row()][index.column()] = INFINITY;
+                else {
+bool ok;
+double tmp = value.toDouble(&ok);
+                        if (!ok || tmp < 0)
+                                return false;
+                        else
+                                table[index.row()][index.column()] = tmp;
+                }
+                emit dataChanged(index,index);
+                return true;
+        }
+        return false;
 }
 
@@ -77 +100 @@
 {
 Qt::ItemFlags flags = QAbstractItemModel::flags(index);
-        if (index.row() == index.column())
+        if (index.row() != index.column())
                 flags |= Qt::ItemIsEditable;
         return flags;
@@ -89 +112 @@
 void CTSPModel::setNumCities(int n)
 {
+        if (n == nCities)
+                return;
+        emit layoutAboutToBeChanged();
         if (n > nCities) {
-                foreach(QList<double> *row,table) {
-                        for (int k = nCities; k < n; k++)
-                                row->append(rand(randMin,randMax));
+                for (int r = 0; r < nCities; r++) {
+                        for (int c = nCities; c < n; c++)
+                                if (r == c)
+                                        table[r][c] = INFINITY;
+                                else
+                                        table[r][c] = rand(randMin,randMax);
                 }
-                for (int k = nCities; k < n; k++) {
-QList<double> *row = new QList<double>[n];
-                        foreach(double cell,*row)
-                                cell = rand(randMin,randMax);
-                        table.append(row);
+                for (int r = nCities; r < n; r++) {
+                        for (int c = 0; c < n; c++)
+                                if (r == c)
+                                        table[r][c] = INFINITY;
+                                else
+                                        table[r][c] = rand(randMin,randMax);
                 }
-        } else if (n < nCities) {
-                // TODO: Shrinking table
         }
         nCities = n;
+        emit layoutChanged();
 }
 
+void CTSPModel::randomize()
+{
+        for (int r = 0; r < nCities; r++)
+                for (int c = 0; c < nCities; c++)
+                        if (r != c)
+                                table[r][c] = rand(randMin,randMax);
+        emit dataChanged(index(0,0),index(nCities - 1,nCities - 1));
+}
+

trunk/src/tspmodel.h

@@ -1 +1 @@
 /*
  *  TSPSG - TSP Solver and Generator
- *  Copyright (C) 2007 L¸ppa <lacontacts[at]gmail[dot]com>
+ *  Copyright (C) 2007 Lёppa <lacontacts[at]gmail[dot]com>
  *
  *  $Id$
@@ -25 +25 @@
 #define TSPMODEL_H
 
+// Decided, that static array with 100 of cities maximum hard limit
+// will be enough for most cases, but the code will be simplier than
+// when using dynamic lists. If you need more, just change this value
+// and recompile the program ;-)
+#define MAX_CITIES 100
+// This value means infinity :-)
+#define INFINITY 1.7E+308
+// This is string, which represents infinite value in table
+#define INFSTR "---"
+
 #include <QAbstractTableModel>
 
@@ -40 +50 @@
         int numCities() const;
         void setNumCities(int);
+        void randomize();
         int randMin;
         int randMax;
 private:
-        QList<QList<double> *> table;
+        double table[MAX_CITIES][MAX_CITIES];
         int nCities;
         int rand(int, int);

trunk/src/tspsolver.cpp

@@ -23 +23 @@
 
 #include "tspsolver.h"
+#include "tspmodel.h"
 
 CTSPSolver::CTSPSolver()
@@ -30 +31 @@
 double CTSPSolver::findMinInRow(int nRow, tMatrix matrix)
 {
-double min = infinity;
+double min = INFINITY;
         for (int k = 0; k < nCities; k++)
                 if (min > matrix[nRow][k])
                         min = matrix[nRow][k];
-        return min == infinity ? 0 : min;
+        return min == INFINITY ? 0 : min;
 }
 
 double CTSPSolver::findMinInCol(int nCol, tMatrix matrix)
 {
-double min = infinity;
+double min = INFINITY;
         for (int k = 0; k < nCities; k++)
                 if (min > matrix[k][nCol])
                         min = matrix[k][nCol];
-        return min == infinity ? 0 : min;
+        return min == INFINITY ? 0 : min;
 }
 

trunk/src/tspsolver.h

@@ -27 +27 @@
 #include <QtCore>
 
-const double infinity = 1.7E+308;
-
 typedef QList<double *> tMatrix;
 
-// Structure represent one step of solving
+// This structure represents one step of solving
 // The tree of such elements will represent the solving process
 struct sStep {

trunk/ui/mainwindow.ui

@@ -117 +117 @@
         </item>
         <item>
-         <widget class="QTableWidget" name="tableTask" >
+         <widget class="QTableView" name="taskView" >
           <property name="statusTip" >
            <string>Стоимости переходов/переездов из города в город</string>
@@ -124 +124 @@
            <enum>QAbstractItemView::NoSelection</enum>
           </property>
-          <property name="rowCount" >
-           <number>5</number>
-          </property>
-          <property name="columnCount" >
-           <number>5</number>
-          </property>
-          <row/>
-          <row/>
-          <row/>
-          <row/>
-          <row/>
-          <column/>
-          <column/>
-          <column/>
-          <column/>
-          <column/>
          </widget>
         </item>