Merge branch 'bugfix/categorylist'

[speedfreak] / Client / resultdialog.h

diff --git a/Client/resultdialog.h b/Client/resultdialog.h
index cf3cc40..09c4174 100644 (file)
--- a/Client/resultdialog.h
+++ b/Client/resultdialog.h
@@ -1,7 +1,8 @@
 /*
  * CarMainWindow main class
  *
- * @author     Janne Änäkkälä <janne.anakkala@fudeco.com>
+ * @author     Janne Änäkkälä   <janne.anakkala@fudeco.com>
+ * @author      Toni Jussila   <toni.jussila@fudeco.com>
  * @copyright  (c) 2010 Speed Freak team
  * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
  */
@@ -10,7 +11,7 @@
 #define RESULTDIALOG_H
 
 #include <QDialog>
-//#include "measures.h"
+
 
 namespace Ui {
     class ResultDialog;
@@ -21,15 +22,14 @@ class ResultDialog : public QDialog {
 public:
     ResultDialog(QWidget *parent = 0);
     ~ResultDialog();
-    //void saveMeasuresToArray(Measures *pMeasures);
-    void setDiagramGapStem(double pDiagramGapStem);
-    void setDiagramGapHorizontal(double pDiagramGapHorizontal);
 
     void setEnd(int pValue);
     void setValue(int pSpeed, double pTime);
+    void setLabelInfoToUser(QString infoText);
+    double getResult();
 
 signals:
-    void sendresult(double result);
+    void sendresult(double);
 
 protected:
     void changeEvent(QEvent *e);
@@ -38,7 +38,10 @@ protected:
 private:
     QPoint changeMeasuresToDiagramPoint(int aSpeed, qreal aTime);
     void setTimesIntoLabels();
-    void setTimeAxelLength();
+    void setTimeAxelLength(int pChoice);
+    void setHeaders();
+    void showOrHideLabels();
+    int getTargetChoice();
 
 private:
     Ui::ResultDialog *ui;
@@ -48,6 +51,7 @@ private:
     QStringList speedList;
     QStringList timeList;
     int timeAxelLength;
+    QString resultString;
 
 private slots:
     void on_pushButtonNew_clicked();