lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加json设置目标内存和硬盘容量大小，调整根据设备类型命名创建日志文件夹

This commit is contained in:
yangjiaxuan 2023-09-21 09:26:12 +08:00
parent 57c2b84ee1
commit 913f61636b
9 changed files with 126 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/HGProductionTool/ProductionTool_zh_CN.qm
View File

Binary file not shown.

182
app/HGProductionTool/ProductionTool_zh_CN.ts
View File

@ -130,35 +130,35 @@
<translation type="vanished">取消</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="470"/>
<location filename="dialog_inputserialnum.cpp" line="477"/>
<location filename="dialog_inputserialnum.cpp" line="486"/>
<location filename="dialog_inputserialnum.cpp" line="493"/>
<location filename="dialog_inputserialnum.cpp" line="462"/>
<location filename="dialog_inputserialnum.cpp" line="469"/>
<location filename="dialog_inputserialnum.cpp" line="478"/>
<location filename="dialog_inputserialnum.cpp" line="485"/>
<source>tips</source>
<translation>提示</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="418"/>
<location filename="dialog_inputserialnum.cpp" line="410"/>
<source>Speed mode</source>
<translation>速度模式</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="385"/>
<location filename="dialog_inputserialnum.cpp" line="377"/>
<source>Failed!</source>
<translation>失败!</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="392"/>
<location filename="dialog_inputserialnum.cpp" line="384"/>
<source>Succeed!</source>
<translation>成功!</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="428"/>
<location filename="dialog_inputserialnum.cpp" line="420"/>
<source>Sleep time</source>
<translation>休眠时间</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="437"/>
<location filename="dialog_inputserialnum.cpp" line="429"/>
<source>Vid and Pid</source>
<translation>Vid和Pid</translation>
</message>
@ -171,32 +171,32 @@
<translation type="vanished">检测到配置%1不一致，已重新配置，请再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="456"/>
<location filename="dialog_inputserialnum.cpp" line="448"/>
<source>Consistent configuration</source>
<translation>配置一致！</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="470"/>
<location filename="dialog_inputserialnum.cpp" line="462"/>
<source>device is lost</source>
<translation>设备已丢失</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="477"/>
<location filename="dialog_inputserialnum.cpp" line="469"/>
<source>Serial num is empty</source>
<translation>序列号为空</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="486"/>
<location filename="dialog_inputserialnum.cpp" line="478"/>
<source>sn is illegal</source>
<translation>序列号不合法</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="493"/>
<location filename="dialog_inputserialnum.cpp" line="485"/>
<source>The device is testing</source>
<translation>该设备正在进行测试</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="386"/>
<location filename="dialog_inputserialnum.cpp" line="378"/>
<source>set sn failed</source>
<translation>设置序列号失败</translation>
</message>
@ -206,80 +206,80 @@
<translation>设备名： %1</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="267"/>
<location filename="dialog_inputserialnum.cpp" line="259"/>
<source>Target Configration:</source>
<oldsource>Target Configration:
</oldsource>
<translation>目标配置:</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="133"/>
<location filename="dialog_inputserialnum.cpp" line="268"/>
<location filename="dialog_inputserialnum.cpp" line="295"/>
<location filename="dialog_inputserialnum.cpp" line="520"/>
<location filename="dialog_inputserialnum.cpp" line="125"/>
<location filename="dialog_inputserialnum.cpp" line="260"/>
<location filename="dialog_inputserialnum.cpp" line="287"/>
<location filename="dialog_inputserialnum.cpp" line="512"/>
<source>Speep mode: %1PPM</source>
<oldsource>Speep mode: %1PPM
</oldsource>
<translation>速度模式: %1PPM</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="361"/>
<location filename="dialog_inputserialnum.cpp" line="353"/>
<source>Pass</source>
<translation>Pass</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="133"/>
<location filename="dialog_inputserialnum.cpp" line="150"/>
<location filename="dialog_inputserialnum.cpp" line="174"/>
<location filename="dialog_inputserialnum.cpp" line="125"/>
<location filename="dialog_inputserialnum.cpp" line="142"/>
<location filename="dialog_inputserialnum.cpp" line="166"/>
<source>Set</source>
<translation>设置</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="150"/>
<location filename="dialog_inputserialnum.cpp" line="269"/>
<location filename="dialog_inputserialnum.cpp" line="296"/>
<location filename="dialog_inputserialnum.cpp" line="521"/>
<location filename="dialog_inputserialnum.cpp" line="142"/>
<location filename="dialog_inputserialnum.cpp" line="261"/>
<location filename="dialog_inputserialnum.cpp" line="288"/>
<location filename="dialog_inputserialnum.cpp" line="513"/>
<source>Sleep time: %1minute</source>
<oldsource>Sleep time: %1minute
</oldsource>
<translation>休眠时间: %1分钟</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="174"/>
<location filename="dialog_inputserialnum.cpp" line="270"/>
<location filename="dialog_inputserialnum.cpp" line="297"/>
<location filename="dialog_inputserialnum.cpp" line="522"/>
<location filename="dialog_inputserialnum.cpp" line="166"/>
<location filename="dialog_inputserialnum.cpp" line="262"/>
<location filename="dialog_inputserialnum.cpp" line="289"/>
<location filename="dialog_inputserialnum.cpp" line="514"/>
<source>Vid: %1 Pid: %2</source>
<oldsource>Vid: %1 Pid: %2
</oldsource>
<translation>Vid: %1 Pid: %2</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="294"/>
<location filename="dialog_inputserialnum.cpp" line="286"/>
<source>Current Configration of device:</source>
<translation>当前设备配置:</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="366"/>
<location filename="dialog_inputserialnum.cpp" line="358"/>
<source>Fail</source>
<translation>Fail</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="381"/>
<location filename="dialog_inputserialnum.cpp" line="385"/>
<location filename="dialog_inputserialnum.cpp" line="392"/>
<location filename="dialog_inputserialnum.cpp" line="373"/>
<location filename="dialog_inputserialnum.cpp" line="377"/>
<location filename="dialog_inputserialnum.cpp" line="384"/>
<source>Set serial number: %1 </source>
<translation>设置序列号: %1 </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="448"/>
<location filename="dialog_inputserialnum.cpp" line="532"/>
<location filename="dialog_inputserialnum.cpp" line="440"/>
<location filename="dialog_inputserialnum.cpp" line="524"/>
<source>Detected that the current device&apos;s vid-pid and device object are not consistent. </source>
<translation>检测到当前设备的vid-pid和设备对象不一致. </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="449"/>
<location filename="dialog_inputserialnum.cpp" line="533"/>
<location filename="dialog_inputserialnum.cpp" line="441"/>
<location filename="dialog_inputserialnum.cpp" line="525"/>
<source>Please reboot device to update. </source>
<translation>请重启设备刷新. </translation>
</message>
@ -300,23 +300,23 @@
<translation type="vanished">测试结果：成功！</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="422"/>
<location filename="dialog_inputserialnum.cpp" line="431"/>
<location filename="dialog_inputserialnum.cpp" line="414"/>
<location filename="dialog_inputserialnum.cpp" line="423"/>
<source>Inconsistent configuration %1detected, please reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重新配置后再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="440"/>
<location filename="dialog_inputserialnum.cpp" line="432"/>
<source>Inconsistent configuration %1detected, please reboot and reconfigure, and check again</source>
<translation>检测到配置 %1不一致，请重启后再次检查</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="524"/>
<location filename="dialog_inputserialnum.cpp" line="516"/>
<source>Set configuration to device </source>
<translation>将目标配置设置到设备 </translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="525"/>
<location filename="dialog_inputserialnum.cpp" line="517"/>
<source>Test content: </source>
<translation>测试内容： </translation>
</message>
@ -325,21 +325,21 @@
<translation type="vanished">成功，请检查配置</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="150"/>
<location filename="dialog_inputserialnum.cpp" line="269"/>
<location filename="dialog_inputserialnum.cpp" line="296"/>
<location filename="dialog_inputserialnum.cpp" line="521"/>
<location filename="dialog_inputserialnum.cpp" line="142"/>
<location filename="dialog_inputserialnum.cpp" line="261"/>
<location filename="dialog_inputserialnum.cpp" line="288"/>
<location filename="dialog_inputserialnum.cpp" line="513"/>
<source>Sleep time: Not sleeping</source>
<translation>休眠时间: 不休眠</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="381"/>
<location filename="dialog_inputserialnum.cpp" line="524"/>
<location filename="dialog_inputserialnum.cpp" line="373"/>
<location filename="dialog_inputserialnum.cpp" line="516"/>
<source>Tester: %1, Test item: %2</source>
<translation>测试员: %1, 测试项: %2</translation>
</message>
<message>
<location filename="dialog_inputserialnum.cpp" line="393"/>
<location filename="dialog_inputserialnum.cpp" line="385"/>
<source>set sn succeed</source>
<translation>设置序列号成功</translation>
</message>
@ -1371,7 +1371,7 @@
</message>
<message>
<location filename="form_maininterface.cpp" line="270"/>
<location filename="form_maininterface.cpp" line="608"/>
<location filename="form_maininterface.cpp" line="616"/>
<source>Not sleeping</source>
<translation>不休眠</translation>
</message>
@ -1398,65 +1398,63 @@
<translation type="vanished">设备序列号: %1, 测试项: %2, 测试结果: 通过!</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="775"/>
<location filename="form_maininterface.cpp" line="846"/>
<location filename="form_maininterface.cpp" line="783"/>
<location filename="form_maininterface.cpp" line="854"/>
<source>device history scan count:</source>
<translation>设备历史扫描张数：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="667"/>
<location filename="form_maininterface.cpp" line="671"/>
<location filename="form_maininterface.cpp" line="675"/>
<location filename="form_maininterface.cpp" line="679"/>
<location filename="form_maininterface.cpp" line="683"/>
<location filename="form_maininterface.cpp" line="687"/>
<source>Prompt</source>
<translation>提示</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="282"/>
<location filename="form_maininterface.cpp" line="287"/>
<source>please verify the size of the device&apos;s cpu and disk:</source>
<translation>请验证设备内存和硬盘容量大小：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="283"/>
<source>Cpu size:%1
</source>
<translation>内存大小:%1
<translation type="vanished">内存大小:%1
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="284"/>
<source>Disk size:%1
</source>
<translation>硬盘总容量大小:%1
<translation type="vanished">硬盘总容量大小:%1
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="358"/>
<location filename="form_maininterface.cpp" line="366"/>
<source>Tester: %1, Test item: %2, Test result: Failed! Reason: %3</source>
<translation>测试员: %1, 测试项: %2, 测试结果: 不通过! 原因: %3</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="383"/>
<location filename="form_maininterface.cpp" line="391"/>
<source>Tester: %1, Test item: %2, Test result: Pass!</source>
<translation>测试员: %1, 测试项: %2, 测试结果: 通过!</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="667"/>
<location filename="form_maininterface.cpp" line="675"/>
<source>No paper</source>
<translation>无纸</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="671"/>
<location filename="form_maininterface.cpp" line="679"/>
<source>Device is sleeping</source>
<translation>设备处于休眠模式</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="675"/>
<location filename="form_maininterface.cpp" line="683"/>
<source>Counting mode</source>
<translation>设备处于计数模式</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="679"/>
<location filename="form_maininterface.cpp" line="687"/>
<source>Other error</source>
<translation>其他错误</translation>
</message>
@ -1465,39 +1463,39 @@
<translation type="vanished">设备序列号：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="426"/>
<location filename="form_maininterface.cpp" line="434"/>
<source>ID</source>
<translation>序号</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="426"/>
<location filename="form_maininterface.cpp" line="434"/>
<source>Test items</source>
<translation>测试项</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="426"/>
<location filename="form_maininterface.cpp" line="434"/>
<source>status</source>
<translation>测试状态</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="502"/>
<location filename="form_maininterface.cpp" line="510"/>
<source>not test</source>
<translation>未测试</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="348"/>
<location filename="form_maininterface.cpp" line="502"/>
<location filename="form_maininterface.cpp" line="356"/>
<location filename="form_maininterface.cpp" line="510"/>
<source>not pass</source>
<translation>不通过</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="502"/>
<location filename="form_maininterface.cpp" line="510"/>
<source>not support</source>
<translation>不支持</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="378"/>
<location filename="form_maininterface.cpp" line="502"/>
<location filename="form_maininterface.cpp" line="386"/>
<location filename="form_maininterface.cpp" line="510"/>
<source>pass</source>
<translation>通过</translation>
</message>
@ -1523,14 +1521,14 @@
<translation type="vanished">Pid：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="769"/>
<location filename="form_maininterface.cpp" line="840"/>
<location filename="form_maininterface.cpp" line="777"/>
<location filename="form_maininterface.cpp" line="848"/>
<source>device roller count:</source>
<translation>设备滚轴张数：</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="203"/>
<location filename="form_maininterface.cpp" line="568"/>
<location filename="form_maininterface.cpp" line="576"/>
<source>image pixel: </source>
<translation>标准圆:宽 * 高: </translation>
</message>
@ -1555,7 +1553,27 @@
</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="610"/>
<location filename="form_maininterface.cpp" line="288"/>
<source>Target cpu size:%1</source>
<translation>目标内存大小：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="289"/>
<source>Target disk size:%1</source>
<translation>目标硬盘容量：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="291"/>
<source>Actual pu size:%1</source>
<translation>实际内存大小：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="292"/>
<source>Actual disk size:%1</source>
<translation>实际硬盘容量：%1</translation>
</message>
<message>
<location filename="form_maininterface.cpp" line="618"/>
<source> minute</source>
<translation> 分钟</translation>
</message>

4
app/HGProductionTool/analysisjson.cpp
View File

@ -56,7 +56,9 @@ AnalysisJson::json_global AnalysisJson::GetGlobal()
obj["pid-to"].toInt(),
obj["speed-mode"].toInt(),
obj["sleep-time"].toInt(),
obj["device-model"].toString()};
obj["device-model"].toString(),
obj["cpu-size"].toString(),
obj["disk-size"].toString()};
}

2
app/HGProductionTool/analysisjson.h
View File

@ -26,6 +26,8 @@ public:
std::int32_t speed_mode;
std::int32_t sleep_time;
QString device_model;
QString cpu_size;
QString disk_size;
};
AnalysisJson() = delete ;

2
app/HGProductionTool/dialog_inputserialnum.cpp
View File

@ -302,7 +302,7 @@ QString Dialog_InputSerialNum::getLogPath()
strcat(logPath, m_devType.toStdString().c_str());
strcat(logPath, "/");
return getCfgValue("save", "logPath", getStdFileName(StdStringToUtf8(logPath).c_str()));
return getCfgValue(m_devType.toStdString().c_str(), "logPath", getStdFileName(StdStringToUtf8(logPath).c_str()));
}
void Dialog_InputSerialNum::writeTestLog(QString logContent)

5
app/HGProductionTool/dialog_setlogpath.cpp
View File

@ -18,6 +18,9 @@ Dialog_SetLogPath::Dialog_SetLogPath(const QString &devType, QWidget *parent) :
QFont ft;
ft.setPointSize(15);
this->setFont(ft);
ui->lineEdit->setReadOnly(true);
ui->lineEdit->setText(getCfgValue(m_devType.toStdString().c_str(), "logPath", QString("")));
}
Dialog_SetLogPath::~Dialog_SetLogPath()
@ -40,7 +43,7 @@ void Dialog_SetLogPath::on_pushButton_ok_clicked()
return;
}
saveCfgValue("save", "logPath", getStdFileName(filePath));
saveCfgValue(m_devType.toStdString().c_str(), "logPath", getStdFileName(filePath));
close();
}

16
app/HGProductionTool/form_maininterface.cpp
View File

@ -279,9 +279,17 @@ void Form_mainInterface::on_testGetDevCfgInfo(int vid, int pid, int sleepTime, i
void Form_mainInterface::on_testGetDevCpuDisk(QString cpu, QString disk)
{
QString str = (tr("please verify the size of the device's cpu and disk:") + "\n\t");
str.append(tr("Cpu size:%1\n\t").arg(cpu));
str.append(tr("Disk size:%1\n\t").arg(disk));
AnalysisJson analysisJson(m_profileName);
AnalysisJson::json_global jsonGlobal = analysisJson.GetGlobal();
QString cpu_size = jsonGlobal.cpu_size;
QString disk_size = jsonGlobal.disk_size;
QString str = (tr("please verify the size of the device's cpu and disk:") + "\n\n\t");
str.append(tr("Target cpu size:%1").arg(cpu_size) + "\n\t");
str.append(tr("Target disk size:%1").arg(disk_size) + "\n\n\t");
str.append(tr("Actual pu size:%1").arg(cpu) + "\n\t");
str.append(tr("Actual disk size:%1").arg(disk) + "\n\t");
m_textTips->setViewContent(str);
}
@ -691,7 +699,7 @@ QString Form_mainInterface::getLogPath()
strcat(logPath, m_devType.toStdString().c_str());
strcat(logPath, "/");
return getCfgValue("save", "logPath", getStdFileName(StdStringToUtf8(logPath).c_str()));
return getCfgValue(m_devType.toStdString().c_str(), "logPath", getStdFileName(StdStringToUtf8(logPath).c_str()));
}
void Form_mainInterface::writeTestLog(QString logContent)

4
app/HGProductionTool/mainwindow.cpp
View File

@ -27,6 +27,7 @@ MainWindow::MainWindow(Dialog_logIn::LogInType loginType, const QString &profile
, m_bot_splitter(nullptr)
, m_isLogOut(false)
, m_inputSnDlg(nullptr)
, m_tmpDevType("")
{
ui->setupUi(this);
@ -679,6 +680,7 @@ void MainWindow::on_act_refreshDevice_triggered()
QMessageBox::information(this, tr("tips"), tr("cannot create more table"));
delete mainInterface;
}
m_tmpDevType = getDevType(devHandle);
}
else
{
@ -702,7 +704,7 @@ void MainWindow::on_act_openLog_triggered()
QString defaultFileName = logPath + m_accountName + ".log";
QString fileName = getCfgValue("save", "logPath", defaultFileName);
QString fileName = getCfgValue(m_tmpDevType.toStdString().c_str(), "logPath", defaultFileName);
QFileInfo fileInfo(getStdFileName(fileName));
auto pathDir = fileInfo.path();
QString strFilePath = "file:///" + pathDir;

1
app/HGProductionTool/mainwindow.h
View File

@ -95,5 +95,6 @@ private:
public:
QString m_ftpHost;
unsigned short m_ftpPort;
QString m_tmpDevType;
};
#endif // MAINWINDOW_H