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 @@
Qt::StrongFocus
- 1
+ 0
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 ++:"<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 ;