Remise en état du Logger par compilation croisée en 64-bit

mjc-ermont · Oct 5, 2013 · dea44ba · dea44ba
1 parent 41505b4
commit dea44ba
Show file tree

Hide file tree

Showing 8 changed files with 18,476 additions and 17 deletions.
diff --git a/ChronoReader b/ChronoReader
diff --git a/FenPrincipale.cpp b/FenPrincipale.cpp
@@ -72,14 +72,7 @@ FenPrincipale::FenPrincipale(Serial* _com) {
 
     actTemps->start(1000);
 
-
-    reset_errors_timer = new QTimer();
-    connect(reset_errors_timer,SIGNAL(timeout()),this,SLOT(reset_error()));
-    reset_error();
-    reset_errors_timer->start(60000);
-
-
-    myDecoder = new YoloDecoder();
+    myDecoder = new CookieDecoder();
     connect(myDecoder, SIGNAL(newValue(int,int,double)), sensormgr, SLOT(newValue(int,int,double)));
     connect(myDecoder,SIGNAL(error_frame()), this, SLOT(error_frame()));
     message("[INFO] All started !");

diff --git a/FenPrincipale.h b/FenPrincipale.h
@@ -5,7 +5,7 @@
 #include "ui_FenPrincipale.h"
 #include "ChronoReader/chronoreaderwidget.h"
 #include "InPut/sensormanager.h"
-#include "InPut/yolodecoder.h"
+#include "InPut/cookiedecoder.h"
 #include "InPut/serial.h"
 #include "UI/boardingtable.h"
 #include "UI/graphicview.h"
@@ -49,7 +49,7 @@ class FenPrincipale : public QMainWindow, public Ui::FenPrincipale
         QTimer *resetIndicator;
         QTimer *reset_errors_timer;
 
-        YoloDecoder* myDecoder;
+        CookieDecoder* myDecoder;
         BoardingTable* tableauBord;
         MapsView* carte;
         TableMgr* tableManager;

diff --git a/InPut/cookiedecoder.cpp b/InPut/cookiedecoder.cpp
@@ -9,7 +9,8 @@ QString CookieDecoder::splitCharacter() {
     return "@";
 }
 
-void CookieDecoder::decodeString(QString &str) {
+void CookieDecoder::decodeString(QByteArray(&data)) {
+    QString str(data);
 
     QStringList elements = str.split("$");
     if(elements.size() < 6) {

diff --git a/InPut/cookiedecoder.h b/InPut/cookiedecoder.h
@@ -11,7 +11,7 @@ class CookieDecoder : public QObject
 public:
     CookieDecoder();
     QString splitCharacter();
-    void decodeString(QString &str);
+    void decodeString(QByteArray &str);
 
 signals:
     void newValue(int id_capteur, int id_valeur, double valeur);

diff --git a/Logger21.pro b/Logger21.pro
@@ -28,7 +28,7 @@ SOURCES += \
     InPut/sensor.cpp \
     InPut/fileimportdialog.cpp \
     ChronoReader/chronoreaderwidget.cpp \
-    ChronoReader/TimeCalcs/timecalcs.cpp \
+    ChronoReader/TimeCalc/timecalcs.cpp \
     ChronoReader/eventbox.cpp \
     UI/graphicview.cpp \
     InPut/cookiedecoder.cpp \
@@ -47,7 +47,7 @@ HEADERS  += \
     InPut/sensor.h \
     InPut/fileimportdialog.h \
     ChronoReader/chronoreaderwidget.h \
-    ChronoReader/TimeCalcs/timecalcs.h \
+    ChronoReader/TimeCalc/timecalcs.h \
     ChronoReader/eventbox.h \
     UI/graphicview.h \
     InPut/cookiedecoder.h \
@@ -76,6 +76,5 @@ robotik {
 linusque {
     LIBS += /usr/lib/libqwt.so
     LIBS += -lqjson
-    LIBS += -lmuparser
 }