Changeset 154 in tspsg-svn for trunk/src

Timestamp:

Mar 13, 2011, 9:23:53 PM (14 years ago)

Author:

laleppa

Message:

Fixes and updates to Symbian SIS package generation rules and some small Symbian-related code fixes.

Location:

trunk/src

Files:

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

trunk/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));

trunk/src/mainwindow.cpp

@@ -617 +617 @@
 #endif // HANDHELD
 
+#ifndef HANDHELD
     dlg->resize(450, 350);
+#endif
     QApplication::restoreOverrideCursor();
 
@@ -1136 +1138 @@
         }
         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);
@@ -1579 +1581 @@
     //! \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 // HANDHELD
+#endif // Q_WS_S60
+#endif // HANDHELD && !Q_WS_MAEMO_5
 QToolButton *tb = static_cast<QToolButton *>(toolBarMain->widgetForAction(actionFileSave));
-    if (tb != NULL)      {
+    if (tb != NULL) {
         tb->setMenu(menuFileSaveAs);
         tb->setPopupMode(QToolButton::MenuButtonPopup);

trunk/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()
 
 /*!