修复 重启提示 丢失的问题

This commit is contained in:
2026-08-22 09:00:06 +08:00
parent 16781171a9
commit 950d0d0386
3 changed files with 21 additions and 5 deletions
+3 -3
View File
@@ -2645,7 +2645,7 @@ void InkJetPrinter::rebootApp()
sysPara->devOp->controlInkValve(false); sysPara->devOp->controlInkValve(false);
sysPara->devOp->controlInkValvePWM(false); sysPara->devOp->controlInkValvePWM(false);
} }
m_MainWidget->setRunStatus(tr("正在准备重启,请等待%1秒......").arg(i)); m_MainWidget->setRunStatus(tr("正在准备重启,请等待%1秒......").arg(i), false);
MySleep(1000); MySleep(1000);
} }
} }
@@ -2678,7 +2678,7 @@ void InkJetPrinter::rebootApp()
{ {
if(i==9) if(i==9)
sysPara->devOp->controlReclaimTankOpen(false); sysPara->devOp->controlReclaimTankOpen(false);
m_MainWidget->setRunStatus(tr("正在准备重启,请等待%1秒......").arg(i)); m_MainWidget->setRunStatus(tr("正在准备重启,请等待%1秒......").arg(i), false);
MySleep(1000); MySleep(1000);
} }
} }
@@ -2704,7 +2704,7 @@ void InkJetPrinter::rebootApp()
sysPara->para.gearPumpValue = 0; sysPara->para.gearPumpValue = 0;
sysPara->devOp->WriteMoterPump(); sysPara->devOp->WriteMoterPump();
} }
m_MainWidget->setRunStatus(tr("正在准备重启,请等待%1秒......").arg(i)); m_MainWidget->setRunStatus(tr("正在准备重启,请等待%1秒......").arg(i), false);
MySleep(1000); MySleep(1000);
} }
} }
+17 -1
View File
@@ -394,7 +394,7 @@ void MainWidget::powerOffConfirmed(){
qApp->exit(0); qApp->exit(0);
} }
void MainWidget::setRunStatus(QString str) void MainWidget::setRunStatus(QString str, bool enbRoll)
{ {
// 自检完成后,timerHandler中会发送停止打印的命令,导致“停止打印,自动关闭高压.”顶替掉“自检完成!!!”的情况 // 自检完成后,timerHandler中会发送停止打印的命令,导致“停止打印,自动关闭高压.”顶替掉“自检完成!!!”的情况
if(ui.lb_nozzleState->text() == qApp->translate("InkJetPrinter", "自检完成!!!") && if(ui.lb_nozzleState->text() == qApp->translate("InkJetPrinter", "自检完成!!!") &&
@@ -402,6 +402,20 @@ void MainWidget::setRunStatus(QString str)
return; return;
} }
qDebug() << str;
// 如果禁用走马灯(enbRoll == false),直接在label上显示文本(即使过长)
if (!enbRoll) {
if (ui.lb_nozzleState) {
// 先停止任何走马灯效果,保证文本直接显示
stopNozzleStateMarquee();
ui.lb_nozzleState->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
ui.lb_nozzleState->setText(str);
ui.lb_nozzleState->update();
}
return;
}
// 使用走马灯显示长文本
updateNozzleStateMarquee(str); updateNozzleStateMarquee(str);
} }
@@ -447,6 +461,8 @@ void MainWidget::updateNozzleStateMarquee(const QString& str)
m_nozzleStateMarqueeGapPx = qMax(20, labelWidth / 2); m_nozzleStateMarqueeGapPx = qMax(20, labelWidth / 2);
m_nozzleStateMarqueeOffsetPx = 0; m_nozzleStateMarqueeOffsetPx = 0;
m_nozzleStateMarqueeEnabled = true; m_nozzleStateMarqueeEnabled = true;
// 为走马灯绘制恢复居中对齐
ui.lb_nozzleState->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
ui.lb_nozzleState->setText(QString()); ui.lb_nozzleState->setText(QString());
ui.lb_nozzleState->update(); ui.lb_nozzleState->update();
+1 -1
View File
@@ -82,7 +82,7 @@ public:
int imageToPrintData(QImage& img, int startX, int startY); int imageToPrintData(QImage& img, int startX, int startY);
void generateCharRamData(); void generateCharRamData();
void setRunStatus(QString str); void setRunStatus(QString str, bool enbRoll = true);
void enablePrintButton(bool); void enablePrintButton(bool);
int getCurrPrintStatus(); int getCurrPrintStatus();