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

InkJetPrinter.cpp

@@ -26,7 +26,7 @@ InkJetPrinter::InkJetPrinter(QWidget *parent) :
     ui(new Ui::InkJetPrinter)
 {
     // 隐藏系统任务栏，隐藏后，如果需要激活任务栏，则需要呼出QtUI中的任意弹出式、非全屏窗口，然后使用鼠标将光标移动至屏幕最左侧或最顶部则可以呼出任务栏
-    int ret = system("xfconf-query -c xfce4-panel -p /panels/panel-0/autohide-behavior -s 2");
+    int ret = system("xfconf-query -c xfce4-panel -p /panels/panel-1/autohide-behavior -s 2");
     qInfo() << "Hide system panel ret:" << ret;
 
 //    system("ifconfig eth1 down");
@@ -52,13 +52,14 @@ InkJetPrinter::InkJetPrinter(QWidget *parent) :
     m_serialThreadFPGA = new QThread;
     serialFPGA = new Serial("/dev/ttyAS5");
 
+    connect(m_serialThreadFPGA,&QThread::started,serialFPGA,&Serial::startInitSlot);
 
     serialFPGA->moveToThread(m_serialThreadFPGA);
     connect(serialFPGA,SIGNAL(sendQueueData(int,int,unsigned char*,int,int)),sysPara->devOp,SLOT(resendFPGADate(int,int,unsigned char*,int,int)));
     connect(serialFPGA,SIGNAL(resendFPGAData(int,int,unsigned char*,int,int)),sysPara->devOp,SLOT(resendFPGADate(int,int,unsigned char*,int,int)));
     connect(sysPara->devOp,SIGNAL(sendSerialDataToFPGA(int,int,unsigned char*,int,int)),serialFPGA,SLOT(sendSerialData(int,int,unsigned char*,int,int)),Qt::QueuedConnection);
     connect(serialFPGA,SIGNAL(getFPGAVersion(uint)),this,SLOT(saveFPGAVersionNum(uint)));
-    connect(m_serialThreadFPGA,&QThread::started,serialFPGA,&Serial::startInitSlot);
+    
     connect(serialFPGA,SIGNAL(stopSendData(bool)),this,SLOT(stopSendFPGAData(bool)));
     connect(serialFPGA,SIGNAL(getFPGAPhaseDetectHighTm(unsigned char*)),this,SLOT(saveFPGAPhaseDetectHighTm(unsigned char*)));
     connect(serialFPGA,SIGNAL(getFPGAStatus(unsigned char*)),this,SLOT(saveFPGAStatus(unsigned char*)));
@@ -74,6 +75,9 @@ InkJetPrinter::InkJetPrinter(QWidget *parent) :
 
     m_serialThreadSTM32 = new QThread();
     serialSTM32 = new Serial("/dev/ttyAS2");
+
+    connect(m_serialThreadSTM32,&QThread::started,serialSTM32,&Serial::startInitSlot);
+
     serialSTM32->moveToThread(m_serialThreadSTM32);
     connect(serialSTM32,SIGNAL(sendQueueData(int,int,unsigned char*,int,int)),sysPara->devOp,SLOT(resendSTM32Date(int,int,unsigned char*,int,int)));
     connect(sysPara->devOp,SIGNAL(sendSerialDataToSTM32(int,int,unsigned char*,int,int)),serialSTM32,SLOT(sendSerialData(int,int,unsigned char*,int,int)));
@@ -84,7 +88,7 @@ InkJetPrinter::InkJetPrinter(QWidget *parent) :
     connect(serialSTM32,SIGNAL(getSTM32Time(unsigned char*)),this,SLOT(saveSTM32Time(unsigned char*)));
     connect(serialSTM32,SIGNAL(stopSendData(bool)),this,SLOT(stopSendSTM32Data(bool)));
     connect(serialSTM32,SIGNAL(powerOffReady()),ui->tabMainWindow,SLOT(powerOffConfirmed()));
-    connect(m_serialThreadSTM32,&QThread::started,serialSTM32,&Serial::startInitSlot);
+    
     connect(serialSTM32,SIGNAL(queueSizeSTM32(int)),ui->tabMainWindow,SLOT(showSTM32queuesize(int)));
     connect(ui->tabSystemManage,SIGNAL(upgradeSTM32(QString)),serialSTM32,SLOT(upgradeSTM32File(QString)));
     connect(ui->tabSystemManage,SIGNAL(enableClick(bool)),this,SLOT(enableInkJetTabClick(bool)));
@@ -183,9 +187,11 @@ InkJetPrinter::InkJetPrinter(QWidget *parent) :
     connect(ui->tabSystemSetting,SIGNAL(pressureAdjust()),this,SLOT(pressureAdjustForsystemseeting()));
 
 #ifdef COUNTER1_BY_GROUP /* 分段计米 */
-    connect(this,SIGNAL(updateCnt1GroupDisp(bool)),ui->tabPrintSetting,SLOT(onUpdateCnt1GroupDisp(bool)));
+    connect(this,SIGNAL(updateCnt1GroupDisp(bool)),
+            ui->tabPrintSetting,SLOT(onUpdateCnt1GroupDisp(bool)));
 #endif
-initCntGroup();
+    initCntGroup();
+
     msgtest = new QMessageBox(this);
     connect(msgtest, SIGNAL(finished(int)), this, SLOT(OnFinished(int)));
     msgBox1 = new QMessageBox(this);
@@ -253,7 +259,7 @@ initCntGroup();
     sysPara->status.FileChangeRestCntFlag=0;
     sysPara->status.HVFaultCloseEn=0;
     sysPara->devOp->printCtrl( PRINT_CTRL_STOP);
-    sysPara->devOp->writeFpgaCalandar(1);//
+    sysPara->devOp->writeFpgaCalandar(1);
     //qDebug()<<sysPara->para.calandar_and_dat.year;
     sysPara->status.cnt1GroupRunningIndex=0;
     //sysPara->status.cnt1RepeatCurrent=0;
@@ -704,6 +710,7 @@ void InkJetPrinter::initCntGroup()
     connect(this, &InkJetPrinter::sig_updateDisp,
             SectionalManager::instance(), &SectionalManager::sig_updateCntGroupDisp);
 }
+
 float PID_realize(float speed);
 
 struct _pid{
@@ -880,7 +887,7 @@ void InkJetPrinter::handleStoppedState(int err, bool canSwitch)
 
 // 启动爬升状态处理：从低转速逐步提升到工作转速
 void InkJetPrinter::handleStartingState(int err, int actual, int target)
-{
+    {
     const int STARTING_TO_RUNNING_RANGE = 30;  // 进入目标±50范围转到运行状态
     const float MAX_WORKING_SPEED = 350.0f;    // 最大工作转速
     const float START_SPEED_STEP_LARGE = 40.0f;
@@ -926,7 +933,7 @@ void InkJetPrinter::handleStartingState(int err, int actual, int target)
 
 // 运行微调状态处理：使用增量式控制算法
 void InkJetPrinter::handleRunningState(int err, bool canSwitch)
-{
+        {
     const int RUN_TO_STOP_THRESHOLD = 5;      // 压力高于目标10准备停泵（扩大滞环）
     const int EMERGENCY_STOP_THRESHOLD = 10;   // 压力高于目标20立即停泵（不受800ms限制）
 
@@ -1223,10 +1230,6 @@ void InkJetPrinter::timerHandler(void){
     static float gearPumpRunNormalValue = 0.0;
     if(sysPara){
         xxxm=1;
-        if(sysPara->para.flagOfModuleDecimal || sysPara->para.flagOfModuleHide){
-            sysPara->para.flagOfModuleDecimal = 0;
-            sysPara->para.flagOfModuleHide = 0;
-        }
 
         sysPara->para.ReadFileErrorCnt=0; // 正常打开文件
 
@@ -1558,8 +1561,18 @@ void InkJetPrinter::timerHandler(void){
                     sysPara->status.selfCheckDone = true;
                     ui->tabMainWindow->updatePrintDisplayLabel();
                 sysPara->status.flagOfAbnormalStatus = true;
+
+                static bool onceLog = true;
+                if(onceLog) {
                     LogInfo::setRunStatusText(tr("打印过程中死机了!!!"));
                     qDebug()<<"打印过程中死机了!!!";
+                    onceLog = false;
+
+                    ui->tabMainWindow->updatePrintDisplayLabel();
+                }
+
+                ui->tabMainWindow->on_pushButtonStopPrint_pressed();
+
             }
             if(!sysPara->status.selfCheckDone)
             {
@@ -1705,10 +1718,9 @@ void InkJetPrinter::timerHandler(void){
             if(sysPara->status.RandomNum>0)
                 sysPara->devOp->Read_RanddomFromFpga();
 #ifdef COUNTER1_BY_GROUP /* 分段计米 */
-//            cnt1GroupCheck();//分段计米
+            cnt1GroupCheck();//分段计米
-            cntGroupCheck();//分段计米
 #endif
-
+            cntGroupCheck();//分段计米
 
             QWidget *widget = this->currentWidget();
             static bool read_flag =  false;
@@ -1775,12 +1787,12 @@ void InkJetPrinter::timerHandler(void){
 
                     if(sysPara->para.speedoverPaushPrint) {
                         ui->tabMainWindow->on_pushButtonPausePrint_pressed();// 2014-03-19
-//                        emit OnSpeedOver(2);//QMessageBox::warning(NULL,tr("警告"),tr("喷印速度过快！无法喷印完全，自动暂停喷印!!!"));
+                        //                        emit OnSpeedOver(2);//QMessageBox::warning(NULL,tr("警告"),tr("喷印速度过快！无法喷印完全，自动暂停喷印!!!"));
                         ui->tabMainWindow->setRunStatus(tr("喷印速度过快！无法喷印完全，自动暂停喷印!!!"));
 
                     }
                     else {
-//                        emit OnSpeedOver(1);//QMessageBox::warning(NULL,tr("警告"),tr("喷印速度过快！无法喷印完全!!!"));
+                        //                        emit OnSpeedOver(1);//QMessageBox::warning(NULL,tr("警告"),tr("喷印速度过快！无法喷印完全!!!"));
                         ui->tabMainWindow->setRunStatus(tr("喷印速度过快！无法喷印完全!!!"));
                     }
 
@@ -2534,7 +2546,7 @@ void InkJetPrinter::autoControlValvePump(void)
                 hasDetectedBellow = false;
                 hasDetectedTop = false;
             }
-//            }
+            //            }
             /*-----------------------------------回收泵------------------------------------------*/
 
             if(!sysPara->status.autoCtlReclaimAfterSWintOff)
@@ -2650,10 +2662,10 @@ void InkJetPrinter::detectAndcontrolReclaimTank(){
     sysPara->status.currReclaimTankPos =10*sysPara->status.curr_reclaimTankTime;
     sysPara->status.reclaimTankBlockedAppending =0;
     //qDebug()<<sysPara->status.reclaimTankstatus;
-//    if(sysPara->status.currReclaimTankPos == 0)
+    //    if(sysPara->status.currReclaimTankPos == 0)
-//        ui->tabMainWindow->setReBootQtUIEnable(false);
+    //        ui->tabMainWindow->setReBootQtUIEnable(false);
-//     else
+    //     else
-//        ui->tabMainWindow->setReBootQtUIEnable(true);
+    //        ui->tabMainWindow->setReBootQtUIEnable(true);
 
     if(sysPara->status.reclaimTankstatus == 0x10) //7 故障，6 关完成，5开完成，4 保持， 3 停止， 2 关， 1 开，0-无操作
     {
@@ -3077,7 +3089,7 @@ void InkJetPrinter::sendDataManual(QString cmdstr,QString addrstr,QString datast
         unsigned char byte = static_cast<unsigned char>(byteString.toUInt(&ok, 16));
         data[i / 2] = byte;
     }
-//    quint16 data1[] = {68, 90, 108, 125, 141, 156, 170, 170, 180, 193, 204, 214};
+    //    quint16 data1[] = {68, 90, 108, 125, 141, 156, 170, 170, 180, 193, 204, 214};
     const char* charData = data.constData();
 
     // 转换为 unsigned char 指针
@@ -3392,4 +3404,3 @@ void InkJetPrinter::restartSerialPort(){
 
     flagOfSerialThreadStratEn = true;
 }
-

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;
 }
@@ -672,6 +670,7 @@ void TextEditOption::on_bottonNew_pressed()
 #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,16 +2046,11 @@ 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;
@@ -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);