hlp/VX5_KRO_GearPump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加内核logo程序更新；编辑界面打开时；所有item相对对齐到scene(0,0);

Browse Source
This commit is contained in:
byons
2026-07-23 10:50:05 +08:00
parent f1ae7ae898
commit 2a8b21c99c
9 changed files with 88 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
InkJetPrinter.cpp
+9 -10
View File
@@ -39,8 +39,8 @@ InkJetPrinter::InkJetPrinter(QWidget* parent)
QString ARM_Version;
ARM_Version.sprintf("%d.%d.%02d%s%s", UP_PRINTER_MAJOR_VER, UP_PRINTER_MINOR_VER,UP_PRINTER_RIVISION_VER,SUB_VERSION,SUB_RFID);
ui.label_version->setText(QString("A%1/F%2.%3.%4").arg(ARM_Version).arg(sysPara->status.fpgaVersionNum >> 12)
.arg((sysPara->status.fpgaVersionNum>>8) & 0x0f).arg(sysPara->status.fpgaVersionNum&0xff) );
// ui.label_version->setText(QString("A%1/F%2.%3.%4").arg(ARM_Version).arg(sysPara->status.fpgaVersionNum >> 12)
// .arg((sysPara->status.fpgaVersionNum>>8) & 0x0f).arg(sysPara->status.fpgaVersionNum&0xff) );
#ifdef ARCH_X86
@@ -120,7 +120,7 @@ void InkJetPrinter::init()
// TestPrintWidget::sendButtonClickedSignal(16) 转由 openDatetimeEditor 处理
connect(m_TestPrintWidget, &TestPrintWidget::sig_showEditDateTime, this, &InkJetPrinter::openDatetimeEditor);
connect(m_TestPrintWidget, &TestPrintWidget::sig_updatePrintContent, this, &InkJetPrinter::slt_updatePrintContent);
connect(m_TestPrintWidget, &TestPrintWidget::sig_switchWorkFileRequested, this, &InkJetPrinter::slt_updatePrintContent);
#ifndef FPGA_TEST
// 调入文件喷印时，主动重启打印
@@ -641,10 +641,7 @@ void InkJetPrinter::timerHandler(void){
bool InkSwintFlag = false,lastInkSwintFlag = false;
static float gearPumpRunNormalValue = 0.0;
if(sysPara){
ui.label_queue->setText(tr("%1/%2/%3").arg(sysPara->status.sizeFPGA).arg(sysPara->status.sizequeueFPGA).arg(sysPara->status.sizeSTM32));
ui.m_LabelTimer->setText(QDateTime::currentDateTime().toString("yyyy-MM-dd hh:mm:ss"));
ui.label_pressure->setText(QString("%1/%2").arg(sysPara->status.PRESSURE).arg(sysPara->para.pressure));
ui.label_speed->setText(QString("%1").arg(sysPara->status.gearPumpRunSpeed));
xxxm=1;
if(sysPara->para.flagOfModuleDecimal || sysPara->para.flagOfModuleHide){
sysPara->para.flagOfModuleDecimal = 0;
@@ -1524,14 +1521,14 @@ void InkJetPrinter::getMainWidgetButtonClickedSlot(int index)
case 1: { // 编辑当前文件
// 如果上次打开的文件不存在或者不是xml文件，则创建一个新的作业文件
QFileInfo fileInfo(sysPara->para.lastOpenedFileName);
if(!fileInfo.exists() || fileInfo.suffix() != "xml"){
if(currWorkFile.isEmpty()){
createNewJobFile();
break;
}
// 如果上次打开的文件存在且是xml文件，则直接打开该文件
m_TestPrintWidget->openWorkFile(sysPara->para.lastOpenedFileName);
QFileInfo fileInfo(currWorkFile);
m_TestPrintWidget->openWorkFile(currWorkFile);
ui.label_currEditFile->setText(QString("E: %1").arg(fileInfo.baseName()));
m_StackedWidget->setCurrentWidget(m_TestPrintWidget);
break;
@@ -2719,6 +2716,8 @@ bool InkJetPrinter::loadWorkFileAndPreparePrint(const QString &filename)
strncpy(sysPara->para.lastOpenedFileName, u8Filename.constData(), sizeof(sysPara->para.lastOpenedFileName) - 1);
sysPara->para.lastOpenedFileName[sizeof(sysPara->para.lastOpenedFileName) - 1] = '\0';
sysPara->saveParaToFile();
currWorkFile = filename;
if(rePrint) {
m_MainWidget->on_m_StartBtn_clicked();
@@ -2775,7 +2774,7 @@ void InkJetPrinter::disableTabClick(){
}
void InkJetPrinter::setShowVserionInfo(QString str){
ui.label_version->setText(str);
// ui.label_version->setText(str);
}
void InkJetPrinter::OnFinished(int event){