jfmartel/YULTek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modification de la configuration système et ajout des paramètres Cloud.

Browse Source
This commit is contained in:
jfmartel
2023-02-17 16:30:47 -05:00
parent 74b6a23045
commit 3ec5677dca
30 changed files with 13461 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/SystemConfig.cpp
+45 -22
View File
@@ -1,21 +1,29 @@
#include "SystemConfig.h"
#include "GeneralMessagesLogDispatcher.h"
CSystemConfig::CSystemConfig()
CSystemConfig::CSystemConfig() :
mSaveLocalLogFile(false)
{
}
int CSystemConfig::LoadConfig(QList<CCANDevice *> *DevicesList)
CSystemConfig::~CSystemConfig()
{
while(mCANDeviceConfigList.size() != 0)
{
delete mCANDeviceConfigList.takeAt(0);
}
}
int CSystemConfig::LoadConfig()
{
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Chargement de la configuration système..."));
if(DevicesList == 0)
{
qDebug("CSystemConfig: Trying to load a config into an invalid devices list");
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Échec de sauvegarde de la config système. Pointeur vers liste de devices invalide!!!"),true,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS);
return RET_GENERAL_ERROR;
}
// if(DevicesList == 0)
// {
// qDebug("CSystemConfig: Trying to load a config into an invalid devices list");
// CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Échec de sauvegarde de la config système. Pointeur vers liste de devices invalide!!!"),true,CGeneralMessagesLogDispatcher::GEN_MSG_TXT_ERROR_STATUS);
// return RET_GENERAL_ERROR;
// }
QFile* ConfigFile = new QFile("./Config/Station.cfg");
if(ConfigFile)
@@ -52,9 +60,10 @@ int CSystemConfig::LoadConfig(QList<CCANDevice *> *DevicesList)
*InputStream >> NbDevices;
for(int i = 0; i < NbDevices; i++)
{
CCANDeviceConfig NewDeviceConfig;
*InputStream >> NewDeviceConfig;
DevicesList->append(new CCANDevice(NewDeviceConfig));
CCANDeviceConfig *NewDeviceConfig = new CCANDeviceConfig;
*InputStream >> *NewDeviceConfig;
//DevicesList->append(new CCANDevice(NewDeviceConfig));
mCANDeviceConfigList.append(NewDeviceConfig);
}
@@ -66,13 +75,8 @@ int CSystemConfig::LoadConfig(QList<CCANDevice *> *DevicesList)
return RET_OK;
}
int CSystemConfig::SaveConfig(QList<CCANDeviceConfig *> *DevicesConfigList)
int CSystemConfig::SaveConfig()
{
if(DevicesConfigList == 0)
{
qDebug("CSystemConfig: Trying to save an invalid config list pointer");
return RET_GENERAL_ERROR;
}
CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Sauvegarde de la configuration système..."));
QFile *ConfigFile = new QFile("./Config/Station.cfg");
@@ -101,10 +105,10 @@ int CSystemConfig::SaveConfig(QList<CCANDeviceConfig *> *DevicesConfigList)
*OutputStream << FileVersion;
//Save the CAN devices config info
*OutputStream << DevicesConfigList->size(); //Number of devices
for(int i = 0; i < DevicesConfigList->size(); i++)
*OutputStream << mCANDeviceConfigList.size(); //Number of devices
for(int i = 0; i < mCANDeviceConfigList.size(); i++)
{
*OutputStream << *DevicesConfigList->at(i); //Add each device info to config file
*OutputStream << *mCANDeviceConfigList.at(i); //Add each device info to config file
}
ConfigFile->flush();
@@ -119,8 +123,27 @@ int CSystemConfig::SaveConfig(QList<CCANDeviceConfig *> *DevicesConfigList)
}
QList<CCANDeviceConfig*> * CSystemConfig::GetCANDevicesConfigList()
{
return &mCANDeviceConfigList;
}
int CSystemConfig::SetCANDevicesConfigList(QList<CCANDeviceConfig *> *DevicesConfigList)
{
if(DevicesConfigList == 0)
return RET_GENERAL_ERROR;
////////////Class CCANDeviceConfig implementation ////////////
while(mCANDeviceConfigList.size() != 0)
{
delete mCANDeviceConfigList.takeAt(0);
}
for(int i = 0; i < DevicesConfigList->size(); i++)
{
CCANDeviceConfig *NewDeviceConfig = new CCANDeviceConfig(*DevicesConfigList->at(i));
mCANDeviceConfigList.append(NewDeviceConfig);
}
return RET_OK;
}