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
Download Patch File Download Diff File Expand all files Collapse all files
Otarcik_CAN/Sources/Gui/ProgramSettingsPage.cpp → Otarcik_CAN/Sources/Gui/CANbusSettingsPage.cpp
+26 -27
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())
{
Otarcik_CAN/Sources/Gui/ProgramSettingsPage.h → Otarcik_CAN/Sources/Gui/CANbusSettingsPage.h
+8 -8
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
Otarcik_CAN/Sources/Gui/ProgramSettingsPage.ui → Otarcik_CAN/Sources/Gui/CANbusSettingsPage.ui
+3 -3
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>
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.cpp
+14
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;
}
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.h
+22
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
Otarcik_CAN/Sources/Gui/LoggingSettingsPage.ui
+37
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>
Otarcik_CAN/Sources/MainWindow.cpp
+7 -2
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);
}
Otarcik_CAN/Sources/MainWindow.h
+6 -4
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:
Otarcik_CAN/Sources/OtarcikCan.cpp
+4 -4
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