2026年6月22日 :大量更新
This commit is contained in:
+23
-16
@@ -36,10 +36,6 @@ SystemSetting::SystemSetting(QWidget *parent) :
|
||||
|
||||
ui->setupUi(this);
|
||||
|
||||
if (sysPara == nullptr) {
|
||||
sysPara = SysPara::ins();
|
||||
}
|
||||
|
||||
progressBar.setGeometry(200,200,300,40); //将其放在最中间
|
||||
progressBar.hide();
|
||||
timer = new QTimer();
|
||||
@@ -59,9 +55,6 @@ SystemSetting::SystemSetting(QWidget *parent) :
|
||||
}
|
||||
|
||||
init();
|
||||
|
||||
ui->label->hide();
|
||||
ui->comboBoxEditMode->hide();
|
||||
}
|
||||
|
||||
SystemSetting::~SystemSetting()
|
||||
@@ -92,6 +85,7 @@ void SystemSetting::buttonClickedSlot()
|
||||
}else if(btn == ui->checkBtn){
|
||||
emit sendButtonClickedSignal(2);
|
||||
applyUIPara();
|
||||
sysPara->saveParaToFile();
|
||||
// SystemSettingLog();
|
||||
|
||||
int freq = sysPara->para.oscillatorFreqFix+ convertFreq(sysPara->para.oscillatoFreq);
|
||||
@@ -139,7 +133,6 @@ void SystemSetting::SystemSettingLog(){
|
||||
qDebug()<<QString("SystemSetting 回收槽开关时间: %1").arg(ui->spinBoxReclaimTankTime->value());
|
||||
qDebug()<<QString("SystemSetting 隔膜位置: %1").arg(ui->spinBoxSeptalPostion->value());
|
||||
qDebug()<<QString("SystemSetting 隔膜位置偏移:: %1").arg(ui->comboBoxDiaphramOffset->currentIndex());
|
||||
qDebug()<<QString("SystemSetting 信息编辑模式: %1").arg(ui->comboBoxEditMode->currentIndex());
|
||||
qDebug()<<QString("SystemSetting 压力:: %1").arg(ui->spinBoxPressure->value());
|
||||
qDebug()<<QString("SystemSetting 粘度: %1").arg(ui->spinBoxVIscosity->value());
|
||||
qDebug()<<QString("SystemSetting 喷头温度: %1").arg(ui->spinBoxTemperature->value());
|
||||
@@ -171,7 +164,6 @@ void SystemSetting::updateSysParaToUI(){
|
||||
|
||||
if(sysPara->para.EditMode>SCENE)
|
||||
sysPara->para.EditMode=TXTFILE;
|
||||
ui->comboBoxEditMode->setCurrentIndex(sysPara->para.EditMode);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -193,7 +185,6 @@ void SystemSetting::applyUIPara(){
|
||||
sysPara->para.viscosityAdjust = ui->ViscosityAdujstSelect->currentIndex();
|
||||
sysPara->para.oscillatoFreq = ui->comboBoxOscillatorFreq->currentIndex();
|
||||
sysPara->para.oscillatorFreqFix = ui->spinBoxOscillatorFreqFix->value();
|
||||
sysPara->para.EditMode = ui->comboBoxEditMode->currentIndex();
|
||||
sysPara->para.diameter = ui->comboBoxDiameter->currentIndex();// qDebug()<<"EditMode1"<<sysPara->para.EditMode;
|
||||
int freq = sysPara->para.oscillatorFreqFix+ convertFreq(sysPara->para.oscillatoFreq);
|
||||
|
||||
@@ -244,14 +235,23 @@ void SystemSetting::updateSysStatusToUI(){
|
||||
{
|
||||
setSpinBoxPressureMaxValue(5000);
|
||||
}
|
||||
|
||||
// 逆清洗使能判定
|
||||
static bool CleanUPEn=1,preCleanUP=0;
|
||||
if(!sysPara->para.isCheckMagnet)
|
||||
{
|
||||
ui->pushButtonCleanUP->setEnabled( (sysPara->status.currReclaimTankPos<70) && (sysPara->status.statWarn & WARN_STATUS_HDINT)); // sysPara->status.currReclaimTankPos
|
||||
CleanUPEn = (sysPara->status.currReclaimTankPos<70) && (sysPara->status.statWarn & WARN_STATUS_HDINT);
|
||||
}
|
||||
else
|
||||
{
|
||||
ui->pushButtonCleanUP->setEnabled( (sysPara->status.currReclaimTankPos<70) );
|
||||
CleanUPEn = (sysPara->status.currReclaimTankPos<70) ;
|
||||
}
|
||||
if(CleanUPEn != preCleanUP){
|
||||
ui->pushButtonCleanUP->setEnabled(CleanUPEn);
|
||||
}
|
||||
preCleanUP=CleanUPEn;
|
||||
|
||||
|
||||
if(sysPara->status.currReclaimTankPos<55 && sysPara->status.currReclaimTankPos>44 && enCleanUpAppendFlag==2)
|
||||
{
|
||||
if(timer2->isActive()) timer2->stop();
|
||||
@@ -280,6 +280,11 @@ void SystemSetting::updateSysStatusToUI(){
|
||||
}
|
||||
}
|
||||
|
||||
void SystemSetting::bindSysPara(SysPara *sysPara)
|
||||
{
|
||||
this->sysPara = sysPara;
|
||||
}
|
||||
|
||||
void SystemSetting::on_pushButtonCleanUP_pressed()
|
||||
{
|
||||
if(sysPara){
|
||||
@@ -452,10 +457,12 @@ void SystemSetting::ondialogAuthorizationAccepted()
|
||||
QMessageBox::Ok | QMessageBox::Cancel);
|
||||
|
||||
if (ret == QMessageBox::Ok){
|
||||
if((sysPara->status.statWarn & WARN_STATUS_HDINT)){
|
||||
QMessageBox::information(this,tr("错误"),tr("喷头盖未关,请先关喷头盖!"));
|
||||
return ;
|
||||
}
|
||||
|
||||
// 暂时不检测喷头盖 byons@2026年6月21日
|
||||
// if((sysPara->status.statWarn & WARN_STATUS_HDINT)){
|
||||
// QMessageBox::information(this,tr("错误"),tr("喷头盖未关,请先关喷头盖!"));
|
||||
// return ;
|
||||
// }
|
||||
lastHighVoltageOpen = sysPara->devOp->isHighVoltageOpen();
|
||||
|
||||
sysPara->status.detectHighVoltageAppending = true;
|
||||
|
||||
Reference in New Issue
Block a user