hlp:修复隐藏功能m显示不全的问题，需要搭配等宽的小数点，空格，数字和字母m使用，修改版本号为GuiLin版本

PrintSetting.cpp

@@ -417,13 +417,13 @@ void PrintSetting::showMachInfo(QString Mac)
 {
     QString VernonBach;
     VernonBach.sprintf("%s.%s.", MACHINAE_VER, PUMP_VER);
-    VernonBach = VernonBach + (QString) Public::DateToString(__DATE__)+"_";//+UP_PRINTER_STAGE_VER;
+    VernonBach = VernonBach + (QString) Public::DateToString(__DATE__)+"_"+SUB_VER;
 }
 void PrintSetting::showRemoteControl(QString SuperNodeIP,QString EdgeIP)
 {
     QString VernonBach;
     VernonBach.sprintf("%s.%s.", MACHINAE_VER, PUMP_VER);
-    VernonBach = VernonBach + (QString) Public::DateToString(__DATE__)+"_";//+UP_PRINTER_STAGE_VER;
+    VernonBach = VernonBach + (QString) Public::DateToString(__DATE__)+"_"+SUB_VER;
 }
 
 void PrintSetting::applyUIPara(){

SectionalCounting/sectionalwid.cpp

@@ -434,6 +434,11 @@ void SectionalWid::on_Cnt3AddRowBtn_2_clicked()
     }
     ui->tableWidget_2->setRowCount(rowCnt+1);
     rowWidgetCreate2(rowCnt);
+    // 获取新行第2列（索引为1）的 QSpinBox，设置值为 1
+    QSpinBox *spinBox = qobject_cast<QSpinBox*>(ui->tableWidget_2->cellWidget(rowCnt, 1));
+    if (spinBox) {
+        spinBox->setValue(1);
+    }
 }
 
 void SectionalWid::on_Cnt3InsertRowBtn_2_clicked()

TextEditOption.cpp

@@ -648,10 +648,8 @@ bool TextEditOption::maybeSave(){
         SectionalManager::instance()->emitCancelSection();
     	return true;
     }
-    else {
+    else
         return false;
-    }
-
 
 	return true;
 }
@@ -666,12 +664,13 @@ void TextEditOption::on_bottonNew_pressed()
         textEdit->clear();
 		fileName = "";
         sysPara->sysFile = "";
-        QFile file(fileName);
+		QFile file(fileName);
         emit fileNameChanged(QFileInfo(fileName).fileName());
 	}
 #ifdef   VARCOLOR
         textEdit->insertHtml(QString("<span style='background:#ffffff;color=#000000;'> &nbsp;<span />"));
 #endif
+
 }
 
 void TextEditOption::onOpenNewFile()
@@ -756,6 +755,9 @@ void TextEditOption::on_buttonInsertVari_pressed()
 
         unsigned char splitMode = sysPara->para.ExpirySplitMode;
         dialogInsertVari->getValue(&varType,&digitalNum,&splitMode);
+        if(sysPara->para.flagOfModuleDecimal || sysPara->para.flagOfModuleHide){
+            digitalNum += 1;
+        }
 
         fmt = textEdit->currentCharFormat();
 

VerBVersion.h

@@ -2,12 +2,13 @@
 #define VERBVERSION_H
 #include "myinclude.h"
 /*
-  VX5.D.0826.0100-C
+  VX5.D.0826.0100_Std(-C)
   MACHINAE_VER.PUMP_VER.MMdd.SUB_VER+SUB_RFID
 */
 #define MACHINAE_VER "VX5"
 #define PUMP_VER "D"
-#define SUB_VER "0100"
+//#define SUB_VER "0100"
+#define SUB_VER "GuiLin"
 
 #ifdef __RFID_OLD
 #define SUB_RFID "_RO"
@@ -17,14 +18,9 @@
 
 #ifdef __RFID_CARD
 #undef SUB_RFID
-#define SUB_RFID "_RFID"
+#define SUB_RFID "-C"
 #endif
 
-//#define UP_PRINTER_STAGE_VER  "Std"
-//#define UP_PRINTER_STAGE_VER  "Beta"
-//#define UP_PRINTER_STAGE_VER  "RC"
-//#define UP_PRINTER_STAGE_VER  "Release"
-
 
 #define VERNONBACH_VERSION(a,b,c) (((a)<<16) + ((b)<<8) + (c))
 

mainwindow.cpp

@@ -2046,20 +2046,15 @@ void MainWindow::enablePrintButton(bool enable){
     ui->pushButtonStopPrint->setEnabled(enable);
 }
 
-static int mainInkPumpCtrlStatus = 0;
-static int mainInkPumpCtrlCnt = 0;
-//100ms 为单位
 void MainWindow::airPushingProcess()
 {
     if(sysPara){
         if (sysPara->status.airPushing) {
-            
             setRunStatus(tr("正在排气 ..............."));
-
             //qDebug()<< "start airPushingProcess "<<sysPara->status.airPushingOnTime;
             // 执行排气 4 秒
             sysPara->status.airPushingOnTime += 100;
-            
+
             if(sysPara->para.airPushDurationSec <= 0 || sysPara->para.airPushDurationSec > 30) {
                 sysPara->para.airPushDurationSec = 4;
                 sysPara->saveParaToFile();
@@ -4590,8 +4585,9 @@ void MainWindow::UpdateUIVersion(){
     QString STM32Ver = QString("S:%1.%2.%3_B%4").arg((sysPara->status.stm32Verion>>16)&0x7F)
             .arg((sysPara->status.stm32Verion>>8) & 0xFF).arg(sysPara->status.stm32Verion&0xFF).arg(baudRateValue);
 
-    QString VernonBach = SUB_RFID;
+    QString VernonBach;
-//    VernonBach.sprintf("A%d.%d.%02d%s%s", UP_PRINTER_MAJOR_VER, UP_PRINTER_MINOR_VER,UP_PRINTER_RIVISION_VER,SUB_VERSION,SUB_RFID);
+    VernonBach.sprintf("%s.%s.", MACHINAE_VER, PUMP_VER);
+    VernonBach = VernonBach + (QString) Public::DateToString(__DATE__)+"_"+SUB_VER;
 
     QString Mac = QString::number(sysPara->status.machineMac);
     LogInfo::showVerionInformation(Mac,VernonBach,fpgaVersion,STM32Ver,sysPara->status.flagOfPowerOnMode);