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

Changement du nom de classe CProgramSettingsPage pour CCANbusSettingsPage

Browse Source
This commit is contained in:
jfmartel 2023-01-27 14:23:21 -05:00
parent 251825f7d5
commit eeb1d04f9b
20 changed files with 1820 additions and 808 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
Otarcik_CAN/Logs/SystemLog.txt
View File

@ -5208,3 +5208,88 @@ Démarrage du logiciel Otarcik CAN le 2023-01-27 à 13:28:52
2023-01-27 13:28:52 Dispositif [Module Parker] initialisé avec succès!
2023-01-27 13:29:50 Déinitialisation du module PCAN USB ID 81
2023-01-27 13:29:50 Module PCAN USB déinitialisé avec succès...
********************************************************************
Démarrage du logiciel Otarcik CAN le 2023-01-27 à 13:46:49
********************************************************************
2023-01-27 13:46:49 Démarrage du logiciel OtarcikCAN
2023-01-27 13:46:49 Chargement de la configuration système...
2023-01-27 13:46:49 Configuration système chargée avec succès!
2023-01-27 13:46:49 Initialisation du dispositif [Module Parker]
2023-01-27 13:46:49 Chargement de la base de données D:/Main/Dev/YULTek/Otarcik_CAN/IVT-S_all-variations_12082020.dbc
2023-01-27 13:46:49 Base de données chargée avec succès. Flags: 0x0
2023-01-27 13:46:49 Démarrage d'un module CAN...
2023-01-27 13:46:49 Initialisation d'un module PCAN. Channel:81, Baudrate:28
2023-01-27 13:46:49 Module PCAN USB initialisé avec succès
2023-01-27 13:46:49 Dispositif [Module Parker] initialisé avec succès!
2023-01-27 13:47:28 Déinitialisation du module PCAN USB ID 81
2023-01-27 13:47:28 Module PCAN USB déinitialisé avec succès...
********************************************************************
Démarrage du logiciel Otarcik CAN le 2023-01-27 à 13:57:19
********************************************************************
2023-01-27 13:57:19 Démarrage du logiciel OtarcikCAN
2023-01-27 13:57:19 Chargement de la configuration système...
2023-01-27 13:57:19 Configuration système chargée avec succès!
2023-01-27 13:57:19 Initialisation du dispositif [Module Parker]
2023-01-27 13:57:19 Chargement de la base de données D:/Main/Dev/YULTek/Otarcik_CAN/IVT-S_all-variations_12082020.dbc
2023-01-27 13:57:19 Base de données chargée avec succès. Flags: 0x0
2023-01-27 13:57:19 Démarrage d'un module CAN...
2023-01-27 13:57:19 Initialisation d'un module PCAN. Channel:81, Baudrate:28
2023-01-27 13:57:19 Module PCAN USB initialisé avec succès
2023-01-27 13:57:19 Dispositif [Module Parker] initialisé avec succès!
2023-01-27 13:57:26 Déinitialisation du module PCAN USB ID 81
2023-01-27 13:57:26 Module PCAN USB déinitialisé avec succès...
********************************************************************
Démarrage du logiciel Otarcik CAN le 2023-01-27 à 14:15:39
********************************************************************
2023-01-27 14:15:39 Démarrage du logiciel OtarcikCAN
2023-01-27 14:15:39 Chargement de la configuration système...
2023-01-27 14:15:39 Configuration système chargée avec succès!
2023-01-27 14:15:39 Initialisation du dispositif [Module Parker]
2023-01-27 14:15:39 Chargement de la base de données D:/Main/Dev/YULTek/Otarcik_CAN/IVT-S_all-variations_12082020.dbc
2023-01-27 14:15:39 Base de données chargée avec succès. Flags: 0x0
2023-01-27 14:15:39 Démarrage d'un module CAN...
2023-01-27 14:15:39 Initialisation d'un module PCAN. Channel:81, Baudrate:28
2023-01-27 14:15:39 Module PCAN USB initialisé avec succès
2023-01-27 14:15:39 Dispositif [Module Parker] initialisé avec succès!
2023-01-27 14:16:02 Déinitialisation du module PCAN USB ID 81
2023-01-27 14:16:02 Module PCAN USB déinitialisé avec succès...
********************************************************************
Démarrage du logiciel Otarcik CAN le 2023-01-27 à 14:17:31
********************************************************************
2023-01-27 14:17:31 Démarrage du logiciel OtarcikCAN
2023-01-27 14:17:31 Chargement de la configuration système...
2023-01-27 14:17:31 Configuration système chargée avec succès!
2023-01-27 14:17:31 Initialisation du dispositif [Module Parker]
2023-01-27 14:17:31 Chargement de la base de données D:/Main/Dev/YULTek/Otarcik_CAN/IVT-S_all-variations_12082020.dbc
2023-01-27 14:17:31 Base de données chargée avec succès. Flags: 0x0
2023-01-27 14:17:31 Démarrage d'un module CAN...
2023-01-27 14:17:31 Initialisation d'un module PCAN. Channel:81, Baudrate:28
2023-01-27 14:17:31 Module PCAN USB initialisé avec succès
2023-01-27 14:17:31 Dispositif [Module Parker] initialisé avec succès!
2023-01-27 14:18:26 Déinitialisation du module PCAN USB ID 81
2023-01-27 14:18:26 Module PCAN USB déinitialisé avec succès...
********************************************************************
Démarrage du logiciel Otarcik CAN le 2023-01-27 à 14:18:46
********************************************************************
2023-01-27 14:18:46 Démarrage du logiciel OtarcikCAN
2023-01-27 14:18:46 Chargement de la configuration système...
2023-01-27 14:18:46 Configuration système chargée avec succès!
2023-01-27 14:18:46 Initialisation du dispositif [Module Parker]
2023-01-27 14:18:46 Chargement de la base de données D:/Main/Dev/YULTek/Otarcik_CAN/IVT-S_all-variations_12082020.dbc
2023-01-27 14:18:46 Base de données chargée avec succès. Flags: 0x0
2023-01-27 14:18:46 Démarrage d'un module CAN...
2023-01-27 14:18:46 Initialisation d'un module PCAN. Channel:81, Baudrate:28
2023-01-27 14:18:46 Module PCAN USB initialisé avec succès
2023-01-27 14:18:46 Dispositif [Module Parker] initialisé avec succès!
2023-01-27 14:19:37 Déinitialisation du module PCAN USB ID 81
2023-01-27 14:19:37 Module PCAN USB déinitialisé avec succès...

1014
Otarcik_CAN/Makefile.Debug
View File

File diff suppressed because one or more lines are too long

1014
Otarcik_CAN/Makefile.Release
View File

File diff suppressed because one or more lines are too long

15
Otarcik_CAN/Otarcik_CAN.pro
View File

@ -36,7 +36,6 @@ SOURCES += Sources/main.cpp \
Sources/OtarcikCan.cpp \
Sources/Gui/GeneralStatusPage.cpp \
Sources/GeneralMessagesLogDispatcher.cpp \
Sources/Gui/ProgramSettingsPage.cpp \
Sources/CANAnalyzer.cpp \
Sources/CANMessage.cpp \
Sources/Gui/CANViewerPage.cpp \
@ -44,7 +43,9 @@ SOURCES += Sources/main.cpp \
Sources/CANDevice.cpp \
Sources/CANSignal.cpp \
Sources/SystemConfig.cpp \
Sources/CANDeviceConfig.cpp
Sources/CANDeviceConfig.cpp \
Sources/Gui/CANbusSettingsPage.cpp \
Sources/Gui/LoggingSettingsPage.cpp
HEADERS += Sources/MainWindow.h \
Sources/PCANInterface.h \
@ -52,7 +53,6 @@ HEADERS += Sources/MainWindow.h \
Sources/Gui/GeneralStatusPage.h \
Sources/GeneralMessagesLogDispatcher.h \
Sources/defines.h \
Sources/Gui/ProgramSettingsPage.h \
Sources/KVASER/kvaDbLib.h \
Sources/PCAN/PCANBasic.h \
Sources/CANAnalyzer.h \
@ -62,12 +62,15 @@ HEADERS += Sources/MainWindow.h \
Sources/CANDevice.h \
Sources/CANSignal.h \
Sources/SystemConfig.h \
Sources/CANDeviceConfig.h
Sources/CANDeviceConfig.h \
Sources/Gui/CANbusSettingsPage.h \
Sources/Gui/LoggingSettingsPage.h
FORMS += Sources/Gui/MainWindow.ui \
Sources/Gui/GeneralStatusPage.ui \
Sources/Gui/ProgramSettingsPage.ui \
Sources/Gui/CANViewerPage.ui
Sources/Gui/CANViewerPage.ui \
Sources/Gui/CANbusSettingsPage.ui \
Sources/Gui/LoggingSettingsPage.ui

53
Otarcik_CAN/Sources/Gui/ProgramSettingsPage.cpp → Otarcik_CAN/Sources/Gui/CANbusSettingsPage.cpp
View File

@ -1,5 +1,5 @@
#include "ProgramSettingsPage.h"
#include "ui_ProgramSettingsPage.h"
#include "CANbusSettingsPage.h"
#include "ui_CANbusSettingsPage.h"
#include "CANDevice.h"
#include <QFileDialog>
@ -8,9 +8,9 @@
#include "OtarcikCan.h"
CProgramSettingsPage::CProgramSettingsPage(QWidget *parent) :
CCANbusSettingsPage::CCANbusSettingsPage(QWidget *parent) :
QWidget(parent),
ui(new Ui::CProgramSettingsPage)
ui(new Ui::CCANbusSettingsPage)
{
ui->setupUi(this);
@ -69,19 +69,18 @@ CProgramSettingsPage::CProgramSettingsPage(QWidget *parent) :
ui->mDeviceNameEditBx->setEnabled(false);
connect(ui->mDevicesList,&QListWidget::itemSelectionChanged,this,&CProgramSettingsPage::DeviceSelectionChanged);
connect(ui->mDBMessagesListWidget,&QListWidget::itemSelectionChanged,this,&CProgramSettingsPage::MessageSelectionChanged);
connect(ui->mModifyDevParamsBtn,&QPushButton::clicked,this,&CProgramSettingsPage::ModifyDeviceBtnPressed);
connect(ui->mCancelModifyParamsBtn,&QPushButton::clicked,this,&CProgramSettingsPage::CancelModifyDevBtnPressed);
connect(ui->mDatabaseFileSelectBtn,&QPushButton::clicked,this,&CProgramSettingsPage::SelectDBFileBtnPressed);
connect(ui->mAddDeviceBtn,&QPushButton::clicked,this,&CProgramSettingsPage::AddDeviceBtnPressed);
connect(ui->mDeleteDeviceBtn,&QPushButton::clicked,this,&CProgramSettingsPage::DeleteDeviceBtnPressed);
connect(ui->mDevicesList,&QListWidget::itemSelectionChanged,this,&CCANbusSettingsPage::DeviceSelectionChanged);
connect(ui->mDBMessagesListWidget,&QListWidget::itemSelectionChanged,this,&CCANbusSettingsPage::MessageSelectionChanged);
connect(ui->mModifyDevParamsBtn,&QPushButton::clicked,this,&CCANbusSettingsPage::ModifyDeviceBtnPressed);
connect(ui->mCancelModifyParamsBtn,&QPushButton::clicked,this,&CCANbusSettingsPage::CancelModifyDevBtnPressed);
connect(ui->mDatabaseFileSelectBtn,&QPushButton::clicked,this,&CCANbusSettingsPage::SelectDBFileBtnPressed);
connect(ui->mAddDeviceBtn,&QPushButton::clicked,this,&CCANbusSettingsPage::AddDeviceBtnPressed);
connect(ui->mDeleteDeviceBtn,&QPushButton::clicked,this,&CCANbusSettingsPage::DeleteDeviceBtnPressed);
// connect(ui->mDBSignalDetailsTable,&QTableWidget::itemSelectionChanged,this,&CProgramSettingsPage::SignalSelectionChanged);
}
CProgramSettingsPage::~CProgramSettingsPage()
CCANbusSettingsPage::~CCANbusSettingsPage()
{
while(!mDeviceConfigList.isEmpty())
{
@ -91,7 +90,7 @@ CProgramSettingsPage::~CProgramSettingsPage()
delete ui;
}
int CProgramSettingsPage::SetDevicesList(QList<CCANDevice *> *DevicesList)
int CCANbusSettingsPage::SetDevicesList(QList<CCANDevice *> *DevicesList)
{
if(DevicesList == 0)
{
@ -122,13 +121,13 @@ int CProgramSettingsPage::SetDevicesList(QList<CCANDevice *> *DevicesList)
return RET_OK;
}
int CProgramSettingsPage::ClearDatabaseData()
int CCANbusSettingsPage::ClearDatabaseData()
{
ui->mDBMessagesListWidget->clear();
return RET_OK;
}
int CProgramSettingsPage::UpdatePage()
int CCANbusSettingsPage::UpdatePage()
{
int index = ui->mDevicesList->currentRow();
@ -186,7 +185,7 @@ int CProgramSettingsPage::UpdatePage()
return RET_OK;
}
int CProgramSettingsPage::UpdateMessageInformation()
int CCANbusSettingsPage::UpdateMessageInformation()
{
int index = ui->mDevicesList->currentRow();
@ -316,21 +315,21 @@ int CProgramSettingsPage::UpdateMessageInformation()
return RET_OK;
}
void CProgramSettingsPage::DeviceSelectionChanged()
void CCANbusSettingsPage::DeviceSelectionChanged()
{
UpdatePage();
}
void CProgramSettingsPage::SignalSelectionChanged()
void CCANbusSettingsPage::SignalSelectionChanged()
{
}
void CProgramSettingsPage::MessageSelectionChanged()
void CCANbusSettingsPage::MessageSelectionChanged()
{
UpdateMessageInformation();
}
void CProgramSettingsPage::ModifyDeviceBtnPressed()
void CCANbusSettingsPage::ModifyDeviceBtnPressed()
{
if(mDeviceChangeModeEnabled == false)
{
@ -350,7 +349,7 @@ void CProgramSettingsPage::ModifyDeviceBtnPressed()
ModifyDeviceConfig();
}
int CProgramSettingsPage::ModifyDeviceConfig()
int CCANbusSettingsPage::ModifyDeviceConfig()
{
if(mDeviceChangeModeEnabled)
{
@ -407,7 +406,7 @@ int CProgramSettingsPage::ModifyDeviceConfig()
return RET_OK;
}
void CProgramSettingsPage::CancelModifyDevBtnPressed()
void CCANbusSettingsPage::CancelModifyDevBtnPressed()
{
ui->mDeviceDescriptionTxtEdit->setEnabled(false);
ui->mDatabaseFileSelectBtn->hide();
@ -425,7 +424,7 @@ void CProgramSettingsPage::CancelModifyDevBtnPressed()
}
void CProgramSettingsPage::SelectDBFileBtnPressed()
void CCANbusSettingsPage::SelectDBFileBtnPressed()
{
QString FileName;
FileName = QFileDialog::getOpenFileName(this,tr("Fichier database"), "./", tr("Fichiers dbc (*.dbc)"));
@ -440,7 +439,7 @@ void CProgramSettingsPage::SelectDBFileBtnPressed()
}
void CProgramSettingsPage::AddDeviceBtnPressed()
void CCANbusSettingsPage::AddDeviceBtnPressed()
{
//Populate the devices config list with present devices
PopulateDevicesConfigList();
@ -467,7 +466,7 @@ void CProgramSettingsPage::AddDeviceBtnPressed()
ui->mAddDeviceBtn->setEnabled(false);
}
void CProgramSettingsPage::DeleteDeviceBtnPressed()
void CCANbusSettingsPage::DeleteDeviceBtnPressed()
{
//Populate the devices config list with present devices
@ -483,7 +482,7 @@ void CProgramSettingsPage::DeleteDeviceBtnPressed()
}
int CProgramSettingsPage::PopulateDevicesConfigList()
int CCANbusSettingsPage::PopulateDevicesConfigList()
{
while(!mDeviceConfigList.isEmpty())
{

16
Otarcik_CAN/Sources/Gui/ProgramSettingsPage.h → Otarcik_CAN/Sources/Gui/CANbusSettingsPage.h
View File

@ -1,5 +1,5 @@
#ifndef PROGRAMSETTINGSPAGE_H
#define PROGRAMSETTINGSPAGE_H
#ifndef CANBUSSETTINGSPAGE_H
#define CANBUSSETTINGSPAGE_H
#include <QWidget>
@ -11,16 +11,16 @@ class CCANDeviceConfig;
namespace Ui {
class CProgramSettingsPage;
class CCANbusSettingsPage;
}
class CProgramSettingsPage : public QWidget
class CCANbusSettingsPage : public QWidget
{
Q_OBJECT
public:
explicit CProgramSettingsPage(QWidget *parent = 0);
~CProgramSettingsPage();
explicit CCANbusSettingsPage(QWidget *parent = 0);
~CCANbusSettingsPage();
int SetDevicesList(QList<CCANDevice *> *DevicesList);
int ClearDatabaseData();
@ -32,7 +32,7 @@ public:
COtarcikCan *mProgramPtr;
private:
Ui::CProgramSettingsPage *ui;
Ui::CCANbusSettingsPage *ui;
const QList<CCANDevice *> *mDevicesList;
QList<CCANDeviceConfig*> mDeviceConfigList;
bool mDeviceChangeModeEnabled;
@ -52,4 +52,4 @@ public slots:
};
#endif // PROGRAMSETTINGSPAGE_H
#endif // CANBUSSETTINGSPAGE_H

6
Otarcik_CAN/Sources/Gui/ProgramSettingsPage.ui → Otarcik_CAN/Sources/Gui/CANbusSettingsPage.ui
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CProgramSettingsPage</class>
<widget class="QWidget" name="CProgramSettingsPage">
<class>CCANbusSettingsPage</class>
<widget class="QWidget" name="CCANbusSettingsPage">
<property name="geometry">
<rect>
<x>0</x>
@ -259,7 +259,7 @@
<rect>
<x>620</x>
<y>100</y>
<width>851</width>
<width>711</width>
<height>491</height>
</rect>
</property>

14
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.cpp Normal file
View File

@ -0,0 +1,14 @@
#include "LoggingSettingsPage.h"
#include "ui_LoggingSettingsPage.h"
CLoggingSettingsPage::CLoggingSettingsPage(QWidget *parent) :
QWidget(parent),
ui(new Ui::CLoggingSettingsPage)
{
ui->setupUi(this);
}
CLoggingSettingsPage::~CLoggingSettingsPage()
{
delete ui;
}

22
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.h Normal file
View File

@ -0,0 +1,22 @@
#ifndef LOGGINGSETTINGSPAGE_H
#define LOGGINGSETTINGSPAGE_H
#include <QWidget>
namespace Ui {
class CLoggingSettingsPage;
}
class CLoggingSettingsPage : public QWidget
{
Q_OBJECT
public:
explicit CLoggingSettingsPage(QWidget *parent = 0);
~CLoggingSettingsPage();
private:
Ui::CLoggingSettingsPage *ui;
};
#endif // LOGGINGSETTINGSPAGE_H

37
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.ui Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CLoggingSettingsPage</class>
<widget class="QWidget" name="CLoggingSettingsPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1142</width>
<height>460</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>500</x>
<y>20</y>
<width>191</width>
<height>16</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="text">
<string>Cloud Settings</string>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>

9
Otarcik_CAN/Sources/MainWindow.cpp
View File

@ -25,13 +25,18 @@ CMainWindow::CMainWindow(QWidget *parent) :
mGeneralStatusPage = new CGeneralStatusPage(this);
mMainWindowWidget = new QTabWidget(this);
mProgramSettingsPage = new CProgramSettingsPage(this);
mProgramsSettingsTabWidget = new QTabWidget(this);
mCANbusSettingsPage = new CCANbusSettingsPage(this);
mCANViewerPage = new CCANViewerPage(this);
mDataLoggingSettingsPage = new CLoggingSettingsPage(this);
mProgramsSettingsTabWidget->setTabPosition(QTabWidget::West);
setCentralWidget(mMainWindowWidget);
mMainWindowWidget->addTab(mGeneralStatusPage,"Statut");
mMainWindowWidget->addTab(mProgramSettingsPage,"Paramètres");
mMainWindowWidget->addTab(mProgramsSettingsTabWidget,"Paramètres");
mMainWindowWidget->addTab(mCANViewerPage,"Données CAN");
mProgramsSettingsTabWidget->addTab(mCANbusSettingsPage,"CAN Bus");
mProgramsSettingsTabWidget->addTab(mDataLoggingSettingsPage,"Archivage");
resize(1700,768);
}

10
Otarcik_CAN/Sources/MainWindow.h
View File

@ -6,9 +6,9 @@
#include <QTextEdit>
#include "GeneralStatusPage.h"
#include "ProgramSettingsPage.h"
#include "CANbusSettingsPage.h"
#include "CANViewerPage.h"
#include "LoggingSettingsPage.h"
namespace Ui {
class CMainWindow;
@ -22,10 +22,12 @@ public:
explicit CMainWindow(QWidget *parent = 0);
~CMainWindow();
QTabWidget *mMainWindowWidget;
QTabWidget *mMainWindowWidget, *mProgramsSettingsTabWidget;
CGeneralStatusPage *mGeneralStatusPage;
CProgramSettingsPage *mProgramSettingsPage;
CCANbusSettingsPage *mCANbusSettingsPage;
CCANViewerPage *mCANViewerPage;
CLoggingSettingsPage *mDataLoggingSettingsPage;
private:

8
Otarcik_CAN/Sources/OtarcikCan.cpp
View File

@ -37,7 +37,7 @@ COtarcikCan::~COtarcikCan()
int COtarcikCan::Start()
{
mMainWindow.mProgramSettingsPage->mProgramPtr = this;
mMainWindow.mCANbusSettingsPage->mProgramPtr = this;
mMainWindow.show();
@ -57,7 +57,7 @@ int COtarcikCan::Start()
}
mMainWindow.mProgramSettingsPage->SetDevicesList(&mCANDevicesList);
mMainWindow.mCANbusSettingsPage->SetDevicesList(&mCANDevicesList);
}
// CCANDevice *NewCANDevice = new CCANDevice();
// mCANDevicesList.append(NewCANDevice);
@ -66,7 +66,7 @@ int COtarcikCan::Start()
// NewCANDevice->Init("IVT-S_all-variations_12082020.dbc",PCAN_USBBUS1,PCAN_BAUD_500K,"Puck CAN USB branchée sur le module Parker qui contrôle la patente", "Module Parker",1000);
// SaveSystemConfigRequest();
mMainWindow.mProgramSettingsPage->SetDevicesList(&mCANDevicesList);
mMainWindow.mCANbusSettingsPage->SetDevicesList(&mCANDevicesList);
// NewCANDevice = new CCANDevice();
// mCANDevicesList.append(NewCANDevice);
@ -117,7 +117,7 @@ int COtarcikCan::SaveSystemConfigRequest(QList<CCANDeviceConfig *> *DevicesConfi
mCANDevicesList.at(i)->Init();
}
mMainWindow.mProgramSettingsPage->SetDevicesList(&mCANDevicesList);
mMainWindow.mCANbusSettingsPage->SetDevicesList(&mCANDevicesList);
}
}
else

BIN
Otarcik_CAN/debug/Otarcik_CAN.exe
View File

Binary file not shown.

50
Otarcik_CAN/debug/moc_ProgramSettingsPage.cpp
View File

@ -21,30 +21,30 @@
QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
struct qt_meta_stringdata_CProgramSettingsPage_t {
struct qt_meta_stringdata_CCANbusSettingsPage_t {
QByteArrayData data[10];
char stringdata0[207];
char stringdata0[206];
};
#define QT_MOC_LITERAL(idx, ofs, len) \
Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \
qptrdiff(offsetof(qt_meta_stringdata_CProgramSettingsPage_t, stringdata0) + ofs \
qptrdiff(offsetof(qt_meta_stringdata_CCANbusSettingsPage_t, stringdata0) + ofs \
- idx * sizeof(QByteArrayData)) \
)
static const qt_meta_stringdata_CProgramSettingsPage_t qt_meta_stringdata_CProgramSettingsPage = {
static const qt_meta_stringdata_CCANbusSettingsPage_t qt_meta_stringdata_CCANbusSettingsPage = {
{
QT_MOC_LITERAL(0, 0, 20), // "CProgramSettingsPage"
QT_MOC_LITERAL(1, 21, 22), // "DeviceSelectionChanged"
QT_MOC_LITERAL(2, 44, 0), // ""
QT_MOC_LITERAL(3, 45, 22), // "SignalSelectionChanged"
QT_MOC_LITERAL(4, 68, 23), // "MessageSelectionChanged"
QT_MOC_LITERAL(5, 92, 22), // "ModifyDeviceBtnPressed"
QT_MOC_LITERAL(6, 115, 25), // "CancelModifyDevBtnPressed"
QT_MOC_LITERAL(7, 141, 22), // "SelectDBFileBtnPressed"
QT_MOC_LITERAL(8, 164, 19), // "AddDeviceBtnPressed"
QT_MOC_LITERAL(9, 184, 22) // "DeleteDeviceBtnPressed"
QT_MOC_LITERAL(0, 0, 19), // "CCANbusSettingsPage"
QT_MOC_LITERAL(1, 20, 22), // "DeviceSelectionChanged"
QT_MOC_LITERAL(2, 43, 0), // ""
QT_MOC_LITERAL(3, 44, 22), // "SignalSelectionChanged"
QT_MOC_LITERAL(4, 67, 23), // "MessageSelectionChanged"
QT_MOC_LITERAL(5, 91, 22), // "ModifyDeviceBtnPressed"
QT_MOC_LITERAL(6, 114, 25), // "CancelModifyDevBtnPressed"
QT_MOC_LITERAL(7, 140, 22), // "SelectDBFileBtnPressed"
QT_MOC_LITERAL(8, 163, 19), // "AddDeviceBtnPressed"
QT_MOC_LITERAL(9, 183, 22) // "DeleteDeviceBtnPressed"
},
"CProgramSettingsPage\0DeviceSelectionChanged\0"
"CCANbusSettingsPage\0DeviceSelectionChanged\0"
"\0SignalSelectionChanged\0MessageSelectionChanged\0"
"ModifyDeviceBtnPressed\0CancelModifyDevBtnPressed\0"
"SelectDBFileBtnPressed\0AddDeviceBtnPressed\0"
@ -52,7 +52,7 @@ QT_MOC_LITERAL(9, 184, 22) // "DeleteDeviceBtnPressed"
};
#undef QT_MOC_LITERAL
static const uint qt_meta_data_CProgramSettingsPage[] = {
static const uint qt_meta_data_CCANbusSettingsPage[] = {
// content:
8, // revision
@ -88,10 +88,10 @@ static const uint qt_meta_data_CProgramSettingsPage[] = {
0 // eod
};
void CProgramSettingsPage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
void CCANbusSettingsPage::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
if (_c == QMetaObject::InvokeMetaMethod) {
auto *_t = static_cast<CProgramSettingsPage *>(_o);
auto *_t = static_cast<CCANbusSettingsPage *>(_o);
Q_UNUSED(_t)
switch (_id) {
case 0: _t->DeviceSelectionChanged(); break;
@ -108,30 +108,30 @@ void CProgramSettingsPage::qt_static_metacall(QObject *_o, QMetaObject::Call _c,
Q_UNUSED(_a);
}
QT_INIT_METAOBJECT const QMetaObject CProgramSettingsPage::staticMetaObject = { {
QT_INIT_METAOBJECT const QMetaObject CCANbusSettingsPage::staticMetaObject = { {
QMetaObject::SuperData::link<QWidget::staticMetaObject>(),
qt_meta_stringdata_CProgramSettingsPage.data,
qt_meta_data_CProgramSettingsPage,
qt_meta_stringdata_CCANbusSettingsPage.data,
qt_meta_data_CCANbusSettingsPage,
qt_static_metacall,
nullptr,
nullptr
} };
const QMetaObject *CProgramSettingsPage::metaObject() const
const QMetaObject *CCANbusSettingsPage::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
}
void *CProgramSettingsPage::qt_metacast(const char *_clname)
void *CCANbusSettingsPage::qt_metacast(const char *_clname)
{
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_CProgramSettingsPage.stringdata0))
if (!strcmp(_clname, qt_meta_stringdata_CCANbusSettingsPage.stringdata0))
return static_cast<void*>(this);
return QWidget::qt_metacast(_clname);
}
int CProgramSettingsPage::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
int CCANbusSettingsPage::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QWidget::qt_metacall(_c, _id, _a);
if (_id < 0)

6
Otarcik_CAN/object_script.Otarcik_CAN.Debug
View File

@ -4,7 +4,6 @@ debug/PCANInterface.o
debug/OtarcikCan.o
debug/GeneralStatusPage.o
debug/GeneralMessagesLogDispatcher.o
debug/ProgramSettingsPage.o
debug/CANAnalyzer.o
debug/CANMessage.o
debug/CANViewerPage.o
@ -13,12 +12,15 @@ debug/CANDevice.o
debug/CANSignal.o
debug/SystemConfig.o
debug/CANDeviceConfig.o
debug/CANbusSettingsPage.o
debug/LoggingSettingsPage.o
debug/moc_MainWindow.o
debug/moc_PCANInterface.o
debug/moc_OtarcikCan.o
debug/moc_GeneralStatusPage.o
debug/moc_ProgramSettingsPage.o
debug/moc_CANAnalyzer.o
debug/moc_CANViewerPage.o
debug/moc_CANDatabase.o
debug/moc_CANDevice.o
debug/moc_CANbusSettingsPage.o
debug/moc_LoggingSettingsPage.o

6
Otarcik_CAN/object_script.Otarcik_CAN.Release
View File

@ -4,7 +4,6 @@ release/PCANInterface.o
release/OtarcikCan.o
release/GeneralStatusPage.o
release/GeneralMessagesLogDispatcher.o
release/ProgramSettingsPage.o
release/CANAnalyzer.o
release/CANMessage.o
release/CANViewerPage.o
@ -13,12 +12,15 @@ release/CANDevice.o
release/CANSignal.o
release/SystemConfig.o
release/CANDeviceConfig.o
release/CANbusSettingsPage.o
release/LoggingSettingsPage.o
release/moc_MainWindow.o
release/moc_PCANInterface.o
release/moc_OtarcikCan.o
release/moc_GeneralStatusPage.o
release/moc_ProgramSettingsPage.o
release/moc_CANAnalyzer.o
release/moc_CANViewerPage.o
release/moc_CANDatabase.o
release/moc_CANDevice.o
release/moc_CANbusSettingsPage.o
release/moc_LoggingSettingsPage.o

206
Otarcik_CAN/ui_CANbusSettingsPage.h Normal file
View File

@ -0,0 +1,206 @@
/********************************************************************************
** Form generated from reading UI file 'CANbusSettingsPage.ui'
**
** Created by: Qt User Interface Compiler version 5.14.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef UI_CANBUSSETTINGSPAGE_H
#define UI_CANBUSSETTINGSPAGE_H
#include <QtCore/QVariant>
#include <QtWidgets/QApplication>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QListWidget>
#include <QtWidgets/QPlainTextEdit>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QSpinBox>
#include <QtWidgets/QTableWidget>
#include <QtWidgets/QTextEdit>
#include <QtWidgets/QWidget>
QT_BEGIN_NAMESPACE
class Ui_CCANbusSettingsPage
{
public:
QLabel *label;
QListWidget *mDevicesList;
QLabel *label_2;
QGroupBox *mDeviceParamsGroupBox;
QLabel *mCANIDLbl;
QComboBox *mCANIDComboBx;
QLabel *mCANBaudrateLbl;
QComboBox *mCANBaudrateComboBx;
QPushButton *mModifyDevParamsBtn;
QTextEdit *mDeviceDescriptionTxtEdit;
QLabel *mRefreshRateLbl;
QGroupBox *mDeviceDatabaseGrpBx;
QLabel *mDatabaseFileNameLbl;
QPushButton *mDatabaseFileSelectBtn;
QSpinBox *mDevicePollPeriodSpinBx;
QPushButton *mCancelModifyParamsBtn;
QPlainTextEdit *mDeviceNameEditBx;
QGroupBox *mDatabaseGroupBox;
QLabel *mDBMessageNameLbl;
QLabel *mDBMessageIDLbl;
QLabel *mDBMessageLengthLbl;
QLabel *mDBMessageNbSignalsLbl;
QListWidget *mDBMessagesListWidget;
QLabel *mDBMessageNameLbl_2;
QTableWidget *mDBSignalDetailsTable;
QPushButton *mAddDeviceBtn;
QPushButton *mDeleteDeviceBtn;
void setupUi(QWidget *CCANbusSettingsPage)
{
if (CCANbusSettingsPage->objectName().isEmpty())
CCANbusSettingsPage->setObjectName(QString::fromUtf8("CCANbusSettingsPage"));
CCANbusSettingsPage->resize(1475, 693);
label = new QLabel(CCANbusSettingsPage);
label->setObjectName(QString::fromUtf8("label"));
label->setGeometry(QRect(370, 20, 231, 21));
QFont font;
font.setPointSize(12);
label->setFont(font);
mDevicesList = new QListWidget(CCANbusSettingsPage);
mDevicesList->setObjectName(QString::fromUtf8("mDevicesList"));
mDevicesList->setGeometry(QRect(50, 120, 191, 301));
label_2 = new QLabel(CCANbusSettingsPage);
label_2->setObjectName(QString::fromUtf8("label_2"));
label_2->setGeometry(QRect(52, 100, 81, 16));
mDeviceParamsGroupBox = new QGroupBox(CCANbusSettingsPage);
mDeviceParamsGroupBox->setObjectName(QString::fromUtf8("mDeviceParamsGroupBox"));
mDeviceParamsGroupBox->setGeometry(QRect(270, 100, 321, 371));
mCANIDLbl = new QLabel(mDeviceParamsGroupBox);
mCANIDLbl->setObjectName(QString::fromUtf8("mCANIDLbl"));
mCANIDLbl->setGeometry(QRect(10, 60, 91, 16));
QFont font1;
font1.setPointSize(10);
mCANIDLbl->setFont(font1);
mCANIDComboBx = new QComboBox(mDeviceParamsGroupBox);
mCANIDComboBx->setObjectName(QString::fromUtf8("mCANIDComboBx"));
mCANIDComboBx->setEnabled(true);
mCANIDComboBx->setGeometry(QRect(100, 59, 131, 20));
mCANBaudrateLbl = new QLabel(mDeviceParamsGroupBox);
mCANBaudrateLbl->setObjectName(QString::fromUtf8("mCANBaudrateLbl"));
mCANBaudrateLbl->setGeometry(QRect(10, 90, 91, 16));
mCANBaudrateLbl->setFont(font1);
mCANBaudrateComboBx = new QComboBox(mDeviceParamsGroupBox);
mCANBaudrateComboBx->setObjectName(QString::fromUtf8("mCANBaudrateComboBx"));
mCANBaudrateComboBx->setEnabled(true);
mCANBaudrateComboBx->setGeometry(QRect(100, 90, 131, 21));
mModifyDevParamsBtn = new QPushButton(mDeviceParamsGroupBox);
mModifyDevParamsBtn->setObjectName(QString::fromUtf8("mModifyDevParamsBtn"));
mModifyDevParamsBtn->setGeometry(QRect(220, 330, 80, 22));
mDeviceDescriptionTxtEdit = new QTextEdit(mDeviceParamsGroupBox);
mDeviceDescriptionTxtEdit->setObjectName(QString::fromUtf8("mDeviceDescriptionTxtEdit"));
mDeviceDescriptionTxtEdit->setGeometry(QRect(10, 210, 291, 101));
mRefreshRateLbl = new QLabel(mDeviceParamsGroupBox);
mRefreshRateLbl->setObjectName(QString::fromUtf8("mRefreshRateLbl"));
mRefreshRateLbl->setGeometry(QRect(10, 182, 181, 16));
mRefreshRateLbl->setFont(font1);
mDeviceDatabaseGrpBx = new QGroupBox(mDeviceParamsGroupBox);
mDeviceDatabaseGrpBx->setObjectName(QString::fromUtf8("mDeviceDatabaseGrpBx"));
mDeviceDatabaseGrpBx->setGeometry(QRect(10, 120, 301, 51));
mDatabaseFileNameLbl = new QLabel(mDeviceDatabaseGrpBx);
mDatabaseFileNameLbl->setObjectName(QString::fromUtf8("mDatabaseFileNameLbl"));
mDatabaseFileNameLbl->setGeometry(QRect(10, 26, 291, 16));
QFont font2;
font2.setPointSize(10);
font2.setBold(true);
font2.setWeight(75);
mDatabaseFileNameLbl->setFont(font2);
mDatabaseFileSelectBtn = new QPushButton(mDeviceDatabaseGrpBx);
mDatabaseFileSelectBtn->setObjectName(QString::fromUtf8("mDatabaseFileSelectBtn"));
mDatabaseFileSelectBtn->setGeometry(QRect(270, 24, 31, 22));
mDevicePollPeriodSpinBx = new QSpinBox(mDeviceParamsGroupBox);
mDevicePollPeriodSpinBx->setObjectName(QString::fromUtf8("mDevicePollPeriodSpinBx"));
mDevicePollPeriodSpinBx->setGeometry(QRect(200, 180, 91, 22));
mCancelModifyParamsBtn = new QPushButton(mDeviceParamsGroupBox);
mCancelModifyParamsBtn->setObjectName(QString::fromUtf8("mCancelModifyParamsBtn"));
mCancelModifyParamsBtn->setGeometry(QRect(30, 330, 80, 22));
mDeviceNameEditBx = new QPlainTextEdit(mDeviceParamsGroupBox);
mDeviceNameEditBx->setObjectName(QString::fromUtf8("mDeviceNameEditBx"));
mDeviceNameEditBx->setGeometry(QRect(13, 23, 281, 31));
mDeviceNameEditBx->setFont(font1);
mDatabaseGroupBox = new QGroupBox(CCANbusSettingsPage);
mDatabaseGroupBox->setObjectName(QString::fromUtf8("mDatabaseGroupBox"));
mDatabaseGroupBox->setGeometry(QRect(620, 100, 711, 491));
mDBMessageNameLbl = new QLabel(mDatabaseGroupBox);
mDBMessageNameLbl->setObjectName(QString::fromUtf8("mDBMessageNameLbl"));
mDBMessageNameLbl->setGeometry(QRect(270, 30, 381, 16));
mDBMessageNameLbl->setFont(font1);
mDBMessageIDLbl = new QLabel(mDatabaseGroupBox);
mDBMessageIDLbl->setObjectName(QString::fromUtf8("mDBMessageIDLbl"));
mDBMessageIDLbl->setGeometry(QRect(270, 50, 171, 16));
mDBMessageIDLbl->setFont(font1);
mDBMessageLengthLbl = new QLabel(mDatabaseGroupBox);
mDBMessageLengthLbl->setObjectName(QString::fromUtf8("mDBMessageLengthLbl"));
mDBMessageLengthLbl->setGeometry(QRect(270, 70, 191, 16));
mDBMessageLengthLbl->setFont(font1);
mDBMessageNbSignalsLbl = new QLabel(mDatabaseGroupBox);
mDBMessageNbSignalsLbl->setObjectName(QString::fromUtf8("mDBMessageNbSignalsLbl"));
mDBMessageNbSignalsLbl->setGeometry(QRect(270, 90, 171, 16));
mDBMessageNbSignalsLbl->setFont(font1);
mDBMessagesListWidget = new QListWidget(mDatabaseGroupBox);
mDBMessagesListWidget->setObjectName(QString::fromUtf8("mDBMessagesListWidget"));
mDBMessagesListWidget->setGeometry(QRect(0, 40, 251, 201));
mDBMessageNameLbl_2 = new QLabel(mDatabaseGroupBox);
mDBMessageNameLbl_2->setObjectName(QString::fromUtf8("mDBMessageNameLbl_2"));
mDBMessageNameLbl_2->setGeometry(QRect(1, 23, 171, 16));
QFont font3;
font3.setPointSize(8);
mDBMessageNameLbl_2->setFont(font3);
mDBSignalDetailsTable = new QTableWidget(mDatabaseGroupBox);
mDBSignalDetailsTable->setObjectName(QString::fromUtf8("mDBSignalDetailsTable"));
mDBSignalDetailsTable->setGeometry(QRect(0, 250, 851, 241));
mAddDeviceBtn = new QPushButton(CCANbusSettingsPage);
mAddDeviceBtn->setObjectName(QString::fromUtf8("mAddDeviceBtn"));
mAddDeviceBtn->setGeometry(QRect(200, 420, 41, 22));
mDeleteDeviceBtn = new QPushButton(CCANbusSettingsPage);
mDeleteDeviceBtn->setObjectName(QString::fromUtf8("mDeleteDeviceBtn"));
mDeleteDeviceBtn->setGeometry(QRect(50, 420, 61, 22));
retranslateUi(CCANbusSettingsPage);
QMetaObject::connectSlotsByName(CCANbusSettingsPage);
} // setupUi
void retranslateUi(QWidget *CCANbusSettingsPage)
{
CCANbusSettingsPage->setWindowTitle(QCoreApplication::translate("CCANbusSettingsPage", "Form", nullptr));
label->setText(QCoreApplication::translate("CCANbusSettingsPage", "Param\303\250tres de la station Otarcik", nullptr));
label_2->setText(QCoreApplication::translate("CCANbusSettingsPage", "Dispositifs CAN", nullptr));
mDeviceParamsGroupBox->setTitle(QCoreApplication::translate("CCANbusSettingsPage", "Param\303\250tres", nullptr));
mCANIDLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Driver CAN ID:", nullptr));
mCANBaudrateLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "CAN Baudrate:", nullptr));
mModifyDevParamsBtn->setText(QCoreApplication::translate("CCANbusSettingsPage", "Modifier", nullptr));
mRefreshRateLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "P\303\251riode rafra\303\256chissement (ms):", nullptr));
mDeviceDatabaseGrpBx->setTitle(QCoreApplication::translate("CCANbusSettingsPage", "Fichier base de donn\303\251es", nullptr));
mDatabaseFileNameLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Fichier...", nullptr));
mDatabaseFileSelectBtn->setText(QCoreApplication::translate("CCANbusSettingsPage", "...", nullptr));
mCancelModifyParamsBtn->setText(QCoreApplication::translate("CCANbusSettingsPage", "Annuler", nullptr));
mDatabaseGroupBox->setTitle(QCoreApplication::translate("CCANbusSettingsPage", "Database", nullptr));
mDBMessageNameLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Message Name: ", nullptr));
mDBMessageIDLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Message ID: ", nullptr));
mDBMessageLengthLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Message Length", nullptr));
mDBMessageNbSignalsLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Number of signals: ", nullptr));
mDBMessageNameLbl_2->setText(QCoreApplication::translate("CCANbusSettingsPage", "Messages", nullptr));
mAddDeviceBtn->setText(QCoreApplication::translate("CCANbusSettingsPage", "Ajouter", nullptr));
mDeleteDeviceBtn->setText(QCoreApplication::translate("CCANbusSettingsPage", "Supprimer", nullptr));
} // retranslateUi
};
namespace Ui {
class CCANbusSettingsPage: public Ui_CCANbusSettingsPage {};
} // namespace Ui
QT_END_NAMESPACE
#endif // UI_CANBUSSETTINGSPAGE_H

55
Otarcik_CAN/ui_LoggingSettingsPage.h Normal file
View File

@ -0,0 +1,55 @@
/********************************************************************************
** Form generated from reading UI file 'LoggingSettingsPage.ui'
**
** Created by: Qt User Interface Compiler version 5.14.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
********************************************************************************/
#ifndef UI_LOGGINGSETTINGSPAGE_H
#define UI_LOGGINGSETTINGSPAGE_H
#include <QtCore/QVariant>
#include <QtWidgets/QApplication>
#include <QtWidgets/QLabel>
#include <QtWidgets/QWidget>
QT_BEGIN_NAMESPACE
class Ui_CLoggingSettingsPage
{
public:
QLabel *label;
void setupUi(QWidget *CLoggingSettingsPage)
{
if (CLoggingSettingsPage->objectName().isEmpty())
CLoggingSettingsPage->setObjectName(QString::fromUtf8("CLoggingSettingsPage"));
CLoggingSettingsPage->resize(1142, 460);
label = new QLabel(CLoggingSettingsPage);
label->setObjectName(QString::fromUtf8("label"));
label->setGeometry(QRect(500, 20, 191, 16));
QFont font;
font.setPointSize(10);
label->setFont(font);
retranslateUi(CLoggingSettingsPage);
QMetaObject::connectSlotsByName(CLoggingSettingsPage);
} // setupUi
void retranslateUi(QWidget *CLoggingSettingsPage)
{
CLoggingSettingsPage->setWindowTitle(QCoreApplication::translate("CLoggingSettingsPage", "Form", nullptr));
label->setText(QCoreApplication::translate("CLoggingSettingsPage", "Cloud Settings", nullptr));
} // retranslateUi
};
namespace Ui {
class CLoggingSettingsPage: public Ui_CLoggingSettingsPage {};
} // namespace Ui
QT_END_NAMESPACE
#endif // UI_LOGGINGSETTINGSPAGE_H

2
Otarcik_CAN/ui_ProgramSettingsPage.h → Otarcik_CAN/ui_ProgramSettingsPage.bak
View File

@ -60,7 +60,7 @@ public:
{
if (CProgramSettingsPage->objectName().isEmpty())
CProgramSettingsPage->setObjectName(QString::fromUtf8("CProgramSettingsPage"));
CProgramSettingsPage->resize(1475, 604);
CProgramSettingsPage->resize(1475, 693);
label = new QLabel(CProgramSettingsPage);
label->setObjectName(QString::fromUtf8("label"));
label->setGeometry(QRect(370, 20, 231, 21));