Changeset 95 in tspsg-svn for trunk/src

Timestamp:

Feb 27, 2010, 2:13:50 PM (15 years ago)

Author:

laleppa

Message:

+ Added Symmetric mode: in this mode the cost of travel from city 1 to city 2 and vice versa is the same.
+ Added the ability to reset all settings to their defaults: hold Shift while clicking Save button in Settings Dialog.

• Better SIP show/hide handling under wince: no need to resize the Main Window, when it isn't active.

Location:

trunk/src

Files:

• defaults.h (modified) (3 diffs)
• mainwindow.cpp (modified) (5 diffs)
• mainwindow.h (modified) (1 diff)
• settingsdialog.cpp (modified) (10 diffs)
• settingsdialog.h (modified) (1 diff)
• tspmodel.cpp (modified) (2 diffs)

trunk/src/defaults.h

@@ -45 +45 @@
 #endif // Q_OS_WINCE
 //! Default for "Save main window state and position"
-#define DEF_SAVEPOS false
+#define DEF_SAVEPOS true
 //! Default for "Use translucency effects in Vista/7"
 #define DEF_USE_TRANSLUCENCY true
@@ -58 +58 @@
 //! Default for "Fractional random values"
 #define DEF_FRACTIONAL_RANDOM false
+//! Default for "Symmetric tasks mode"
+#define DEF_SYMMETRIC_MODE false
 
 //////// OUTPUT
@@ -67 +69 @@
 #define DEF_SHOW_MATRIX_LIMIT 15
 //! Default for "Scroll to the end of output after solving"
-#define DEF_SCROLL_TO_END true
+#define DEF_SCROLL_TO_END false
 /*!
  * \def DEF_FONT_FAMILY

trunk/src/mainwindow.cpp

@@ -71 +71 @@
 
 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
+        // Centering main window
+QRect rect = geometry();
+        rect.moveCenter(QApplication::desktop()->availableGeometry(this).center());
+        setGeometry(rect);
         if (settings->value("SavePos", DEF_SAVEPOS).toBool()) {
                 // Loading of saved window state
@@ -77 +81 @@
                 restoreState(settings->value("State").toByteArray());
                 settings->endGroup();
-        } else {
-                // Centering main window
-QRect rect = geometry();
-                rect.moveCenter(QApplication::desktop()->availableGeometry(this).center());
-                setGeometry(rect);
         }
 #else
@@ -500 +499 @@
 
 #ifdef Q_OS_WINCE
+void MainWindow::changeEvent(QEvent *ev)
+{
+        if ((ev->type() == QEvent::ActivationChange) && isActiveWindow())
+                desktopResized(0);
+
+        QWidget::changeEvent(ev);
+}
+
 void MainWindow::desktopResized(int screen)
 {
-        if (screen != 0)
+        if ((screen != 0) || !isActiveWindow())
                 return;
 
 QRect availableGeometry = QApplication::desktop()->availableGeometry(0);
         if (currentGeometry != availableGeometry) {
+                QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
                 /*!
                  * \hack HACK: This hack checks whether \link QDesktopWidget::availableGeometry() availableGeometry()\endlink's \c top + \c hegiht = \link QDesktopWidget::screenGeometry() screenGeometry()\endlink's \c height.
@@ -519 +527 @@
                         setGeometry(availableGeometry);
                 }
-        }
-        currentGeometry = availableGeometry;
+                currentGeometry = availableGeometry;
+                QApplication::restoreOverrideCursor();
+        }
 }
 #endif // Q_OS_WINCE
@@ -557 +566 @@
                 return;
         }
-        settings->setValue("NumCities", spinCities->value());
-
-        // Saving Main Window state
-        if (settings->value("SavePos", DEF_SAVEPOS).toBool()) {
-                settings->beginGroup("MainWindow");
+        if (!settings->value("SettingsReset", false).toBool()) {
+                settings->setValue("NumCities", spinCities->value());
+
+                // Saving Main Window state
+                if (settings->value("SavePos", DEF_SAVEPOS).toBool()) {
+                        settings->beginGroup("MainWindow");
 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
-                settings->setValue("Geometry", saveGeometry());
+                        settings->setValue("Geometry", saveGeometry());
 #endif // Q_OS_WINCE
-                settings->setValue("State", saveState());
-                settings->endGroup();
+                        settings->setValue("State", saveState());
+                        settings->endGroup();
+                }
+        } else {
+                settings->remove("SettingsReset");
         }
 

trunk/src/mainwindow.h

@@ -72 +72 @@
         void dataChanged(const QModelIndex &tl, const QModelIndex &br);
 #ifdef Q_OS_WINCE
+        void changeEvent(QEvent *ev);
         void desktopResized(int screen);
 #endif // Q_OS_WINCE

trunk/src/settingsdialog.cpp

@@ -54 +54 @@
         scrollArea->setWidgetResizable(true);
         scrollArea->setWidget(bgWhite);
+#else
+        buttons->insertStretch(buttons->indexOf(buttonHelp) + 1);
 #endif // Q_OS_WINCE
 
@@ -146 +148 @@
 
 #ifdef Q_OS_WINCE
-        currentGeometry = QApplication::desktop()->availableGeometry(0);
         // We need to react to SIP show/hide and resize the window appropriately
         connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(desktopResized(int)));
@@ -153 +154 @@
         connect(buttonFont,SIGNAL(clicked()),this,SLOT(buttonFontClicked()));
         connect(buttonColor,SIGNAL(clicked()),this,SLOT(buttonColorClicked()));
-//      setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint);
         setWindowFlags(windowFlags() ^ Qt::WindowContextHelpButtonHint);
 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
@@ -161 +161 @@
 
         settings = new QSettings(QSettings::IniFormat, QSettings::UserScope, "TSPSG", "tspsg", this);
+        settings->remove("SettingsReset");
 
         cbAutosize->setChecked(settings->value("Autosize", DEF_AUTOSIZE).toBool());
@@ -173 +174 @@
 
         settings->beginGroup("Task");
+        cbSymmetricMode->setChecked(settings->value("SymmetricMode", DEF_SYMMETRIC_MODE).toBool());
         spinFractionalAccuracy->setValue(settings->value("FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt());
         spinRandMin->setMaximum(MAX_RAND_VALUE);
@@ -194 +196 @@
         settings->endGroup();
 
+#ifndef Q_OS_WINCE
         adjustSize();
+#endif // Q_OS_WINCE
 }
 
@@ -230 +234 @@
 void SettingsDialog::accept()
 {
+        if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
+                if (QMessageBox::question(this, tr("Settings Reset"), tr("Do you really want to <b>reset all application settings to their defaults</b>?"), QMessageBox::RestoreDefaults | QMessageBox::Cancel) == QMessageBox::RestoreDefaults) {
+                        _newFont = (font != QFont(DEF_FONT_FAMILY, DEF_FONT_SIZE));
+                        _newColor = (color != DEF_FONT_COLOR);
+                        settings->remove("");
+                        settings->setValue("SettingsReset", true);
+                        QDialog::accept();
+                        QMessageBox::information(this, tr("Settings Reset"), tr("All settings where successfully reset to their defaults.\nIt is recommended to restart the application now."));
+                        return;
+                } else
+                        return;
+        }
 #if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
         settings->setValue("SavePos", cbSaveState->isChecked());
@@ -246 +262 @@
 
         settings->beginGroup("Task");
+        settings->setValue("SymmetricMode", cbSymmetricMode->isChecked());
         settings->setValue("FractionalAccuracy", spinFractionalAccuracy->value());
         settings->setValue("RandMin", spinRandMin->value());
@@ -293 +310 @@
 QRect availableGeometry = QApplication::desktop()->availableGeometry(0);
         if (currentGeometry != availableGeometry) {
+                QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
                 /*!
                  * \hack HACK: This hack checks whether \link QDesktopWidget::availableGeometry() availableGeometry()\endlink's \c top + \c hegiht = \link QDesktopWidget::screenGeometry() screenGeometry()\endlink's \c height.
@@ -305 +323 @@
                         setGeometry(availableGeometry);
                 }
-        }
-        currentGeometry = availableGeometry;
+                currentGeometry = availableGeometry;
+                QApplication::restoreOverrideCursor();
+        }
+}
+
+void SettingsDialog::showEvent(QShowEvent *ev)
+{
+        desktopResized(0);
+
+        QWidget::showEvent(ev);
 }
 #endif // Q_OS_WINCE

trunk/src/settingsdialog.h

@@ -76 +76 @@
 #ifdef Q_OS_WINCE
         void desktopResized(int screen);
+        void showEvent(QShowEvent *ev);
 #endif // Q_OS_WINCE
         void spinRandMinValueChanged(int val);

trunk/src/tspmodel.cpp

@@ -191 +191 @@
 void CTSPModel::randomize()
 {
-int randMin = settings->value("Task/RandMin",DEF_RAND_MIN).toInt();
-int randMax = settings->value("Task/RandMax",DEF_RAND_MAX).toInt();
-        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));
+int randMin = settings->value("Task/RandMin", DEF_RAND_MIN).toInt();
+int randMax = settings->value("Task/RandMax", DEF_RAND_MAX).toInt();
+        if (settings->value("Task/SymmetricMode", DEF_SYMMETRIC_MODE).toBool()) {
+                for (int r = 0; r < nCities; r++)
+                        for (int c = 0; c < r; c++)
+                                table[c][r] = table[r][c] = rand(randMin, randMax);
+        } else {
+                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));
 }
 
@@ -315 +321 @@
                         if (!ok || tmp < 0)
                                 return false;
-                        else
+                        else {
                                 table[index.row()][index.column()] = tmp;
+                                if (settings->value("Task/SymmetricMode", DEF_SYMMETRIC_MODE).toBool())
+                                        table[index.column()][index.row()] = tmp;
+                        }
                 }
                 emit dataChanged(index,index);