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

Modification de l'interface pour la synchro de la date & heure Modbus.

Browse Source
This commit is contained in:
zonetest
2017-07-20 10:23:10 -04:00
parent a3cde7b718
commit da697ff567
7 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/GuiElements/GeneralSettingsPage.cpp
+17 -28
View File
@@ -124,6 +124,20 @@ CGeneralSettingsPage::CGeneralSettingsPage(QGraphicsWidget *Parent)
}
void CGeneralSettingsPage::UseNetworkTime(bool UseNetworkTime)
{
if(UseNetworkTime == true)
{
mUseNetworkTimeChkBx->setChecked(Qt::Checked);
mApplyDateTimeBtn->hide();
}
else
{
mUseNetworkTimeChkBx->setChecked(Qt::Unchecked);
mApplyDateTimeBtn->show();
}
}
void CGeneralSettingsPage::resizeEvent(QGraphicsSceneResizeEvent *event)
{
Q_UNUSED(event)
@@ -141,38 +155,11 @@ void CGeneralSettingsPage::ButtonClicked(CTextButtonWidget *BtnPtr)
}
else if(BtnPtr == mApplyDateTimeBtn)
{
QDateTime DateTime;
DateTime.setTime(mTimeEdit->time());
DateTime.setDate(mCalendarWidget->selectedDate());
CZTLog::instance()->AddLogString("Changement manuel de la date et l'heure",true);
mProgramHandle->SetSystemDateTime(&DateTime);
// time_t time_data = time(0);
// struct tm* tm_ptr = localtime(&time_data);
// tm_ptr->tm_min = mTimeEdit->time().minute();
// tm_ptr->tm_hour = mTimeEdit->time().hour();
// tm_ptr->tm_mday = mCalendarWidget->selectedDate().day();
// tm_ptr->tm_mon = mCalendarWidget->selectedDate().month()-1;
// tm_ptr->tm_year = mCalendarWidget->selectedDate().year()-1900;
// const struct timeval tv = {mktime(tm_ptr),0};
// if(settimeofday(&tv,0) < 0)
// {
// qDebug("Settimeofday failed");
// CZTLog::instance()->AddLogString("Échec du changement de la date & de l'heure",true);
// }
// else
// {
// if ( system("/sbin/hwclock --systohc") < 0 )
// {
// //qDebug("hwclock sync failed");
// CZTLog::instance()->AddLogString("Échec du changement de la date & de l'heure (hwsync failure)",true);
// }
// else
// CZTLog::instance()->AddLogString(QString().sprintf("Changement de date & heure: %s %s",mCalendarWidget->selectedDate().toString("yyyy/MM/dd").toUtf8().data(),mTimeEdit->time().toString("hh:mm").toUtf8().data()),true);
// }
}
else if(BtnPtr == mPGValueSetBtn)
{
@@ -195,10 +182,12 @@ void CGeneralSettingsPage::NetworkTimeChkBxClicked(int state)
if(state == Qt::Checked)
{
mApplyDateTimeBtn->hide();
mProgramHandle->UseNetworkTime(true);
}
else
{
mApplyDateTimeBtn->show();
mProgramHandle->UseNetworkTime(false);
}
}
sources/GuiElements/GeneralSettingsPage.h
+2
View File
@@ -52,6 +52,7 @@ public:
CZoneTest *mProgramHandle;
void UseNetworkTime(bool UseNetworkTime);
virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
@@ -67,6 +68,7 @@ private:
QTimeEdit *mTimeEdit;
QSpinBox *mPGTresholdValueSpinBox;
CTextButtonWidget *mPGValueSetBtn;
QGraphicsTextItem *mActualPGTresholdValueText;