hlp/VX5-DiaphragmPump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hlp:分段计米部分bug修复，按需求不需要超级密码就可以使用分段计米

Browse Source
This commit is contained in:
kite_lucs
2026-08-28 17:37:05 +08:00
parent f29fafca9e
commit f7b7faab2e
11 changed files with 112 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PrintSetting.cpp
+63 -68
View File
@@ -139,9 +139,6 @@ PrintSetting::PrintSetting(QWidget *parent) :
current_print_col_num=0;
ui->tabWidget_2->addTab(ui->tab_11,tr("打印电压缩放"));
#ifdef COUNTER2_BY_GROUP
ui->secionCountPanel->hide();
#endif
}
PrintSetting::~PrintSetting()
@@ -197,7 +194,11 @@ void PrintSetting::bindSysPara(SysPara *sysPara){
this->sysPara =sysPara;
//ui->volDacEdit
//ui->volDacEdit->bindSysPara(sysPara);
if(sectionalWid) sectionalWid->bindSysPara(sysPara);
#ifdef COUNTER2_BY_GROUP
ui->secionCountPanel->hide();
ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
initSection();
#endif
}
void PrintSetting::PrintupdateSysParaToUI()
@@ -383,26 +384,24 @@ void PrintSetting::updateSysParaToUI(){
ModuleHideDisplay();
displayForAdjustVoltage(sysPara->para.flagOfAdjustVoltage);
// todo
LoadCnt1GroupSettingsToUI();
#ifdef COUNTER2_BY_GROUP
SectionalManager::instance()->emitLoadUI();
#else
LoadCnt1GroupSettingsToUI();
#endif
if(sysPara->para.mode0211 || sysPara->para.FullColFixVal)
{
ui->spinBoxStartVoltage->setEnabled(false);
ui->spinBoxEndVoltage->setEnabled(false);
}
if(sysPara->para.flagOfCnt1GroupDisp)
{
//edit@12-03
const int indexTab=ui->tabWidget_2->indexOf(ui->tab_9);
if(-1==indexTab) {
ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
}
}
// if(sysPara->para.flagOfCnt1GroupDisp)
// {
// //edit@12-03
// const int indexTab=ui->tabWidget_2->indexOf(ui->tab_9);
// if(-1==indexTab) {
// ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
// }
// }
if(sysPara->para.flagOfstepPrint)
{
//edit@12-03
@@ -423,8 +422,7 @@ void PrintSetting::showMachInfo(QString Mac)
void PrintSetting::showRemoteControl(QString SuperNodeIP,QString EdgeIP)
{
QString VernonBach;
// VernonBach.sprintf("%d.%d.%02d%s%s_", UP_PRINTER_MAJOR_VER, UP_PRINTER_MINOR_VER,UP_PRINTER_RIVISION_VER,SUB_VERSION,SUB_RFID);
VernonBach=SUB_RFID;
VernonBach.sprintf("%s.%s.", MACHINAE_VER, PUMP_VER);
VernonBach = VernonBach + (QString) Public::DateToString(__DATE__)+"_";//+UP_PRINTER_STAGE_VER;
}
@@ -480,7 +478,7 @@ void PrintSetting::applyUIPara(){
sysPara->status.cnt1CurrentValueInitDoneFlag = !ui->checkBoxResetCnt1CurrValue->isChecked();
sysPara->status.cnt2CurrentValueInitDoneFlag = !ui->checkBoxResetCnt2CurrValue->isChecked();
sysPara->status.cnt3CurrentValueInitDoneFlag = !ui->checkBoxResetCnt3CurrValue->isChecked();
//将vx4的分段计米功能迁移了，这个应用设置以及界面后续会删除 hlp todo 0602
//将vx4的分段计米功能迁移了，这个应用设置后续会删除 hlp todo 0602
#ifndef COUNTER2_BY_GROUP
if(sysPara->para.cnt1ByGroupEnalbe)
ApplyCnt1GroupSetting();
@@ -665,19 +663,6 @@ void PrintSetting::applyUIPara(){
ui->checkBoxResetCnt3CurrValue->setChecked(false);
emit checkPrintIntervalSignal();
// if(sysPara->para.EditMode==SCENE)
// {
// QList<QGraphicsItem *> items = pGetPicScene->selectedItems();
// if(items.size() > 0)
// {
// PicTextItem* picText = qgraphicsitem_cast<PicTextItem*>(items.at(0));
// picText->CatchCnt1StartValue = ui->lineEditStartValue->text().toInt();
// picText->CatchCnt1CurrValue = ui->lineEditCountValue->text().toInt();
// picText->SpecialConditions = ui->radioButtonSpecialCondition->isChecked();
// pGetPicScene->clearSelection();
// //emit SwitchTimerShowItem(true);
// }
// }
}
@@ -842,11 +827,11 @@ void PrintSetting::ondialogAuthorizationAccepted(){
ModuleDecimalDisplay();
ModuleHideDisplay();
displayForAdjustVoltage(sysPara->para.flagOfAdjustVoltage);
const int indexTab1=ui->tabWidget_2->indexOf(ui->tab_9);
if(sysPara->para.flagOfCnt1GroupDisp)
ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
else
ui->tabWidget_2->removeTab(indexTab1);
// const int indexTab1=ui->tabWidget_2->indexOf(ui->tab_9);
// if(sysPara->para.flagOfCnt1GroupDisp)
// ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
// else
// ui->tabWidget_2->removeTab(indexTab1);
const int indexTab2=ui->tabWidget->indexOf(ui->tab_6);
if(sysPara->para.flagOfstepPrint)
ui->tabWidget->addTab(ui->tab_6,tr("跳米设置"));
@@ -867,11 +852,11 @@ void PrintSetting::ondialogAuthorizationAccepted(){
ModuleDecimalDisplay();
ModuleHideDisplay();
displayForAdjustVoltage(sysPara->para.flagOfAdjustVoltage);
const int indexTab1=ui->tabWidget_2->indexOf(ui->tab_9);
if(sysPara->para.flagOfCnt1GroupDisp)
ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
else
ui->tabWidget_2->removeTab(indexTab1);
// const int indexTab1=ui->tabWidget_2->indexOf(ui->tab_9);
// if(sysPara->para.flagOfCnt1GroupDisp)
// ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
// else
// ui->tabWidget_2->removeTab(indexTab1);
const int indexTab2=ui->tabWidget->indexOf(ui->tab_6);
if(sysPara->para.flagOfstepPrint)
ui->tabWidget->addTab(ui->tab_6,tr("跳米设置"));
@@ -926,11 +911,11 @@ void PrintSetting::ondialogAuthorizationAccepted(){
sysPara->para.flagOfCnt1GroupDisp = true;
else
sysPara->para.flagOfCnt1GroupDisp = false;
const int indexTab1=ui->tabWidget_2->indexOf(ui->tab_9);
if(sysPara->para.flagOfCnt1GroupDisp)
ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
else
ui->tabWidget_2->removeTab(indexTab1);
// const int indexTab1=ui->tabWidget_2->indexOf(ui->tab_9);
// if(sysPara->para.flagOfCnt1GroupDisp)
// ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
// else
// ui->tabWidget_2->removeTab(indexTab1);
if (type & 1<<3)
sysPara->para.flagOfstepPrint = true;
@@ -968,11 +953,11 @@ void PrintSetting::ondialogAuthorizationAccepted(){
//edit@11-29 输入密码显示，再次输入隐藏
else if(authString == "07710441"){
//edit@12-03
const int indexTab=ui->tabWidget_2->indexOf(ui->tab_9);
if(sysPara->para.flagOfCnt1GroupDisp)
ui->tabWidget_2->removeTab(indexTab);
else
ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
// const int indexTab=ui->tabWidget_2->indexOf(ui->tab_9);
// if(sysPara->para.flagOfCnt1GroupDisp)
// ui->tabWidget_2->removeTab(indexTab);
// else
// ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
sysPara->para.flagOfCnt1GroupDisp=!sysPara->para.flagOfCnt1GroupDisp;
}
@@ -1066,7 +1051,9 @@ void PrintSetting::SpecailSettingsDisplay()
{
if(flagOfSpecailSettng)
{
ui->tabWidget_2->addTab(ui->tab_11,tr("打印电压缩放"));
const int indexTab=ui->tabWidget_2->indexOf(ui->tab_11);
if (indexTab == -1)
ui->tabWidget_2->addTab(ui->tab_11,tr("打印电压缩放"));
ui->comboBoxIndustry->setVisible(1);
ui->checkBoxNewAmplifyPlate->setVisible(1);
// ui->labelRecommendedPrintSpeed->setVisible(1);
@@ -1081,8 +1068,8 @@ void PrintSetting::SpecailSettingsDisplay()
{
if(flagOfEngineeringMode)
ui->tabWidget_2->removeTab(5);
else
ui->tabWidget_2->removeTab(4);
// else
// ui->tabWidget_2->removeTab(4);
ui->comboBoxIndustry->hide();
ui->checkBoxNewAmplifyPlate->hide();
// ui->labelRecommendedPrintSpeed->hide();
@@ -1099,14 +1086,17 @@ void PrintSetting::EngineeringModeDisplay()
{
if(flagOfEngineeringMode)
{
#ifdef COUNTER2_BY_GROUP
ui->tabWidget_2->addTab(ui->tab_9,tr("其他设置"));
// hlp test todo
#ifdef COUNTER2_BY_GROUP /* 分段计米 */
// 初始化先于bindSysPara
initSection();
#endif
if(flagOfSpecailSettng)
ui->tabWidget_2->addTab(ui->tab_11,tr("打印电压缩放"));
ui->tabWidget_2->addTab(sectionalWid, tr("分段计数"));
#endif
if(flagOfSpecailSettng) {
const int indexTab=ui->tabWidget_2->indexOf(ui->tab_11);
if (indexTab == -1)
ui->tabWidget_2->addTab(ui->tab_11,tr("打印电压缩放"));
}
ui->tabWidget->addTab(ui->tab_8,tr("计数器3设置"));
ui->tabWidget->addTab(ui->tab_6,tr("跳米设置"));
ui->checkBoxSpeedOver->setVisible(1);
@@ -1134,11 +1124,13 @@ void PrintSetting::EngineeringModeDisplay()
if(flagOfSpecailSettng)
{
ui->tabWidget_2->removeTab(5);
ui->tabWidget_2->removeTab(4);
ui->tabWidget_2->addTab(ui->tab_11,tr("打印电压缩放"));
const int indexTab=ui->tabWidget_2->indexOf(ui->tab_11);
if (indexTab == -1)
ui->tabWidget_2->addTab(ui->tab_11,tr("打印电压缩放"));
} else {
// ui->tabWidget_2->removeTab(4);
}
else
ui->tabWidget_2->removeTab(4);
ui->tabWidget->removeTab(3);
ui->tabWidget->removeTab(2);
ui->checkBoxSpeedOver->hide();
@@ -1491,6 +1483,7 @@ void PrintSetting::ApplyCnt1GroupSetting()
updateCnt1GroupsTblWgt();
#endif
}
void PrintSetting::rowWidgetCreate(int rowIndex)
{
#ifdef COUNTER1_BY_GROUP /* 分段计米 */
@@ -2308,8 +2301,10 @@ void PrintSetting::initSection()
ui->tabWidget_2->addTab(sectionalWid, tr("分段计数"));
connect(SectionalManager::instance(), &SectionalManager::sig_updateCntShow,
this, &PrintSetting::slt_updateCntShow);
SectionalManager::instance()->emitLoadUI();
}
// SectionalManager::instance()->emitLoadUI();
} /*else {
ui->tabWidget_2->addTab(sectionalWid, tr("分段计数"));
}*/
}
int tempReclaimTankStatus = 0;