Corrections & développement (suite)

Otarcik_CAN/Sources/CANBus/CANDevice.cpp

@@ -11,12 +11,6 @@ CCANDevice::CCANDevice(QObject *parent)
     mMessagesListLoaded = false;
     mCANAnalyzer.mDevicePtr = this;
     mProgramPtr = 0;
-//    mCANDeviceDatabaseFilename.clear();
-//    mCANDeviceID = -1;
-//    mCANDeviceBaudrate = -1;
-//    mDeviceDescription.clear();
-//    mDeviceName.clear();
-//    mDevicePollPeriod = 0;
 }
 
 CCANDevice::CCANDevice(CCANDeviceConfig &SysConfig, CMQTTClientWrapper *MQTTClient, QString DeviceTopicPrefix)
@@ -30,12 +24,6 @@ CCANDevice::CCANDevice(CCANDeviceConfig &SysConfig, CMQTTClientWrapper *MQTTClie
     mCANMQTTClient = MQTTClient;
     mDeviceTopicPrefix = DeviceTopicPrefix;
 
-//    mCANDeviceID = SysConfig.mCANDeviceID;
-//    mCANDeviceBaudrate = SysConfig.mCANDeviceBaudrate;
-//    mCANDeviceDatabaseFilename = SysConfig.mCANDeviceDatabaseFilename;
-//    mDeviceName = SysConfig.mDeviceName;
-//    mDeviceDescription = SysConfig.mDeviceDescription;
-//    mDevicePollPeriod = SysConfig.mDevicePollPeriod;
 }
 
 CCANDevice::~CCANDevice()
@@ -61,7 +49,6 @@ int CCANDevice::Init()
         if(mCANDatabase.BuildMessageList(&mMessageList,mDeviceConfigInfo.mDeviceName) == RET_OK)
         {
             mMessagesListLoaded = true;
-            mProgramPtr->InitCANViewer(&mMessageList,this);
         }
         else
         {
@@ -107,7 +94,7 @@ int CCANDevice::Init(QString DatabaseFileName, TPCANHandle CANDeviceID, TPCANBau
 int CCANDevice::NewMessageParsed(int BufferSize)
 {
     mCANDataLogger.LogNewData(&mMessageList);
-    mProgramPtr->UpdateCANViewerDataRequest(&mMessageList,mDeviceConfigInfo.mDeviceName);
+    mProgramPtr->UpdateCANViewerDataRequest(&mMessageList);
     mProgramPtr->UpdateCANModuleStatusRequest(mDeviceConfigInfo.mDeviceName,"NOUPDATE",QString("%1").arg(BufferSize));
 
     for(int i = 0; i < mMessageList.size(); i++)