Changeset fc9f661ded in tspsg

Timestamp:

Oct 19, 2007, 4:22:33 AM (17 years ago)

Author:

Oleksii Serdiuk

Branches:

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

Children:

67e53c96d7

Parents:

95eca626aa

Message:

Fixed random number generation algorithm (didn't work at all in linux).

Files:

• src/mainwindow.cpp (modified) (5 diffs)
• src/mainwindow.h (modified) (1 diff)
• ui/mainwindow.ui (modified) (1 diff)

src/mainwindow.cpp

@@ -25 +25 @@
 #include "mainwindow.h"
 
-// TODO: Saving window state on close
+// TODO: Saving window state on close.
 
 MainWindow::MainWindow(QWidget *parent)
@@ -40 +40 @@
     rect.moveCenter(QApplication::desktop()->screenGeometry(QApplication::desktop()->primaryScreen()).center());
         setGeometry(rect);
+        qsrand(QDateTime().currentDateTime().toTime_t());
         PrepareTable();
+}
+
+int MainWindow::rand(int min, int max)
+{
+        return min + (int)(((float)qrand() / RAND_MAX) * max);
 }
 
@@ -56 +62 @@
                                 item->setFlags(item->flags() ^ Qt::ItemIsEditable);
                         } else {
-                                item = new QTableWidgetItem(QVariant(randMin + qrand() * randMax / RAND_MAX).toString());
+                                item = new QTableWidgetItem(QVariant(rand(randMin,randMax)).toString());
 QFont font = item->font();
                                 font.setBold(true);
@@ -89 +95 @@
                 tableTask->setItem(spinCities->value() - 1,spinCities->value() - 1,item);
                 for (int k = 0; k < spinCities->value() - 1; k++) {
-                        item = new QTableWidgetItem(QVariant(randMin + qrand() * randMax / RAND_MAX).toString());
+                        item = new QTableWidgetItem(QVariant(rand(randMin, randMax)).toString());
 QFont font = item->font();
                         font.setBold(true);
                         item->setFont(font);
                         tableTask->setItem(k,spinCities->value() - 1,item);
-                        item = new QTableWidgetItem(QVariant(randMin + qrand() * randMax / RAND_MAX).toString());
+                        item = new QTableWidgetItem(QVariant(rand(randMin, randMax)).toString());
                         font = item->font();
                         font.setBold(true);
@@ -119 +125 @@
                 for (int x = 0; x < spinCities->value(); x++)
                         if (x != y)
-                                tableTask->item(x,y)->setText(QVariant(randMin + qrand() * randMax / RAND_MAX).toString());
+                                tableTask->item(x,y)->setText(QVariant(rand(randMin, randMax)).toString());
 }
 

src/mainwindow.h

@@ -41 +41 @@
 private:
         void PrepareTable();
+        int rand(int, int);
         int randMin;
         int randMax;

ui/mainwindow.ui

@@ -452 +452 @@
     <string>&amp;Про...</string>
    </property>
+   <property name="statusTip" >
+    <string>Получить информацию о программе</string>
+   </property>
   </action>
   <action name="actionFileExit" >