Début de la ré-architecture

Otarcik_CAN/Sources/CANDatabase/CANDBMessage.cpp

@@ -0,0 +1,6 @@
+#include "CANDBMessage.h"
+
+CCANDBMessage::CCANDBMessage()
+{
+
+}

Otarcik_CAN/Sources/CANDatabase/CANDBMessage.h

@@ -0,0 +1,12 @@
+#ifndef CANDBMESSAGE_H
+#define CANDBMESSAGE_H
+#include "CANDBSignal.h"
+#include <QList>
+
+class CCANDBMessage
+{
+public:
+    CCANDBMessage();
+};
+
+#endif // CANDBMESSAGE_H

Otarcik_CAN/Sources/CANDatabase/CANDBSignal.cpp

@@ -0,0 +1,6 @@
+#include "CANDBSignal.h"
+
+CCANDBSignal::CCANDBSignal()
+{
+
+}

Otarcik_CAN/Sources/CANDatabase/CANDBSignal.h

@@ -0,0 +1,11 @@
+#ifndef CANDBSIGNAL_H
+#define CANDBSIGNAL_H
+
+
+class CCANDBSignal
+{
+public:
+    CCANDBSignal();
+};
+
+#endif // CANDBSIGNAL_H

Otarcik_CAN/Sources/CANDevice.cpp

@@ -0,0 +1,6 @@
+#include "CANDevice.h"
+
+CCANDevice::CCANDevice(QObject *parent)
+{
+
+}

Otarcik_CAN/Sources/CANDevice.h

@@ -0,0 +1,24 @@
+#ifndef CANDEVICE_H
+#define CANDEVICE_H
+
+#include <QObject>
+#include "CANAnalyzer.h"
+#include "CANMessage.h"
+#include "PCANInterface.h"
+#include "CANDatabase.h"
+#include <QList>
+
+class CCANDevice : public CCANDatabase, public CCANAnalyzer
+{
+    Q_OBJECT
+public:
+    explicit CCANDevice(QObject *parent = 0);
+
+    CCANAnalyzer mCANAnalyzer;
+
+signals:
+
+public slots:
+};
+
+#endif // CANDEVICE_H

Otarcik_CAN/Sources/OtarcikCan.cpp

@@ -18,18 +18,18 @@
 
 COtarcikCan::COtarcikCan(QObject *parent) : QObject(parent)
 {
-    mPCANInterface = new CPCANInterface;
-    mCANDatabase = new CCANDatabase;
-    mCANAnalyzer = new CCANAnalyzer(mPCANInterface);
+//    mPCANInterface = new CPCANInterface;
+//    mCANDatabase = new CCANDatabase;
+//    mCANAnalyzer = new CCANAnalyzer(mPCANInterface);
 
-    mCANAnalyzer->mProgramPtr = this;
+    //mCANAnalyzer->mProgramPtr = this;
 }
 
 COtarcikCan::~COtarcikCan()
 {
-    delete mCANAnalyzer;
-    delete mPCANInterface;
-    delete mCANDatabase;
+//    delete mCANAnalyzer;
+//    delete mPCANInterface;
+//    delete mCANDatabase;
 
 }
 
@@ -40,10 +40,10 @@ int COtarcikCan::Start()
     CGeneralMessagesLogDispatcher::instance()->BindGuiPageHandle(mMainWindow.mGeneralStatusPage);
     CGeneralMessagesLogDispatcher::instance()->Init();
 
-    mCANAnalyzer->Init(mPCANInterface,mCANDatabase);
+//    mCANAnalyzer->Init(mPCANInterface,mCANDatabase);
 
-    mCANDatabase->Init();
-    mCANDatabase->LoadDatabaseFile("");
+//    mCANDatabase->Init();
+//    mCANDatabase->LoadDatabaseFile("");
 
 
     return 0;

Otarcik_CAN/Sources/OtarcikCan.h

@@ -24,9 +24,9 @@ public:
 
 private:
 
-    CCANAnalyzer *mCANAnalyzer;
-    CPCANInterface *mPCANInterface;
-    CCANDatabase *mCANDatabase;
+//    CCANAnalyzer *mCANAnalyzer;
+//    CPCANInterface *mPCANInterface;
+//    CCANDatabase *mCANDatabase;
 
 
 signals: