Incrementation of lcdcounter is working + epoch time in seconds

Author: eiithel

Vigil_3G.pro

@@ -30,6 +30,7 @@ HEADERS  += mainwindow.h \
 FORMS    += mainwindow.ui
 
 DISTFILES += \
-    clicks_results.txt
+    clicks_results.txt \
+    C:Tempclicks_results.txt
 
 QMAKE_CXXFLAGS += -std=c++0x

controler.cpp

@@ -10,10 +10,10 @@ controler::controler(Model *model): _model(model)
 
 void controler::displayResults(){
 
-    QMultiMap<int,char*> results;
+    QMultiMap<int,double> results;
     results =_model->getMap();
 
-    QMultiMap<int,char*>::const_iterator i = results.find(1);
+    QMultiMap<int,double>::const_iterator i = results.find(1);
     while (i != results.end() && i.key() == 1) {
         qDebug() << i.value();
         ++i;
@@ -24,15 +24,15 @@ void controler::displayResults(){
 
 void controler::writeResults(){
 
-    QMultiMap<int,char*> results;
+    QMultiMap<int,double> results;
     results =_model->getMap();
 
-    QMultiMap<int,char*>::const_iterator i1 = results.find(1);
-    QMultiMap<int,char*>::const_iterator i2 = results.find(2);
-    QMultiMap<int,char*>::const_iterator i3 = results.find(3);
-    QMultiMap<int,char*>::const_iterator i4 = results.find(4);
-    QMultiMap<int,char*>::const_iterator i5 = results.find(5);
-    QMultiMap<int,char*>::const_iterator i6 = results.find(6);
+    QMultiMap<int,double>::const_iterator i1 = results.find(1);
+    QMultiMap<int,double>::const_iterator i2 = results.find(2);
+    QMultiMap<int,double>::const_iterator i3 = results.find(3);
+    QMultiMap<int,double>::const_iterator i4 = results.find(4);
+    QMultiMap<int,double>::const_iterator i5 = results.find(5);
+    QMultiMap<int,double>::const_iterator i6 = results.find(6);
 
     QFile outfile(QString("/home/ethel/qwt-5.2/test-ethel/Vigil_3G/clicks_results.txt"));
 
@@ -124,9 +124,9 @@ void controler::quitMyApp(){
 
 void controler::AppendLine(int nbutton){
 
-    QMultiMap<int,char*> results;
+    QMultiMap<int,double> results;
     results =_model->getMap();
-    QMultiMap<int,char*>::const_iterator i = results.find(nbutton);
+    QMultiMap<int,double>::const_iterator i = results.find(nbutton);
 
     QFile outfile(QString("/home/ethel/qwt-5.2/test-ethel/Vigil_3G/clicks_results.txt"));
 
@@ -154,7 +154,7 @@ void controler::AppendLine(int nbutton){
     QTextStream stream(&outfile);
 
     stream << i.value();
-    stream << "," << type << "," << nbutton <<"\n\n";
+    stream << "," << type << "," << nbutton <<"\n";
 
 
 }

mainwindow.cpp

@@ -21,6 +21,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->pushButton_1->setid(1);
     ui->pushButton_1->setmodel(this->model);
     ui->pushButton_1->setFontSize(22);
+    ui->pushButton_1->setLcdNb(ui->lcdNumber);
 
     ui->pushButton_2->setFixedSize(400,180);
     ui->pushButton_2->setText("Qualité");
@@ -29,6 +30,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->pushButton_2->setid(2);
     ui->pushButton_2->setmodel(this->model);
     ui->pushButton_2->setFontSize(22);
+    ui->pushButton_2->setLcdNb(ui->lcdNumber_2);
 
 
     ui->pushButton_3->setFixedSize(400,180);
@@ -38,6 +40,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->pushButton_3->setid(3);
     ui->pushButton_3->setmodel(this->model);
     ui->pushButton_3->setFontSize(22);
+    ui->pushButton_3->setLcdNb(ui->lcdNumber_3);
 
 
     ui->pushButton_4->setFixedSize(400,180);
@@ -47,6 +50,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->pushButton_4->setid(4);
     ui->pushButton_4->setmodel(this->model);
     ui->pushButton_4->setFontSize(22);
+    ui->pushButton_4->setLcdNb(ui->lcdNumber_4);
 
 
     ui->pushButton_5->setFixedSize(400,180);
@@ -56,6 +60,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->pushButton_5->setid(5);
     ui->pushButton_5->setmodel(this->model);
     ui->pushButton_5->setFontSize(22);
+    ui->pushButton_5->setLcdNb(ui->lcdNumber_5);
 
 
     ui->pushButton_6->setFixedSize(400,180);
@@ -65,6 +70,7 @@ MainWindow::MainWindow(QWidget *parent) :
     ui->pushButton_6->setid(6);
     ui->pushButton_6->setmodel(this->model);
     ui->pushButton_6->setFontSize(22);
+    ui->pushButton_6->setLcdNb(ui->lcdNumber_6);
 
 
     QFont font("Myriad Pro",22);

model.cpp

@@ -11,7 +11,7 @@ Model::~Model(){
 }
 
 
-void Model::increment(int nbutton, char* time){
+void Model::increment(int nbutton, double time){
     _counter.insert(nbutton,time);
     emit Model::newClick(nbutton);
 }

model.h

@@ -17,10 +17,10 @@ class Model : public QObject
     Model();
     ~Model();
 
-    void increment(int nbutton, char* time);
+    void increment(int nbutton, double time);
     int toSecond(int ms);
     //getters
-    QMultiMap<int, char*> getMap(){ return _counter;}
+    QMultiMap<int, double> getMap(){ return _counter;}
     QTime t;
     std::time_t _time;
 
@@ -32,7 +32,7 @@ public slots:
 
 private:
 
-    QMultiMap<int, char*> _counter;//6keys for the 6 buttons
+    QMultiMap<int, double> _counter;//6keys for the 6 buttons
 
 
 };

model.o

@@ -1,6 +1,6 @@
 #include "vigilbutton.h"
 
-VigilButton::VigilButton(QWidget *parent) : QAbstractButton(parent), fontSize(12)
+VigilButton::VigilButton(QWidget *parent) : QAbstractButton(parent), fontSize(12), _counter(0)
 {
     setText("default");
     setFixedSize(50,50);
@@ -50,9 +50,11 @@ void VigilButton::mousePressEvent(QMouseEvent * e)
     bodyShadow.setDistance(3.0);
     timesFont.setPointSizeF(fontSize-1);
 
-//    double time = _model->t.elapsed();
-//    time = _model->toSecond(time);
-    char* time = std::asctime(std::localtime(&_model->_time));
+    double time = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+
+    //incrementation du compteur LCD
+    _counter++;
+    _lcdnb->display(_counter);
 
     _model->increment(_id,time);
 }
@@ -160,4 +162,9 @@ void VigilButton::setmodel(Model* model){
     _model = model;
 }
 
+void VigilButton::setLcdNb(QLCDNumber* nb){
+    _lcdnb = nb;
+}
+
+
 

vigilbutton.cpp

@@ -10,9 +10,11 @@
 #include <QGradient>
 #include <QPainterPath>
 #include <QPaintEvent>
+#include <QLCDNumber>
 #include "vigilbuttonpalette.h"
 #include "customshadoweffect.h"
 #include "model.h"
+#include <chrono>
 
 
 class VigilButton : public QAbstractButton
@@ -32,6 +34,7 @@ Q_OBJECT
     void setFontSize(int size);
     void setid(int id);
     void setmodel(Model* model);
+    void setLcdNb(QLCDNumber* nb);
 
 protected:
     void paintEvent(QPaintEvent* e);
@@ -46,6 +49,8 @@ Q_OBJECT
     int xRadius, yRadius;
     int _id;
     Model *_model;
+    QLCDNumber *_lcdnb;
+    int _counter;
 };
 
 #endif // VIGILBUTTON_H