Changeset 31 in tspsg-svn for trunk/src

Timestamp:

Jun 30, 2009, 1:02:31 AM (15 years ago)

Author:

laleppa

Message:

+ Opening task file
+ Saving task file

• Translations update to reflect recent changes.

Location:

trunk/src

Files:

• globals.h (moved) (moved from trunk/src/defines.h) (3 diffs)
• main.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (6 diffs)
• mainwindow.h (modified) (3 diffs)
• os.h (added)
• settingsdialog.cpp (modified) (1 diff)
• settingsdialog.h (modified) (1 diff)
• tspmodel.cpp (modified) (6 diffs)
• tspmodel.h (modified) (2 diffs)
• tspsolver.h (modified) (1 diff)

trunk/src/globals.h

@@ -22 +22 @@
  */
 
-#ifndef DEFINES_H
-#define DEFINES_H
+#ifndef GLOBALS_H
+#define GLOBALS_H
 
+// INCLUDES
+#include <QtCore>
+#include <QtGui>
+
+// OS detection
+#include "os.h"
+
+// DEFINES
 // Default values
 #define DEF_RAND_MIN 1
@@ -32 +40 @@
 #define DEF_FONT_SIZE 12
 #define DEF_FONT_COLOR Qt::black
+
+// TSPSG Task file signature - letters TSPT
+#define TSPT quint32(0x54535054)
+// TSPSG Task file version
+#define TSPT_VERSION quint8(1)
+// TSPSG Task file metadata version
+#define TSPT_META_VERSION quint8(1)
+// TSPSG Task file metadata size in bytes (incl. version)
+#define TSPT_META_SIZE 2
+// ZKomModRd Task file signature - letters ZK
+#define ZKT quint16(0x5A4B)
+// ZKomModRd Task file version
+#define ZKT_VERSION quint8(1)
 
 // Decided, that static array with 100 of cities maximum hard limit
@@ -45 +66 @@
 #define INFSTR "-----"
 
-#endif // DEFINES_H
+#endif // GLOBALS_H

trunk/src/main.cpp

@@ -22 +22 @@
  */
 
-#include <QApplication>
-#include <QTranslator>
-#include <QMessageBox>
 #include "mainwindow.h"
 

trunk/src/mainwindow.cpp

@@ -22 +22 @@
  */
 
-#include <QtGui>
-#ifndef Q_OS_WINCE
-        #include <QPrintDialog>
-#endif // Q_OS_WINCE
 #include "mainwindow.h"
 
@@ -44 +40 @@
         actionSettingsLanguageAutodetect->setChecked(settings->value("Language","").toString().isEmpty());
         connect(actionFileNew,SIGNAL(triggered()),this,SLOT(actionFileNewTriggered()));
+        connect(actionFileOpen,SIGNAL(triggered()),this,SLOT(actionFileOpenTriggered()));
+        connect(actionFileSaveTask,SIGNAL(triggered()),this,SLOT(actionFileSaveTaskTriggered()));
         connect(actionSettingsPreferences,SIGNAL(triggered()),this,SLOT(actionSettingsPreferencesTriggered()));
         connect(actionSettingsLanguageAutodetect,SIGNAL(triggered(bool)),this,SLOT(actionSettingsLanguageAutodetectTriggered(bool)));
@@ -79 +77 @@
         tspmodel->setNumCities(spinCities->value());
         taskView->setModel(tspmodel);
+        connect(tspmodel,SIGNAL(numCitiesChanged(int)),this,SLOT(numCitiesChanged(int)));
 #ifdef Q_OS_WINCE
         taskView->resizeColumnsToContents();
@@ -153 +152 @@
 }
 
+void MainWindow::actionFileOpenTriggered()
+{
+QFileDialog od(this);
+        od.setAcceptMode(QFileDialog::AcceptOpen);
+        od.setFileMode(QFileDialog::ExistingFile);
+QStringList filters(trUtf8("All Supported Formats") + " (*.tspt *.zkt)");
+        filters.append(QString(trUtf8("%1 Task Files")).arg("TSPSG") + " (*.tspt)");
+        filters.append(QString(trUtf8("%1 Task Files")).arg("ZKomModRd") + " (*.zkt)");
+        filters.append(trUtf8("All Files") + " (*)");
+        od.setNameFilters(filters);
+        if (od.exec() != QDialog::Accepted)
+                return;
+QStringList files = od.selectedFiles();
+        if (files.size() < 1)
+                return;
+        tspmodel->loadTask(files.first());
+}
+
+void MainWindow::actionFileSaveTaskTriggered()
+{
+QFileDialog sd(this);
+        sd.setAcceptMode(QFileDialog::AcceptSave);
+QStringList filters(QString(trUtf8("%1 Task File")).arg("TSPSG") + " (*.tspt)");
+        filters.append(trUtf8("All Files") + " (*)");
+        sd.setNameFilters(filters);
+        sd.setDefaultSuffix("tspt");
+        if (sd.exec() != QDialog::Accepted)
+                return;
+QStringList files = sd.selectedFiles();
+        if (files.size() < 1)
+                return;
+        tspmodel->saveTask(files.first());
+}
+
 void MainWindow::actionSettingsPreferencesTriggered()
 {
@@ -209 +242 @@
 about += QString::fromUtf8("    Copyright (C) 2007-%1 Lёppa <contacts[at]oleksii[dot]name>\n").arg(QDate::currentDate().toString("yyyy"));
         about += "Qt library versions:\n";
+        about += QString::fromUtf8("    OS: %1\n").arg(OS);
         about += QString::fromUtf8("    Compile time: %1\n").arg(QT_VERSION_STR);
         about += QString::fromUtf8("    Runtime: %1\n").arg(qVersion());
@@ -281 +315 @@
         QMainWindow::closeEvent(event);
 }
+
+void MainWindow::numCitiesChanged(int nCities)
+{
+        spinCities->setValue(nCities);
+}

trunk/src/mainwindow.h

@@ -25 +25 @@
 #define MAINWINDOW_H
 
-#include <QMainWindow>
-#include <QSettings>
+#include "globals.h"
 #ifdef Q_OS_WINCE
         #include "ui_mainwindow.ce.h"
@@ -41 +40 @@
 public:
         MainWindow(QWidget *parent = 0);
-        void closeEvent(QCloseEvent *event);
+        void closeEvent(QCloseEvent *);
 private slots:
         void actionFileNewTriggered();
+        void actionFileOpenTriggered();
+        void actionFileSaveTaskTriggered();
         void actionSettingsPreferencesTriggered();
-        void actionSettingsLanguageAutodetectTriggered(bool checked);
-        void groupSettingsLanguageListTriggered(QAction *action);
+        void actionSettingsLanguageAutodetectTriggered(bool);
+        void groupSettingsLanguageListTriggered(QAction *);
         void actionHelpAboutTriggered();
 #ifndef Q_OS_WINCE
@@ -53 +54 @@
         void buttonSolveClicked();
         void buttonRandomClicked();
-        void spinCitiesValueChanged(int n);
+        void spinCitiesValueChanged(int);
+        void numCitiesChanged(int);
 private:
         QSettings *settings;

trunk/src/settingsdialog.cpp

@@ -22 +22 @@
  */
 
-#include <QMessageBox>
-#include <QStatusTipEvent>
-#include <QFontDialog>
-#include <QColorDialog>
-#include "defines.h"
 #include "settingsdialog.h"
 

trunk/src/settingsdialog.h

@@ -25 +25 @@
 #define SETTINGSDIALOG_H
 
-#include <QDialog>
-#include <QSettings>
+#include "globals.h"
 #ifdef Q_OS_WINCE
         #include "ui_settingsdialog.ce.h"

trunk/src/tspmodel.cpp

@@ -22 +22 @@
  */
 
-#include <QtGui>
 #include "tspmodel.h"
 
@@ -109 +108 @@
 }
 
-int CTSPModel::numCities() const
+quint16 CTSPModel::numCities() const
 {
         return nCities;
@@ -116 +115 @@
 void CTSPModel::setNumCities(int n)
 {
-int randMin = settings->value("MinCost",DEF_RAND_MIN).toInt();
-int randMax = settings->value("MaxCost",DEF_RAND_MAX).toInt();
+// int randMin = settings->value("MinCost",DEF_RAND_MIN).toInt();
+// int randMax = settings->value("MaxCost",DEF_RAND_MAX).toInt();
         if (n == nCities)
                 return;
@@ -127 +126 @@
                                         table[r][c] = INFINITY;
                                 else
-                                        table[r][c] = rand(randMin,randMax);
+                                        table[r][c] = 0; // rand(randMin,randMax);
                 }
                 for (int r = nCities; r < n; r++) {
@@ -134 +133 @@
                                         table[r][c] = INFINITY;
                                 else
-                                        table[r][c] = rand(randMin,randMax);
+                                        table[r][c] = 0; // rand(randMin,randMax);
                 }
         }
@@ -148 +147 @@
                                 table[r][c] = 0;
         emit dataChanged(index(0,0),index(nCities - 1,nCities - 1));
+}
+
+void CTSPModel::loadTask(QString fname)
+{
+QFile f(fname);
+        f.open(QIODevice::ReadOnly);
+QDataStream ds(&f);
+        ds.setVersion(QDataStream::Qt_4_4);
+quint32 sig;
+        ds >> sig;
+        ds.device()->reset();
+        if (sig == TSPT)
+                loadTSPT(&ds);
+        else if ((sig >> 16) == ZKT)
+                loadZKT(&ds);
+        else
+                QMessageBox(QMessageBox::Critical,trUtf8("Task Load"),trUtf8("Unable to load task:\nUnknown file format or file is corrupted."),QMessageBox::Ok).exec();
+        f.close();
+}
+
+void CTSPModel::loadTSPT(QDataStream *ds)
+{
+        // Skipping signature
+        ds->skipRawData(sizeof(TSPT));
+        // File version
+quint8 version;
+        *ds >> version;
+        if (version > TSPT_VERSION) {
+                QMessageBox(QMessageBox::Critical,trUtf8("Task Load"),trUtf8("Unable to load task:\nFile version is newer than application supports.\nPlease, try to update application."),QMessageBox::Ok).exec();
+                return;
+        }
+        // Skipping metadata
+        ds->skipRawData(TSPT_META_SIZE);
+        // Cities number
+quint16 size;
+        *ds >> size;
+        if (nCities != size)
+                emit numCitiesChanged(size);
+        // Costs
+        for (int r = 0; r < size; r++)
+                for (int c = 0; c < size; c++)
+                        if (r != c)
+                                *ds >> table[r][c];
+        emit dataChanged(index(0,0),index(nCities - 1,nCities - 1));
+}
+
+void CTSPModel::loadZKT(QDataStream *ds)
+{
+        // Skipping signature
+        ds->skipRawData(sizeof(ZKT));
+        // File version
+quint16 version;
+        ds->readRawData(reinterpret_cast<char *>(&version),2);
+        if (version > ZKT_VERSION) {
+                QMessageBox(QMessageBox::Critical,trUtf8("Task Load"),trUtf8("Unable to load task:\nFile version is newer than application supports.\nPlease, try to update application."),QMessageBox::Ok).exec();
+                return;
+        }
+        // Cities number
+quint8 size;
+        ds->readRawData(reinterpret_cast<char *>(&size),1);
+        if (nCities != size)
+                emit numCitiesChanged(size);
+        // Costs
+double val;
+        for (int r = 0; r < size; r++)
+                for (int c = 0; c < size; c++)
+                        if (r != c) {
+                                ds->readRawData(reinterpret_cast<char *>(&val),8);
+                                table[r][c] = val;
+                        } else
+                                ds->skipRawData(8);
+        emit dataChanged(index(0,0),index(nCities - 1,nCities - 1));
+}
+
+void CTSPModel::saveTask(QString fname)
+{
+QFile f(fname);
+        f.open(QIODevice::WriteOnly);
+QDataStream ds(&f);
+        ds.setVersion(QDataStream::Qt_4_4);
+        // File signature
+        ds << TSPT;
+        // File version
+        ds << TSPT_VERSION;
+        // File metadata version
+        ds << TSPT_META_VERSION;
+        // Metadata
+        ds << OSID;
+        // Number of cities
+        ds << nCities;
+        // Costs
+        for (int r = 0; r < nCities; r++)
+                for (int c = 0; c < nCities; c++)
+                        if (r != c)
+                                ds << table[r][c];
+        f.close();
 }
 

trunk/src/tspmodel.h

@@ -25 +25 @@
 #define TSPMODEL_H
 
-#include <QAbstractTableModel>
-#include <QSettings>
-#include "defines.h"
+#include "globals.h"
 
 class CTSPModel: public QAbstractTableModel
@@ -40 +38 @@
         bool setData(const QModelIndex &, const QVariant &, int);
         Qt::ItemFlags flags(const QModelIndex &) const;
-        int numCities() const;
+        quint16 numCities() const;
         void setNumCities(int);
         void clear();
+        void loadTask(QString);
+        void saveTask(QString);
         void randomize();
+signals:
+        void numCitiesChanged(int);
 private:
         QSettings *settings;
         double table[MAX_CITIES][MAX_CITIES];
-        int nCities;
+        quint16 nCities;
         int rand(int, int);
+        void loadZKT(QDataStream *);
+        void loadTSPT(QDataStream *);
 };
 

trunk/src/tspsolver.h

@@ -25 +25 @@
 #define TSPSOLVER_H
 
-#include <QtCore>
+#include "globals.h"
 
 typedef QList<double *> tMatrix;