projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected route drawing dialog to use mxl-file reading route points.
[speedfreak]
/
Client
/
resultdialog.h
diff --git
a/Client/resultdialog.h
b/Client/resultdialog.h
index
d0184cc
..
6f19c38
100644
(file)
--- a/
Client/resultdialog.h
+++ b/
Client/resultdialog.h
@@
-10,7
+10,7
@@
#define RESULTDIALOG_H
#include <QDialog>
#define RESULTDIALOG_H
#include <QDialog>
-#include "measures.h"
+//#include "measures.h"
namespace Ui {
class ResultDialog;
namespace Ui {
class ResultDialog;
@@
-21,10
+21,12
@@
class ResultDialog : public QDialog {
public:
ResultDialog(QWidget *parent = 0);
~ResultDialog();
public:
ResultDialog(QWidget *parent = 0);
~ResultDialog();
- void saveMeasuresToArray(Measures *pMeasures);
+
+ void setEnd(int pValue);
+ void setValue(int pSpeed, double pTime);
signals:
signals:
- void sendresult();
+ void sendresult(double result);
protected:
void changeEvent(QEvent *e);
protected:
void changeEvent(QEvent *e);
@@
-32,12
+34,24
@@
protected:
private:
QPoint changeMeasuresToDiagramPoint(int aSpeed, qreal aTime);
private:
QPoint changeMeasuresToDiagramPoint(int aSpeed, qreal aTime);
- qreal timeArray[10];
+ void setTimesIntoLabels();
+ void setTimeAxelLength(int pChoice);
+ void setHeaders();
+ void showOrHideLabels();
+ int getTargetChoice();
private:
Ui::ResultDialog *ui;
private:
Ui::ResultDialog *ui;
+ qreal timeArray[11];
+ double diagramGapStem;
+ double diagramGapHorizontal;
+ QStringList speedList;
+ QStringList timeList;
+ int timeAxelLength;
+ QString resultString;
private slots:
private slots:
+ void on_pushButtonNew_clicked();
void on_pushButtonSend_clicked();
};
void on_pushButtonSend_clicked();
};