2026年6月22日 :大量更新

This commit is contained in:
2026-06-22 08:51:10 +08:00
parent be39714c5e
commit 0fb69c2897
75 changed files with 1518 additions and 528 deletions
+25 -16
View File
@@ -23,10 +23,6 @@ LogInfo::LogInfo(QWidget *parent) :
{
ui->setupUi(this);
if (sysPara == nullptr) {
sysPara = SysPara::ins();
}
ui->textEditRunStatus->setReadOnly(true);
ui->textEditRunStatus_2->setReadOnly(true);
textEdit = ui->textEditRunStatus;
@@ -62,6 +58,10 @@ LogInfo::LogInfo(QWidget *parent) :
ui->label_11->setText(tr("齿轮泵转速"));
connect(ui->labelFaultResume,SIGNAL(pressed()),this,SIGNAL(faultTesumePress()));
timerCheckReclaimStatus = new QTimer(this);
connect(timerCheckReclaimStatus, &QTimer::timeout, this, &LogInfo::checkReclaimStatus);
timerCheckReclaimStatus->start(500);
}
LogInfo::~LogInfo()
@@ -514,6 +514,11 @@ void LogInfo::updateSysStatusToUI(const AlarmStatus& alarmStatus){
}
void LogInfo::bindSysPara(SysPara *sysPara)
{
this->sysPara = sysPara;
}
void LogInfo::checkState()
{
ui->tabWidget->setCurrentIndex(3);
@@ -636,6 +641,22 @@ void LogInfo::slt_cleanOver(bool flag)
}
}
void LogInfo::checkReclaimStatus()
{
static bool CleanUPEn=1,preCleanUP=0;
if(!sysPara->para.isCheckMagnet)
{
CleanUPEn = (sysPara->status.currReclaimTankPos<70) && (sysPara->status.statWarn & WARN_STATUS_HDINT);
}
else
{
CleanUPEn = (sysPara->status.currReclaimTankPos<70) ;
}
if(CleanUPEn != preCleanUP){
ui->btn_clean->setEnabled(CleanUPEn);
}
preCleanUP=CleanUPEn;
}
void LogInfo::lockUI()
{
@@ -664,16 +685,4 @@ void LogInfo::showEvent(QShowEvent *event)
// 先执行父类事件
QWidget::showEvent(event);
// 更新UI和状态
if (sysPara) {
if(!sysPara->para.isCheckMagnet)
{
ui->btn_clean->setEnabled( (sysPara->status.currReclaimTankPos<70)
&& (sysPara->status.statWarn & WARN_STATUS_HDINT));
}
else
{
ui->btn_clean->setEnabled( (sysPara->status.currReclaimTankPos<70) );
}
}
}