Add UsctStateManager and add DmsState in GUI.
This commit is contained in:
@@ -98,8 +98,9 @@ WarningMessageWidget::WarningMessageWidget(QWidget *parent):QWidget(parent)
|
||||
clearBtn->setObjectName("WarningPanelBtn");
|
||||
hl->addWidget(clearBtn);
|
||||
connect(clearBtn, &QToolButton::clicked, this, &WarningMessageWidget::clearWarning);
|
||||
connect(EventCenter::Default(),&EventCenter::WarningMessageRaise,this,&WarningMessageWidget::addWarningProxySlot,Qt::QueuedConnection);
|
||||
connect(EventCenter::Default(),&EventCenter::ErrorStateUnactive,this,&WarningMessageWidget::unactiveErrorProxySlot,Qt::QueuedConnection);
|
||||
connect(EventCenter::Default(),&EventCenter::WarningMessageRaise,this,&WarningMessageWidget::addWarningProxySlot);
|
||||
connect(EventCenter::Default(),&EventCenter::ErrorStateUnactive,this,&WarningMessageWidget::unactiveErrorProxySlot);
|
||||
connect(EventCenter::Default(),&EventCenter::ErrorStateActive,this,&WarningMessageWidget::activeErrorProxySlot);
|
||||
|
||||
connect(EventCenter::Default(), &EventCenter::ReloadLanguage, this, &WarningMessageWidget::reloadLanguage);
|
||||
|
||||
@@ -137,7 +138,6 @@ void WarningMessageWidget::addWarningProxySlot(QObject*, QObject* aData)
|
||||
}
|
||||
|
||||
QString str = *((QString*)aData);
|
||||
delete (QString*)aData;
|
||||
activeError(601, "TestError");
|
||||
addWarning(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"), str);
|
||||
}
|
||||
@@ -149,18 +149,19 @@ void WarningMessageWidget::activeErrorProxySlot(QObject*, QObject* aData)
|
||||
return;
|
||||
}
|
||||
//TODO: real active error logic
|
||||
QString str = "Test Error";
|
||||
activeError(601, str);
|
||||
QPair<int, QString> state = *(QPair<int, QString>*)aData;
|
||||
activeError(state.first, state.second);
|
||||
}
|
||||
|
||||
void WarningMessageWidget::unactiveErrorProxySlot(QObject*, QObject* aData)
|
||||
{
|
||||
//TODO: real unactive error logic
|
||||
// if (!aData){
|
||||
// qDebug()<<"unactiveErrorProxy with null aData";
|
||||
// return;
|
||||
// }
|
||||
unactiveError(601);
|
||||
if (!aData){
|
||||
qDebug()<<"unactiveErrorProxy with null aData";
|
||||
return;
|
||||
};
|
||||
int stateCode = *(int*)aData;
|
||||
unactiveError(stateCode);
|
||||
}
|
||||
|
||||
void WarningMessageWidget::reloadLanguage()
|
||||
@@ -233,4 +234,3 @@ void WarningMessageWidget::showEvent(QShowEvent* aEvent)
|
||||
showAnimation->start();
|
||||
QWidget::showEvent(aEvent);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user