From 775eb4daaa5207bd0303b2dbd9b1e8e6ae47f5cd Mon Sep 17 00:00:00 2001
From: Byons <buyongshi15@163.com>
Date: Thu, 30 Jul 2026 18:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E8=BE=93=E5=85=A5=E6=A1=86=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A1=E6=95=B0=E5=99=A8=E5=9C=A8=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E4=B8=80=E8=A1=8C=E6=97=B6=EF=BC=8C=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E9=AB=98=E5=BA=A6=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LogInfo.cpp              | 9 +--------
 Printsetting.cpp         | 6 +++---
 Printsetting.ui          | 2 +-
 SysPara.cpp              | 2 +-
 mainwidget.cpp           | 7 +++----
 scene/PicCounterItem.cpp | 2 +-
 6 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/LogInfo.cpp b/LogInfo.cpp
index 47631aa..7d13845 100644
--- a/LogInfo.cpp
+++ b/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) ;
-    }
+    CleanUPEn = (sysPara->status.currReclaimTankPos<70) ;
     if(CleanUPEn != preCleanUP){
         ui->btn_clean->setEnabled(CleanUPEn);
     }
diff --git a/Printsetting.cpp b/Printsetting.cpp
index 6077ccb..d74848d 100644
--- a/Printsetting.cpp
+++ b/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->setChecked(!flag);
+    // ui->cb_unlimited->setEnabled(true);
+    // ui->cb_unlimited->setChecked(!flag);
 }
 
 void PrintSetting::on_eleEyeEdgetTriggerExternal_clicked()
diff --git a/Printsetting.ui b/Printsetting.ui
index 73ebb5f..1c1141a 100644
--- a/Printsetting.ui
+++ b/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">
diff --git a/SysPara.cpp b/SysPara.cpp
index 2a10fc0..bcb32a9 100644
--- a/SysPara.cpp
+++ b/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)
diff --git a/mainwidget.cpp b/mainwidget.cpp
index 4821190..182d72c 100644
--- a/mainwidget.cpp
+++ b/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,9 +1963,8 @@ void MainWidget::onPreviewScene()
             //                           "\n startRowPos=" + QString::number(varPara.startRowPos) +
             //                           "\n letterSpace=" + QString::number(varPara.letterSpace));
         }
-        else {
-            pPicScene->render(&painter, itemRect, sourceRect);
-        }
+
+        pPicScene->render(&painter, itemRect, sourceRect);
     }
 
     sysPara->status.currPrintRow = sceneRect.height();
diff --git a/scene/PicCounterItem.cpp b/scene/PicCounterItem.cpp
index f2e8798..68663c8 100644
--- a/scene/PicCounterItem.cpp
+++ b/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 ;