hlp:状态机初版,统一管理回收槽状态,启动和停止打印时的状态
This commit is contained in:
+15
-21
@@ -340,14 +340,6 @@ void SystemManage::on_pushButtonControlByHand_pressed()
|
||||
void SystemManage::on_pushButtonReclaimTankOpen_pressed()
|
||||
{
|
||||
if(sysPara){
|
||||
// if(!sysPara->para.isCheckMagnet)
|
||||
// {
|
||||
// if(!(sysPara->status.statWarn & WARN_STATUS_HDINT)){
|
||||
// QMessageBox::warning(this, tr("警告"),
|
||||
// tr("请先移开喷头盖!"));
|
||||
// return ;
|
||||
// }
|
||||
// }
|
||||
sysPara->devOp->controlReclaimTankOpen(!sysPara->devOp->isReclaimTankOpenEnable());
|
||||
ui->labelReclaimTankOpen->setText(sysPara->devOp->isReclaimTankOpenEnable()?tr("启动"):tr("停止"));
|
||||
sysPara->devOp->highVoltageCtrl(0);
|
||||
@@ -355,20 +347,13 @@ void SystemManage::on_pushButtonReclaimTankOpen_pressed()
|
||||
sysPara->status.reclainCloseAppending = false;
|
||||
sysPara->status.currReclaimOperationCnt = 0;
|
||||
sysPara->status.reclainTankReachEnd = false;
|
||||
sysPara->status.reclaimTankstatus = 1;
|
||||
}
|
||||
}
|
||||
|
||||
void SystemManage::on_pushButtonReclaimTankClose_pressed()
|
||||
{
|
||||
if(sysPara){
|
||||
// if(!sysPara->para.isCheckMagnet)
|
||||
// {
|
||||
// if(!(sysPara->status.statWarn & WARN_STATUS_HDINT)){
|
||||
// QMessageBox::warning(this, tr("警告"),
|
||||
// tr("请先移开喷头盖!"));
|
||||
// return ;
|
||||
// }
|
||||
// }
|
||||
sysPara->devOp->controlReclaimTankClose(!sysPara->devOp->isReclaimTankCloseEnable());
|
||||
ui->labelReclaimTankClose->setText(sysPara->devOp->isReclaimTankCloseEnable()?tr("启动"):tr("停止"));
|
||||
sysPara->devOp->highVoltageCtrl(0);
|
||||
@@ -376,6 +361,7 @@ void SystemManage::on_pushButtonReclaimTankClose_pressed()
|
||||
sysPara->status.reclainCloseAppending = true;
|
||||
sysPara->status.currReclaimOperationCnt = 0;
|
||||
sysPara->status.reclainTankReachEnd = false;
|
||||
sysPara->status.reclaimTankstatus = 2;
|
||||
}
|
||||
}
|
||||
#include <time.h>
|
||||
@@ -581,12 +567,20 @@ fi\n" ;
|
||||
|
||||
void SystemManage::on_pushButtonUpdateSoftware_pressed()
|
||||
{
|
||||
if(sysPara->status.updateSoftEN==0){
|
||||
dialogUpateMm->clearAuth();
|
||||
dialogUpateMm->show();
|
||||
}
|
||||
else ondialogAuthorizationAccepted();
|
||||
if(sysPara->status.updateSoftEN==0){
|
||||
QWidget *p = dialogUpateMm->parentWidget();
|
||||
if (p) {
|
||||
QPoint topLeft = p->mapToGlobal(QPoint(0, 0));
|
||||
int x = topLeft.x() + (p->width() - dialogUpateMm->width()) / 2;
|
||||
int y = topLeft.y() + (p->height() - dialogUpateMm->height()) / 2 - 100;
|
||||
dialogUpateMm->move(x, y);
|
||||
}
|
||||
dialogUpateMm->clearAuth();
|
||||
dialogUpateMm->show();
|
||||
}
|
||||
else ondialogAuthorizationAccepted();
|
||||
}
|
||||
|
||||
void SystemManage::ondialogAuthorizationAccepted()
|
||||
{
|
||||
QString authString= dialogUpateMm->getAuth();
|
||||
|
||||
Reference in New Issue
Block a user