Changeset 55 in tspsg-svn for trunk/src

Timestamp:

Aug 11, 2009, 6:54:01 PM (15 years ago)

Author:

laleppa

Message:

+ PDF format option when saving solution if platform supports printing.

• Check alternative candidates for subcycles.

Location:

trunk/src

Files:

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

trunk/src/globals.h

@@ -39 +39 @@
 #define DEF_RAND_MAX 10
 #define DEF_NUM_CITIES 5
-#define DEF_OFFSET 100
 #define DEF_FONT_FAMILY "Courier New"
 #define DEF_FONT_SIZE 10

trunk/src/mainwindow.cpp

@@ -280 +280 @@
 static QString selectedFile;
         if (selectedFile.isEmpty())
+#ifndef QT_NO_PRINTER
+                selectedFile = "solution.pdf";
+#else
                 selectedFile = "solution.html";
+#endif // QT_NO_PRINTER
 QFileDialog sd(this);
         sd.setAcceptMode(QFileDialog::AcceptSave);
-QStringList filters(trUtf8("HTML Files") + " (*.html *.htm)");
+QStringList filters;
+#ifndef QT_NO_PRINTER
+        filters.append(trUtf8("PDF Files") + "(*.pdf)");
+#endif
+        filters.append(trUtf8("HTML Files") + " (*.html *.htm)");
 #if QT_VERSION >= 0x040500
         filters.append(trUtf8("OpenDocument Files") + " (*.odt)");
@@ -297 +305 @@
         selectedFile = files.first();
         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+#ifndef QT_NO_PRINTER
+        if (selectedFile.endsWith(".pdf",Qt::CaseInsensitive)) {
+QPrinter printer(QPrinter::HighResolution);
+                printer.setOutputFormat(QPrinter::PdfFormat);
+                printer.setOutputFileName(selectedFile);
+                solutionText->document()->print(&printer);
+                QApplication::restoreOverrideCursor();
+                return;
+        }
+#endif
 #if QT_VERSION >= 0x040500
 QTextDocumentWriter dw(selectedFile);
@@ -488 +506 @@
 {
         // TODO: Normal about window :-)
-QString about = QString::fromUtf8("TSPSG - TSP Solver and Generator\n");
+QString about = QString::fromUtf8("TSPSG: TSP Solver and Generator\n");
         about += QString::fromUtf8("    Version: "BUILD_VERSION"\n");
         about += QString::fromUtf8("    Copyright (C) 2007-%1 Lёppa <contacts[at]oleksii[dot]name>\n").arg(QDate::currentDate().toString("yyyy"));

trunk/src/tspsolver.cpp

@@ -97 +97 @@
         for (int r = 0; r < nCities; r++)
                 for (int c = 0; c < nCities; c++)
-//                      if ((matrix[r][c] == 0) && !forbidden.values(r).contains(c)) {
+//                      if ((matrix.at(r).at(c) == 0) && !forbidden.values(r).contains(c)) {
                         if (matrix.at(r).at(c) == 0) {
                                 sum = findMinInRow(r,matrix,c) + findMinInCol(c,matrix,r);
@@ -105 +105 @@
                                         nCol = c;
                                         alts = false;
-                                } else if (sum == h)
+                                } else if ((sum == h) && !hasSubCycles(r,c))
                                         alts = true;
                         }