|
@@ -34,8 +34,7 @@ MainWindow::MainWindow(QWidget *parent) :
|
34
|
34
|
|
35
|
35
|
|
36
|
36
|
frogger = new frog;
|
37
|
|
- //ui->x1Label->setText(fr);
|
38
|
|
- // ui->x1Label->move(frogger->xnenu2, 300);
|
|
37
|
+
|
39
|
38
|
globalTimer = new QTimer;
|
40
|
39
|
scene->addWidget(frogger);
|
41
|
40
|
|
|
@@ -75,7 +74,6 @@ void MainWindow::quadraticFormulaCheck()
|
75
|
74
|
c = values[i+2];
|
76
|
75
|
expected = values[i+3];
|
77
|
76
|
|
78
|
|
- // firstX = (((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a));
|
79
|
77
|
resultFromFunction = frogger->QuadraticPlus(a,b,c);
|
80
|
78
|
|
81
|
79
|
if( abs(resultFromFunction - expected) > 0.00001) {
|
|
@@ -94,7 +92,6 @@ void MainWindow::quadraticFormulaCheck()
|
94
|
92
|
c = valuesForMinus[i+2];
|
95
|
93
|
expected = valuesForMinus[i+3];
|
96
|
94
|
|
97
|
|
- // firstX = (((-b) + sqrt((pow(b,2)) - 4*a*c))/(2*a));
|
98
|
95
|
resultFromFunction = frogger->QuadraticMinus(a,b,c);
|
99
|
96
|
|
100
|
97
|
if( abs(resultFromFunction - expected) > 0.00001) {
|