hlp:更新翻译、喷嘴到底后等至少3秒检查相检、状态机统一打印和回收槽状态、修复数字键盘输入bug
This commit is contained in:
+10
-4
@@ -1806,7 +1806,13 @@ void InkJetPrinter::initStateManager()
|
||||
this, &InkJetPrinter::slt_enableCloseTank, Qt::DirectConnection);
|
||||
// 更新回收槽状态
|
||||
connect(m_stateManager, &PrinterStateManager::sig_updateReclaimStatus,
|
||||
this, [=](){m_MainWidget->updateReclaimStatus();});
|
||||
this, [=](){m_MainWidget->updateReclaimText();});
|
||||
// 不能进入准备状态,关回收槽
|
||||
connect(m_stateManager, &PrinterStateManager::sig_closeTank,
|
||||
this, [=](){m_MainWidget->on_m_LeftBtn_clicked();});
|
||||
// 信息
|
||||
connect(m_stateManager, &PrinterStateManager::sig_infoMsg,
|
||||
this, [=](QString msg){m_MainWidget->setRunStatus(msg);});
|
||||
|
||||
// ============ 开机时重置状态 ============
|
||||
m_stateManager->initFromSysPara();
|
||||
@@ -2555,7 +2561,7 @@ void InkJetPrinter::autoControlViscosityPumpForSelfCheck(int selfCheckCnt)
|
||||
if(!sysPara->devOp->isViscosityPumpOpen()) {
|
||||
sysPara->devOp->controlViscosityPump(true);
|
||||
qDebug() << "Start test viscosity pump.";
|
||||
LogInfo::setRunStatusText("Start test viscosity pump.");
|
||||
// LogInfo::setRunStatusText("Start test viscosity pump.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2563,7 +2569,7 @@ void InkJetPrinter::autoControlViscosityPumpForSelfCheck(int selfCheckCnt)
|
||||
if(sysPara->devOp->isViscosityPumpOpen()) {
|
||||
sysPara->devOp->controlViscosityPump(false);
|
||||
qDebug() << "Stop test viscosity pump.";
|
||||
LogInfo::setRunStatusText("Stop test viscosity pump.");
|
||||
// LogInfo::setRunStatusText("Stop test viscosity pump.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2913,7 +2919,7 @@ bool InkJetPrinter::loadWorkFileAndPreparePrint(const QString &filename)
|
||||
|
||||
PrintSettingModel::applyToSysPara(model, sysPara);
|
||||
|
||||
ret = m_MainWidget->generatePrintContent(scene);
|
||||
ret = m_MainWidget->generatePrintContent(scene, model);
|
||||
if(!ret) {
|
||||
LogInfo::setRunStatusText(QString("Failed to generate print content from work file: %1").arg(filename));
|
||||
delete scene;
|
||||
|
||||
Reference in New Issue
Block a user