projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added showing infotext.
[speedfreak]
/
Client
/
resultdialog.cpp
diff --git
a/Client/resultdialog.cpp
b/Client/resultdialog.cpp
index
7327b4c
..
659f037
100644
(file)
--- a/
Client/resultdialog.cpp
+++ b/
Client/resultdialog.cpp
@@
-278,19
+278,19
@@
void ResultDialog::setTimesIntoLabels()
*/
void ResultDialog::setTimeAxelLength(int pChoice)
{
*/
void ResultDialog::setTimeAxelLength(int pChoice)
{
- if (timeArray[pChoice] <= 5)
+ if (timeArray[pChoice] <= 5.0)
{
timeAxelLength = 5;
}
{
timeAxelLength = 5;
}
- else if (timeArray[pChoice] <= 10)
+ else if (timeArray[pChoice] <= 10.0 && timeArray[pChoice] > 5.0)
{
timeAxelLength = 10;
}
{
timeAxelLength = 10;
}
- else if (timeArray[pChoice] <= 15)
+ else if (timeArray[pChoice] <= 16.0 && timeArray[pChoice] > 10.0)
{
{
- timeAxelLength = 15;
+ timeAxelLength = 16;
}
else
}
else
@@
-318,7
+318,13
@@
void ResultDialog::on_pushButtonNew_clicked()
*/
void ResultDialog::on_pushButtonSend_clicked()
{
*/
void ResultDialog::on_pushButtonSend_clicked()
{
- emit sendresult(timeArray[this->getTargetChoice()]);
+ emit sendresult();
+ //emit sendresult(timeArray[this->getTargetChoice()]);
+}
+
+double ResultDialog::getResult()
+{
+ return timeArray[this->getTargetChoice()];
}
/**
}
/**
@@
-394,12
+400,12
@@
void ResultDialog::setValue(int pSpeed, double pTime)
this->diagramGapHorizontal = DIAGRAMGAP5S;
}
this->diagramGapHorizontal = DIAGRAMGAP5S;
}
- else if (pTime <= 10.0)
+ else if (pTime <= 10.0 && pTime > 5.0)
{
this->diagramGapHorizontal = DIAGRAMGAP10S;
}
{
this->diagramGapHorizontal = DIAGRAMGAP10S;
}
- else if (pTime <= 16.0)
+ else if (pTime <= 16.0 && pTime > 10.0)
{
this->diagramGapHorizontal = DIAGRAMGAP16S;
}
{
this->diagramGapHorizontal = DIAGRAMGAP16S;
}
@@
-742,3
+748,8
@@
int ResultDialog::getTargetChoice()
}
return targetChoice;
}
}
return targetChoice;
}
+
+void ResultDialog::setLabelInfoToUser(QString infoText)
+{
+ this->ui->labelInfoToUser->setText(infoText);
+}