Changeset 125 in tspsg-svn

Timestamp:

Aug 30, 2010, 7:48:47 PM (14 years ago)

Author:

laleppa

Message:

Improved quality of graph when printing (in a little hackish way).

Location:

trunk

Files:

• install.pri (modified) (1 diff)
• resources/COPYING (copied) (copied from trunk/COPYING)
• src/mainwindow.cpp (modified) (5 diffs)

trunk/install.pri

@@ -14 +14 @@
 #l10n.files = l10n/*.qm
 #share.files =
-docs.files = COPYING README.txt
+docs.files = COPYING ChangeLog.txt README.txt INSTALL.txt
 INSTALLS += target share docs # l10n
 

trunk/src/mainwindow.cpp

@@ -257 +257 @@
 QString html = solutionText->document()->toHtml("UTF-8"),
                 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")));
+                html.replace(QRegExp("<img\\s+src=\"tspsg://graph.pic\""), QString("<img src=\"%1\" alt=\"%2\"").arg(img, tr("Solution Graph")));
 
                 // Saving solution text as HTML
@@ -280 +280 @@
                 } else {
 #endif // NOSVG && QT_VERSION >= 0x040500
-QImage i(graph.width() + 2, graph.height() + 2, QImage::Format_ARGB32);
+QImage i(graph.width(), graph.height(), QImage::Format_ARGB32);
                         i.fill(0x00FFFFFF);
 QPainter p;
@@ -735 +735 @@
         if (settings->value("Output/ShowGraph", DEF_SHOW_GRAPH).toBool()) {
                 pic.begin(&graph);
-                pic.setRenderHint(QPainter::Antialiasing);
-                pic.setFont(settings->value("Output/Font", QFont(getDefaultFont(), 9)).value<QFont>());
+                pic.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+QFont font = settings->value("Output/Font", QFont(getDefaultFont(), 9)).value<QFont>();
+//              font.setBold(true);
+                font.setPointSizeF(font.pointSizeF() * 2);
+                pic.setFont(font);
                 pic.setBrush(QBrush(QColor(Qt::white)));
+QPen pen = pic.pen();
+                pen.setWidth(2);
+                pic.setPen(pen);
                 pic.setBackgroundMode(Qt::OpaqueMode);
         }
@@ -878 +884 @@
 QTextImageFormat img;
                 img.setName("tspsg://graph.pic");
+                img.setWidth(i.width() / 2);
+                img.setHeight(i.height() / 2);
 
                 cur.setPosition(imgpos);
@@ -1041 +1049 @@
 void MainWindow::drawNode(QPainter &pic, int nstep, bool left, SStep *step)
 {
-const int r = 35;
+const int r = 70;
 qreal x, y;
         if (step != NULL)