Changeset 109 in tspsg-svn for trunk/src

Timestamp:

Apr 27, 2010, 9:12:55 AM (15 years ago)

Author:

laleppa

Message:

+ Added the ability to select in what format to save the graph when saving solution as HTML.

• Moved all installation and deployment rules to a separate install.pri file.

Location:

trunk/src

Files:

• defaults.h (modified) (1 diff)
• globals.h (modified) (1 diff)
• main.cpp (modified) (2 diffs)
• mainwindow.cpp (modified) (6 diffs)
• settingsdialog.cpp (modified) (3 diffs)

trunk/src/defaults.h

@@ -67 +67 @@
 //! Default for "Show solution graph"
 #define DEF_SHOW_GRAPH true
+/*!
+ * \def DEF_GRAPH_IMAGE_FORMAT
+ * \brief Default for "Save solution graph as"
+ */
+#if !defined(NOSVG) && (QT_VERSION >= 0x040500)
+        #define DEF_GRAPH_IMAGE_FORMAT "svg"
+#else
+        #define DEF_GRAPH_IMAGE_FORMAT "png"
+#endif // NOSVG && QT_VERSION >= 0x040500
 //! Default for "Show solution steps' matrices for every solution step"
 #define DEF_SHOW_MATRIX true

trunk/src/globals.h

@@ -32 +32 @@
 #include <QtCore>
 #include <QtGui>
-#include <QtSvg>
+#if !defined(NOSVG) && (QT_VERSION >= 0x040500)
+        #include <QtSvg>
+#endif // NOSVG && QT_VERSION >= 0x040500
 
 // Version info

trunk/src/main.cpp

@@ -33 +33 @@
 #endif
 
-#ifdef STATIC_BUILD
-        Q_IMPORT_PLUGIN(qjpeg)
-        Q_IMPORT_PLUGIN(qsvg)
-#endif
+//#ifdef STATIC_BUILD
+//      Q_IMPORT_PLUGIN(qjpeg)
+//      Q_IMPORT_PLUGIN(qtiff)
+//#endif
 
 int main(int argc, char *argv[])
@@ -47 +47 @@
         app.setOrganizationName("Oleksii \"Lёppa\" Serdiuk");
         app.setOrganizationDomain("oleksii.name");
-        app.setApplicationName("TSPSG");
+        app.setApplicationName("TSPSG: TSP Solver and Generator");
         app.setApplicationVersion(BUILD_VERSION);
 

trunk/src/mainwindow.cpp

@@ -226 +226 @@
                 }
 QFileInfo fi(selectedFile);
+QString format = settings->value("Output/GraphImageFormat", DEF_GRAPH_IMAGE_FORMAT).toString();
+#if !defined(NOSVG) && (QT_VERSION >= 0x040500)
+        if (!QImageWriter::supportedImageFormats().contains(format.toAscii()) && (format != "svg")) {
+#else // NOSVG && QT_VERSION >= 0x040500
+        if (!QImageWriter::supportedImageFormats().contains(format.toAscii())) {
+#endif // NOSVG && QT_VERSION >= 0x040500
+                format = DEF_GRAPH_IMAGE_FORMAT;
+                settings->remove("Output/GraphImageFormat");
+        }
 QString html = solutionText->document()->toHtml("UTF-8"),
-                img = fi.completeBaseName() + ".svg";
-                html.replace(QRegExp("<img\\s+src=\"tspsg://graph.pic\""), QString("<img src=\"%1\" width=\"%2\" height=\"%3\" alt=\"%4\"").arg(img).arg(graph.width() + 1).arg(graph.height() + 1).arg(tr("Solution Graph")));
+                img =  fi.completeBaseName() + "." + format;
+                html.replace(QRegExp("<img\\s+src=\"tspsg://graph.pic\""), QString("<img src=\"%1\" width=\"%2\" height=\"%3\" alt=\"%4\"").arg(img).arg(graph.width() + 2).arg(graph.height() + 2).arg(tr("Solution Graph")));
+
                 // Saving solution text as HTML
 QTextStream ts(&file);
@@ -234 +244 @@
                 ts << html;
                 file.close();
-                // Saving solution graph as SVG
+
+                // Saving solution graph as SVG or PNG (depending on settings and SVG support)
+#if !defined(NOSVG) && (QT_VERSION >= 0x040500)
+                if (format == "svg") {
 QSvgGenerator svg;
-                svg.setFileName(fi.path() + "/" + img);
-                svg.setTitle(tr("Solution Graph"));
+                        svg.setSize(QSize(graph.width(), graph.height()));
+                        svg.setResolution(graph.logicalDpiX());
+                        svg.setFileName(fi.path() + "/" + img);
+                        svg.setTitle(tr("Solution Graph"));
+                        svg.setDescription(tr("Generated with %1").arg(QApplication::applicationName()));
 QPainter p;
-                p.begin(&svg);
-                graph.play(&p);
-                p.end();
+                        p.begin(&svg);
+                        p.drawPicture(1, 1, graph);
+                        p.end();
+                } else {
+#endif // NOSVG && QT_VERSION >= 0x040500
+QImage i(graph.width() + 2, graph.height() + 2, QImage::Format_ARGB32);
+                        i.fill(0x00FFFFFF);
+QPainter p;
+                        p.begin(&i);
+                        p.drawPicture(1, 1, graph);
+                        p.end();
+QImageWriter pic(fi.path() + "/" + img);
+                        if (pic.supportsOption(QImageIOHandler::Description)) {
+                                pic.setText("Title", "Solution Graph");
+                                pic.setText("Software", QApplication::applicationName());
+                        }
+                        if (format == "png")
+                                pic.setQuality(5);
+                        else if (format == "jpeg")
+                                pic.setQuality(80);
+                        if (!pic.write(i)) {
+                                QApplication::restoreOverrideCursor();
+                                QMessageBox::critical(this, tr("Solution Save"), tr("Unable to save the solution graph.\nError: %1").arg(pic.errorString()));
+                                return;
+                        }
+#if !defined(NOSVG) && (QT_VERSION >= 0x040500)
+                }
+#endif // NOSVG && QT_VERSION >= 0x040500
 
 // Qt < 4.5 has no QTextDocumentWriter class
@@ -351 +392 @@
         title += QString("<b>TSPSG<br>TSP Solver and Generator</b><br>");
 #else
-        title += QString("<b>TSPSG: TSP Solver and Generator</b><br>");
+        title += QString("<b>%1</b><br>").arg(QApplication::applicationName());
 #endif // HANDHELD
         title += QString("%1: <b>%2</b><br>").arg(tr("Version"), QApplication::applicationVersion());
@@ -536 +577 @@
                 pic.begin(&graph);
                 pic.setRenderHint(QPainter::Antialiasing);
+                pic.setFont(settings->value("Output/Font", QFont(DEF_FONT_FAMILY, 9)).value<QFont>());
+                pic.setBrush(QBrush(QColor(Qt::white)));
+                pic.setBackgroundMode(Qt::OpaqueMode);
         }
 
@@ -805 +849 @@
                         pic.setFont(font);
                 }
-                pic.setBackgroundMode(Qt::OpaqueMode);
                 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()));
@@ -811 +854 @@
                         pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, "\n"INFSTR);
                 }
-                pic.setBackgroundMode(Qt::TransparentMode);
         } else {
                 pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, tr("Root"));

trunk/src/settingsdialog.cpp

@@ -195 +195 @@
         settings->beginGroup("Output");
         cbShowGraph->setChecked(settings->value("ShowGraph", DEF_SHOW_GRAPH).toBool());
+
+#if !defined(NOSVG) && (QT_VERSION >= 0x040500)
+        comboGraphImageFormat->addItem("svg");
+#endif // NOSVG && QT_VERSION >= 0x040500
+// We create a whitelist of formats, supported by the most popular web browsers according to
+//  http://en.wikipedia.org/wiki/Comparison_of_web_browsers#Image_format_support
+//  + TIFF format (there are plugins to support it).
+QStringList whitelist;
+        whitelist << "bmp" << "jpeg" << "png" << "tiff" << "xbm";
+        foreach (QByteArray format, QImageWriter::supportedImageFormats()) {
+                if (whitelist.contains(format))
+                        comboGraphImageFormat->addItem(format);
+        }
+        comboGraphImageFormat->model()->sort(0);
+        comboGraphImageFormat->setCurrentIndex(comboGraphImageFormat->findText(settings->value("GraphImageFormat", DEF_GRAPH_IMAGE_FORMAT).toString(), Qt::MatchFixedString));
+        if (comboGraphImageFormat->currentIndex() < 0)
+                comboGraphImageFormat->setCurrentIndex(comboGraphImageFormat->findText(DEF_GRAPH_IMAGE_FORMAT, Qt::MatchFixedString));
+        labelGraphImageFormat->setEnabled(cbShowGraph->isChecked());
+        comboGraphImageFormat->setEnabled(cbShowGraph->isChecked());
+
         cbShowMatrix->setChecked(settings->value("ShowMatrix", DEF_SHOW_MATRIX).toBool());
         cbCitiesLimit->setEnabled(cbShowMatrix->isChecked());
@@ -252 +272 @@
                         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."));
+                        QMessageBox::information(this->parentWidget(), tr("Settings Reset"), tr("All settings where successfully reset to their defaults.\nIt is recommended to restart the application now."));
                         return;
                 } else
@@ -282 +302 @@
         settings->beginGroup("Output");
         settings->setValue("ShowGraph", cbShowGraph->isChecked());
+        if (cbShowGraph->isChecked()) {
+                if (comboGraphImageFormat->currentIndex() >= 0)
+                        settings->setValue("GraphImageFormat", comboGraphImageFormat->currentText());
+                else
+                        settings->setValue("GraphImageFormat", DEF_GRAPH_IMAGE_FORMAT);
+        }
         settings->setValue("ShowMatrix", cbShowMatrix->isChecked());
         settings->setValue("UseShowMatrixLimit", cbShowMatrix->isChecked() && cbCitiesLimit->isChecked());