Changeset f1fb54b9f7 in tspsg for src/mainwindow.cpp

Timestamp:

Jan 7, 2010, 2:24:18 AM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

946f442ab0

Parents:

4ccf855df8

Message:

+ Added the ability to generate fractional random numbers.
+ Added "Scroll to the end of solution output after solving" option.

• Set the accuracy for fractional numbers on output to 2 decimail places.
• Updated translations to reflect changes.

File:

• src/mainwindow.cpp (modified) (5 diffs)

src/mainwindow.cpp

@@ -450 +450 @@
                 output.append("<p>" + trUtf8("Resulting path:") + "</p>");
         output.append("<p>&nbsp;&nbsp;" + solver.getSortedPath() + "</p>");
-        output.append("<p>" + trUtf8("The price is <b>%n</b> unit(s).", "", step->price) + "</p>");
+        if (isInteger(step->price))
+                output.append("<p>" + trUtf8("The price is <b>%n</b> unit(s).", "", step->price) + "</p>");
+        else
+                output.append("<p>" + trUtf8("The price is <b>%1</b> units.").arg(step->price, 0, 'f', 2) + "</p>");
         if (!solver.isOptimal()) {
                 output.append("<p>&nbsp;</p>");
@@ -460 +463 @@
         solutionText->setDocumentTitle(trUtf8("Solution of Variant #%1 task").arg(spinVariant->value()));
 
-        // Scrolling to the end of text.
-        solutionText->moveCursor(QTextCursor::End);
+        if (settings->value("Output/ScrollToEnd", DEF_SCROLL_TO_END).toBool()) {
+                // Scrolling to the end of text.
+                solutionText->moveCursor(QTextCursor::End);
+        }
 
         toggleSolutionActions();
@@ -655 +660 @@
                                 line += "<td align=\"center\">"INFSTR"</td>";
                         else
-                                line += "<td align=\"center\">" + QVariant(matrix.at(r).at(c)).toString() + "</td>";
+                                line += isInteger(matrix.at(r).at(c)) ? QString("<td align=\"center\">%1</td>").arg(matrix.at(r).at(c)) : QString("<td align=\"center\">%1</td>").arg(matrix.at(r).at(c), 0, 'f', 2);
                 }
                 line += "</tr>";
@@ -674 +679 @@
                                 line += "<td align=\"center\">"INFSTR"</td>";
                         else if ((r == step.candidate.nRow) && (c == step.candidate.nCol))
-                                line += "<td align=\"center\" class=\"selected\">" + QVariant(step.matrix.at(r).at(c)).toString() + "</td>";
+                                line += isInteger(step.matrix.at(r).at(c)) ? QString("<td align=\"center\" class=\"selected\">%1</td>").arg(step.matrix.at(r).at(c)) : QString("<td align=\"center\" class=\"selected\">%1</td>").arg(step.matrix.at(r).at(c), 0, 'f', 2);
                         else {
 SCandidate cand;
@@ -680 +685 @@
                                 cand.nCol = c;
                                 if (step.alts.contains(cand))
-                                        line += "<td align=\"center\" class=\"alternate\">" + QVariant(step.matrix.at(r).at(c)).toString() + "</td>";
+                                        line += isInteger(step.matrix.at(r).at(c)) ? QString("<td align=\"center\" class=\"alternate\">%1</td>").arg(step.matrix.at(r).at(c)) : QString("<td align=\"center\" class=\"alternate\">%1</td>").arg(step.matrix.at(r).at(c), 0, 'f', 2);
                                 else
-                                        line += "<td align=\"center\">" + QVariant(step.matrix.at(r).at(c)).toString() + "</td>";
+                                        line += isInteger(step.matrix.at(r).at(c)) ? QString("<td align=\"center\">%1</td>").arg(step.matrix.at(r).at(c)) : QString("<td align=\"center\">%1</td>").arg(step.matrix.at(r).at(c), 0, 'f', 2);
                         }
                 }