Ajout Watchdog hardware au programme + autres gossages
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
#include "QStringList"
|
||||
#include <QScrollBar>
|
||||
#include <QLibrary>
|
||||
#include "OtarcikCan.h"
|
||||
|
||||
CGeneralStatusPage::CGeneralStatusPage(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
@@ -11,6 +12,7 @@ CGeneralStatusPage::CGeneralStatusPage(QWidget *parent) :
|
||||
ui->setupUi(this);
|
||||
|
||||
connect(ui->mClearGenMsgTxtBtn,&QPushButton::clicked,this,&CGeneralStatusPage::ClearGenMsgAreaBtnPressed);
|
||||
connect(ui->mQuitAppBtn,&QPushButton::clicked,this,&CGeneralStatusPage::QuitAppBtnPressed);
|
||||
SetMQTTConnectionStatus(false);
|
||||
SetCANConnectionStatus(false);
|
||||
|
||||
@@ -194,3 +196,8 @@ int CGeneralStatusPage::UpdateCANModuleStatus(QString ModuleName, QString Module
|
||||
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
void CGeneralStatusPage::QuitAppBtnPressed()
|
||||
{
|
||||
mProgramPtr->QuitApplicationRequest();
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ namespace Ui {
|
||||
class CGeneralStatusPage;
|
||||
}
|
||||
|
||||
class COtarcikCan;
|
||||
|
||||
class CGeneralStatusPage : public QWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -24,6 +26,8 @@ public:
|
||||
GEN_STATUS_PG_MAX_TEXT_VALUE
|
||||
};
|
||||
|
||||
COtarcikCan *mProgramPtr;
|
||||
|
||||
explicit CGeneralStatusPage(QWidget *parent = 0);
|
||||
~CGeneralStatusPage();
|
||||
|
||||
@@ -45,6 +49,7 @@ private:
|
||||
|
||||
public slots:
|
||||
void ClearGenMsgAreaBtnPressed();
|
||||
void QuitAppBtnPressed();
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -153,6 +153,19 @@
|
||||
<string>Statut des module CAN </string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="mQuitAppBtn">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>1529</x>
|
||||
<y>560</y>
|
||||
<width>131</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Quitter l'application</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
||||
Reference in New Issue
Block a user