Modification au GUI de config du Watchdog vu que ce n'est pas un device dédié
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtWidgets/QCheckBox>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QGroupBox>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
@@ -45,6 +46,12 @@ public:
|
||||
QPushButton *mCancelModifyParamsBtn;
|
||||
QPlainTextEdit *mDeviceNameEditBx;
|
||||
QSpinBox *mCANDeviceIDSpinBx;
|
||||
QCheckBox *mCANDeviceWatchdogActivateChkBx;
|
||||
QSpinBox *mWatchdogPollPeriodSpinBx;
|
||||
QLabel *mRefreshRateLbl_2;
|
||||
QLabel *mWatchdogMsgIDLbl;
|
||||
QLabel *mWatchdogMsgIDPrefixLbl;
|
||||
QSpinBox *mWatchdogMsgIDSpinBx;
|
||||
QGroupBox *mDatabaseGroupBox;
|
||||
QLabel *mDBMessageNameLbl;
|
||||
QLabel *mDBMessageIDLbl;
|
||||
@@ -77,7 +84,7 @@ public:
|
||||
label_2->setGeometry(QRect(52, 100, 81, 16));
|
||||
mDeviceParamsGroupBox = new QGroupBox(CCANbusSettingsPage);
|
||||
mDeviceParamsGroupBox->setObjectName(QString::fromUtf8("mDeviceParamsGroupBox"));
|
||||
mDeviceParamsGroupBox->setGeometry(QRect(270, 100, 321, 371));
|
||||
mDeviceParamsGroupBox->setGeometry(QRect(270, 100, 321, 461));
|
||||
mCANIDLbl = new QLabel(mDeviceParamsGroupBox);
|
||||
mCANIDLbl->setObjectName(QString::fromUtf8("mCANIDLbl"));
|
||||
mCANIDLbl->setGeometry(QRect(10, 66, 121, 16));
|
||||
@@ -94,7 +101,7 @@ public:
|
||||
mCANBaudrateComboBx->setGeometry(QRect(100, 90, 131, 21));
|
||||
mModifyDevParamsBtn = new QPushButton(mDeviceParamsGroupBox);
|
||||
mModifyDevParamsBtn->setObjectName(QString::fromUtf8("mModifyDevParamsBtn"));
|
||||
mModifyDevParamsBtn->setGeometry(QRect(220, 330, 80, 22));
|
||||
mModifyDevParamsBtn->setGeometry(QRect(210, 420, 80, 22));
|
||||
mDeviceDescriptionTxtEdit = new QTextEdit(mDeviceParamsGroupBox);
|
||||
mDeviceDescriptionTxtEdit->setObjectName(QString::fromUtf8("mDeviceDescriptionTxtEdit"));
|
||||
mDeviceDescriptionTxtEdit->setGeometry(QRect(10, 210, 291, 101));
|
||||
@@ -121,7 +128,7 @@ public:
|
||||
mDevicePollPeriodSpinBx->setGeometry(QRect(200, 180, 91, 22));
|
||||
mCancelModifyParamsBtn = new QPushButton(mDeviceParamsGroupBox);
|
||||
mCancelModifyParamsBtn->setObjectName(QString::fromUtf8("mCancelModifyParamsBtn"));
|
||||
mCancelModifyParamsBtn->setGeometry(QRect(30, 330, 80, 22));
|
||||
mCancelModifyParamsBtn->setGeometry(QRect(20, 420, 80, 22));
|
||||
mDeviceNameEditBx = new QPlainTextEdit(mDeviceParamsGroupBox);
|
||||
mDeviceNameEditBx->setObjectName(QString::fromUtf8("mDeviceNameEditBx"));
|
||||
mDeviceNameEditBx->setGeometry(QRect(13, 23, 281, 31));
|
||||
@@ -131,6 +138,36 @@ public:
|
||||
mCANDeviceIDSpinBx->setGeometry(QRect(130, 60, 71, 22));
|
||||
mCANDeviceIDSpinBx->setMinimum(1);
|
||||
mCANDeviceIDSpinBx->setMaximum(255);
|
||||
mCANDeviceWatchdogActivateChkBx = new QCheckBox(mDeviceParamsGroupBox);
|
||||
mCANDeviceWatchdogActivateChkBx->setObjectName(QString::fromUtf8("mCANDeviceWatchdogActivateChkBx"));
|
||||
mCANDeviceWatchdogActivateChkBx->setGeometry(QRect(10, 320, 131, 20));
|
||||
mWatchdogPollPeriodSpinBx = new QSpinBox(mDeviceParamsGroupBox);
|
||||
mWatchdogPollPeriodSpinBx->setObjectName(QString::fromUtf8("mWatchdogPollPeriodSpinBx"));
|
||||
mWatchdogPollPeriodSpinBx->setGeometry(QRect(200, 350, 91, 20));
|
||||
mWatchdogPollPeriodSpinBx->setMinimum(100);
|
||||
mWatchdogPollPeriodSpinBx->setMaximum(999999);
|
||||
mWatchdogPollPeriodSpinBx->setValue(100);
|
||||
mWatchdogPollPeriodSpinBx->setDisplayIntegerBase(10);
|
||||
mRefreshRateLbl_2 = new QLabel(mDeviceParamsGroupBox);
|
||||
mRefreshRateLbl_2->setObjectName(QString::fromUtf8("mRefreshRateLbl_2"));
|
||||
mRefreshRateLbl_2->setGeometry(QRect(10, 350, 181, 16));
|
||||
mRefreshRateLbl_2->setFont(font1);
|
||||
mWatchdogMsgIDLbl = new QLabel(mDeviceParamsGroupBox);
|
||||
mWatchdogMsgIDLbl->setObjectName(QString::fromUtf8("mWatchdogMsgIDLbl"));
|
||||
mWatchdogMsgIDLbl->setGeometry(QRect(10, 380, 111, 16));
|
||||
mWatchdogMsgIDLbl->setFont(font1);
|
||||
mWatchdogMsgIDPrefixLbl = new QLabel(mDeviceParamsGroupBox);
|
||||
mWatchdogMsgIDPrefixLbl->setObjectName(QString::fromUtf8("mWatchdogMsgIDPrefixLbl"));
|
||||
mWatchdogMsgIDPrefixLbl->setGeometry(QRect(110, 380, 30, 20));
|
||||
mWatchdogMsgIDPrefixLbl->setFont(font1);
|
||||
mWatchdogMsgIDPrefixLbl->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||
mWatchdogMsgIDSpinBx = new QSpinBox(mDeviceParamsGroupBox);
|
||||
mWatchdogMsgIDSpinBx->setObjectName(QString::fromUtf8("mWatchdogMsgIDSpinBx"));
|
||||
mWatchdogMsgIDSpinBx->setGeometry(QRect(140, 380, 91, 20));
|
||||
mWatchdogMsgIDSpinBx->setMinimum(1);
|
||||
mWatchdogMsgIDSpinBx->setMaximum(999999);
|
||||
mWatchdogMsgIDSpinBx->setValue(1);
|
||||
mWatchdogMsgIDSpinBx->setDisplayIntegerBase(16);
|
||||
mDatabaseGroupBox = new QGroupBox(CCANbusSettingsPage);
|
||||
mDatabaseGroupBox->setObjectName(QString::fromUtf8("mDatabaseGroupBox"));
|
||||
mDatabaseGroupBox->setGeometry(QRect(620, 100, 711, 491));
|
||||
@@ -196,6 +233,10 @@ public:
|
||||
mDatabaseFileNameLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Fichier...", nullptr));
|
||||
mDatabaseFileSelectBtn->setText(QCoreApplication::translate("CCANbusSettingsPage", "...", nullptr));
|
||||
mCancelModifyParamsBtn->setText(QCoreApplication::translate("CCANbusSettingsPage", "Annuler", nullptr));
|
||||
mCANDeviceWatchdogActivateChkBx->setText(QCoreApplication::translate("CCANbusSettingsPage", "Activer Watchdog", nullptr));
|
||||
mRefreshRateLbl_2->setText(QCoreApplication::translate("CCANbusSettingsPage", "P\303\251riode rafra\303\256chissement (ms):", nullptr));
|
||||
mWatchdogMsgIDLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "CAN Msg ID (HEX):", nullptr));
|
||||
mWatchdogMsgIDPrefixLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "0x", nullptr));
|
||||
mDatabaseGroupBox->setTitle(QCoreApplication::translate("CCANbusSettingsPage", "Database", nullptr));
|
||||
mDBMessageNameLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Message Name: ", nullptr));
|
||||
mDBMessageIDLbl->setText(QCoreApplication::translate("CCANbusSettingsPage", "Message ID: ", nullptr));
|
||||
|
||||
Reference in New Issue
Block a user