Changeset 43c29c04ba in tspsg for src/tspsolver.cpp

Timestamp:

Jul 4, 2010, 3:03:13 AM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

7aaa0b0ec7

Parents:

d2820c3a1f

git-author:

Oleksii Serdiuk <contacts@…> (07/04/10 03:03:13)

git-committer:

Oleksii Serdiuk <contacts@…> (06/29/12 19:45:57)

Message:

+ Added support for Windows 7 Taskbar Extensions (namely, Progress Bars).

• Cleanup is done in a separate thread now, so progress bar runs more smooth.
• "Tabified" About dialog. Added GPL License and Credits.
• Updated translations and tspsg.tag file.

File:

• src/tspsolver.cpp (modified) (4 diffs)

src/tspsolver.cpp

@@ -43 +43 @@
  */
 CTSPSolver::CTSPSolver(QObject *parent)
-        : QObject(parent), nCities(0), total(0), root(NULL) {}
+        : QObject(parent), cc(true), nCities(0), total(0), root(NULL) {}
 
 /*!
@@ -51 +51 @@
  * \note It is not required to call this function manually. This function is always called by solve() at the beginning of the solution process.
  *
- * \sa solve()
+ * \sa solve(), setCleanupOnCancel()
  */
 void CTSPSolver::cleanup(bool processEvents)
 {
-#ifdef QAPPLICATION_H
-        if (!processEvents)
-                QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-#endif
         route.clear();
         mayNotBeOptimal = false;
         if (root != NULL)
                 deleteTree(root, processEvents);
-#ifdef QAPPLICATION_H
-        if (!processEvents)
-                QApplication::restoreOverrideCursor();
-#endif
 }
 
@@ -115 +107 @@
 {
         return !mayNotBeOptimal;
+}
+
+/*!
+ * \brief Sets whether or not to call cleanup() on solution cancel.
+ * \param enable Set to \c true to enable clenup (default).
+ *
+ *  This may be useful if you want to make cleanup yourself or provide indication of clenup to user.
+ *
+ * \note Please, note that cleanup() is explicitly called at the start of each solution.
+ *       Disabling cleanup and forgetting to do it manually may considerably increase the solution time for large tasks (with more than 15 cities).
+ * \sa cleanup()
+ */
+void CTSPSolver::setCleanupOnCancel(bool enable)
+{
+        cc = enable;
 }
 
@@ -174 +181 @@
                 locker.relock();
                 if ((nRow == -1) || (nCol == -1) || canceled) {
-                        cleanup();
+                        if (canceled && cc)
+                                cleanup();
                         return NULL;
                 }