Changeset d45b48efe9 in tspsg for src

Timestamp:

Mar 12, 2011, 8:39:19 PM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian

Parents:

7fd1756f1e

git-author:

Oleksii Serdiuk <contacts@…> (03/12/11 20:39:19)

git-committer:

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

Message:

Initial Symbian port.

Version 0.1.3.145-beta1, as published in the Nokia Ovi Store.

Location:

src

Files:

• defaults.h (modified) (1 diff)
• main.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (3 diffs)
• tspsolver.h (modified) (1 diff)

src/defaults.h

@@ -92 +92 @@
  */
 #ifdef Q_WS_S60
-        #define DEF_FONT_SIZE 8
+    #define DEF_FONT_SIZE 6
 #else
         #define DEF_FONT_SIZE 10

src/main.cpp

@@ -41 +41 @@
 int main(int argc, char *argv[])
 {
+#ifdef Q_WS_S60
+        // No enough memory for solution graph generation with tasks
+        // of 20 and more cities if we use non-raster graphics system.
+        QApplication::setGraphicsSystem("raster");
+#endif
 QApplication app(argc, argv);
         app.setOverrideCursor(QCursor(Qt::WaitCursor));

src/mainwindow.cpp

@@ -622 +622 @@
 #endif // Q_WS_WIN32
 
+#ifndef HANDHELD
         dlg->resize(450, 350);
+#endif
         QApplication::restoreOverrideCursor();
 
@@ -1145 +1147 @@
                 }
                 if (step->price != INFINITY) {
-                        pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, isInteger(step->price) ?  QString("\n%1").arg(step->price) : QString("\n%1").arg(step->price, 0, 'f', settings->value("Task/FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt()));
+                        pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, isInteger(step->price) ? QString("\n%1").arg(step->price) : QString("\n%1").arg(step->price, 0, 'f', settings->value("Task/FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt()));
                 } else {
                         pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, "\n"INFSTR);
@@ -1589 +1591 @@
         //! \hack HACK: A little hack for toolbar icons to have a sane size.
 #if defined(HANDHELD) && !defined(Q_WS_MAEMO_5)
+#ifdef Q_WS_S60
+        toolBarMain->setIconSize(QSize(logicalDpiX() / 5, logicalDpiY() / 5));
+#else
         toolBarMain->setIconSize(QSize(logicalDpiX() / 4, logicalDpiY() / 4));
+#endif
 #endif // HANDHELD
 QToolButton *tb = static_cast<QToolButton *>(toolBarMain->widgetForAction(actionFileSave));

src/tspsolver.h

@@ -36 +36 @@
  * \brief This value means infinity :-)
  *
- *  Some libraries already have \c INFINITY defined.
- *  We need to redefine it for the \c INFINITY to always have the same value.
+ *  Define \c INFINITY if it's not already defined.
  */
-#ifdef INFINITY
-        #undef INFINITY
+#ifndef INFINITY
+        #define INFINITY std::numeric_limits<double>::infinity()
 #endif
-#define INFINITY std::numeric_limits<double>::infinity()
 
 /*!