修复打印设置中输入框状态不正常的问题，修复计数器在最后一行时，打印内容高度不正确的问题

LogInfo.cpp

@@ -647,14 +647,7 @@ void LogInfo::checkReclaimStatus()
         return;
 
     static bool CleanUPEn=1,preCleanUP=0;
-    if(!sysPara->para.isCheckMagnet)
-    {
-        CleanUPEn = (sysPara->status.currReclaimTankPos<70) && (sysPara->status.statWarn & WARN_STATUS_HDINT);
-    }
-    else
-    {
     CleanUPEn = (sysPara->status.currReclaimTankPos<70) ;
-    }
     if(CleanUPEn != preCleanUP){
         ui->btn_clean->setEnabled(CleanUPEn);
     }

Printsetting.cpp

@@ -575,14 +575,14 @@ void PrintSetting::setEnableEleEyeSetting(bool flag){
     ui->labelEleEyeTriggerIntervalMs->setEnabled(!(ui->radioButtonSynTriggerExternal->isChecked() && ui->eleEyeEdgetTriggerInner->isChecked()));
     // ui->spinBoxEleEyeTriggerIntervalMs->setEnabled(!(ui->radioButtonSynTriggerExternal->isChecked() && ui->eleEyeEdgetTriggerInner->isChecked()));
     ui->spinBoxEleMaskTime->setEnabled(flag);
-    ui->spinBoxEleEyeTriggerRepeatCnt->setEnabled(flag);
+    // ui->spinBoxEleEyeTriggerRepeatCnt->setEnabled(flag);
     ui->radioButtonEleEyeEdgetTrigger->setEnabled(flag);
     ui->radioButtonEleEyeLevelTrigger->setEnabled(flag);
     
     ui->spinBoxEleEyeTriggerPrintDelay->setEnabled(flag);
 
-    ui->cb_unlimited->setEnabled(true);
+    // ui->cb_unlimited->setEnabled(true);
-    ui->cb_unlimited->setChecked(!flag);
+    // ui->cb_unlimited->setChecked(!flag);
 }
 
 void PrintSetting::on_eleEyeEdgetTriggerExternal_clicked()

Printsetting.ui

@@ -26,7 +26,7 @@
     <enum>Qt::StrongFocus</enum>
    </property>
    <property name="currentIndex">
-    <number>1</number>
+    <number>0</number>
    </property>
    <widget class="QWidget" name="tab">
     <attribute name="title">

SysPara.cpp

@@ -41,7 +41,7 @@ SysPara::SysPara(void):
     //qDebug()<<"cnt ++:"<<para.ReadFileErrorCnt;
     if(para.ReadFileErrorCnt>3  || para.PowerOnErrorCnt>4) {
         //loadDefaultPara();
-        memset( para.lastOpenedFileName,0,sizeof(para.lastOpenedFileName));
+        // memset( para.lastOpenedFileName,0,sizeof(para.lastOpenedFileName));
         if(para.ReadFileErrorCnt>=4 )
             para.ReadFileErrorCnt=0;
         if(para.PowerOnErrorCnt>=4)

mainwidget.cpp

@@ -1945,7 +1945,7 @@ void MainWidget::onPreviewScene()
             varPara.width = itemRect.width();
             varPara.height = itemRect.height();
             varPara.startColPos = itemRect.left();
-            varPara.endRowPos = itemRect.bottom() + 1;
+            varPara.endRowPos = itemRect.bottom() + 2;
             varPara.startRowPos = itemRect.top();
             varPara.currVal = 0;
             varPara.bold = 0;
@@ -1963,10 +1963,9 @@ void MainWidget::onPreviewScene()
             //                           "\n startRowPos=" + QString::number(varPara.startRowPos) +
             //                           "\n letterSpace=" + QString::number(varPara.letterSpace));
         }
-        else {
+
         pPicScene->render(&painter, itemRect, sourceRect);
     }
-    }
 
     sysPara->status.currPrintRow = sceneRect.height();
     sysPara->status.currPrintCol = sceneRect.width();

scene/PicCounterItem.cpp

@@ -64,7 +64,7 @@ void PicCounterItem::setCounter(COUNTER_TYPE type, int digitalNum)
     m_counterType = type;
     m_digitalNum = digitalNum;
     m_digitalImg = QImage(QString(":/%1/image/digitalWidth%2.bmp").arg(type).arg(digitalNum));
-    m_digitalImg = m_digitalImg.scaled(width*digitalNum, height + 1, Qt::IgnoreAspectRatio, Qt::FastTransformation);
+    m_digitalImg = m_digitalImg.scaled(width*digitalNum, height, Qt::IgnoreAspectRatio, Qt::FastTransformation);
     applyModify();
 
     qInfo() << "Counter item set to " << type ;