diff --git a/DevOp.cpp b/DevOp.cpp index 619254d..0cc3fc4 100644 --- a/DevOp.cpp +++ b/DevOp.cpp @@ -2700,30 +2700,23 @@ int DevOp::writeFpgaPrintPara(bool ignoreWarn){ QMessageBox::critical(NULL,tr("错误"),tr("在同步计米的情况下无打印串或显示区域为零")); } else { - // if(currPrintCol && type == 2){ - // int synNumPerCol = displayAreaTotalSynNum*(1<<8)/(currPrintCol*(1 + sysPara->para.charBold)); - // //加宽的时候,相当于列数翻倍 - // if(displayAreaTotalSynNum >= (1<<24)){ - // if(!ignoreWarn) - // QMessageBox::critical(NULL,tr("错误"),tr("在同步计米的情况下喷印同步脉冲数过多,请检查你的配置")); - // } - // if(synNumPerCol >= (1<< 16)){ - // if(!ignoreWarn) - // QMessageBox::critical(NULL,tr("警告"),tr("喷印字符串太短,请增加字符串长度或在打印设置中减少喷印长度")); - // } - // if(synNumPerCol < 5){ - // if(!ignoreWarn) - // QMessageBox::critical(NULL,tr("警告"),tr("喷印长度太短,请减少字符串长度或在打印设置中增加喷印长度")); - // } - // sysPara->para.synNumPerCol = synNumPerCol; - - // sysPara->para.synNumPerCol = sysPara->para.printColDelay << 8; - // }/ - if(currPrintCol){ - sysPara->para.synNumPerCol = sysPara->para.printColDelay << 8; + int synNumPerCol = displayAreaTotalSynNum*(1<<8)/(currPrintCol*(1 + sysPara->para.charBold)); + //加宽的时候,相当于列数翻倍 + if(displayAreaTotalSynNum >= (1<<24)){ + if(!ignoreWarn) + QMessageBox::critical(NULL,tr("错误"),tr("在同步计米的情况下喷印同步脉冲数过多,请检查你的配置")); + } + if(synNumPerCol >= (1<< 16)){ + if(!ignoreWarn) + QMessageBox::critical(NULL,tr("警告"),tr("喷印字符串太短,请增加字符串长度或在打印设置中减少喷印长度")); + } + if(synNumPerCol < 5){ + if(!ignoreWarn) + QMessageBox::critical(NULL,tr("警告"),tr("喷印长度太短,请减少字符串长度或在打印设置中增加喷印长度")); + } + sysPara->para.synNumPerCol = synNumPerCol; } - if(sysPara->para.synPulseNumPerMm<1 || sysPara->para.synPulseNumPerMm>50) { } sysPara->para.synPulsePerMmX8 = (unsigned short)((unsigned int)sysPara->para.synPulseNumPerMm <<8);