微调扫描到功能
This commit is contained in:
parent
32ad167f1a
commit
667b3ab7e6
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
@ -159,6 +159,12 @@ void Dialog_AquireInto::replaceCfgName(QString originName, QString newName)
|
||||||
HGBase_GetConfigPath(cfgPath, 512);
|
HGBase_GetConfigPath(cfgPath, 512);
|
||||||
strcat(cfgPath, "config.ini");
|
strcat(cfgPath, "config.ini");
|
||||||
|
|
||||||
|
QString currentKeyName = getCurrentCfgName();
|
||||||
|
if (currentKeyName == originName)
|
||||||
|
{
|
||||||
|
saveCfgValue("aquire", "currentKeyName", newName);
|
||||||
|
}
|
||||||
|
|
||||||
QString allCfgName = getCfgValue("aquire", "cfgNameList", QString(""));
|
QString allCfgName = getCfgValue("aquire", "cfgNameList", QString(""));
|
||||||
QStringList allCfgNameList = allCfgName.split(",");
|
QStringList allCfgNameList = allCfgName.split(",");
|
||||||
for (int i = 0; i < allCfgNameList.size(); ++i)
|
for (int i = 0; i < allCfgNameList.size(); ++i)
|
||||||
|
@ -303,7 +309,10 @@ void Dialog_AquireInto::on_buttonBox_accepted()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
saveCfgBaseOnSection(currentCfgName);
|
if (ui->comboBox_cfgScheme->currentIndex() != 0)
|
||||||
|
{
|
||||||
|
saveCfgBaseOnSection(currentCfgName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
saveCfgValue("aquire", "currentKeyName", currentCfgName);
|
saveCfgValue("aquire", "currentKeyName", currentCfgName);
|
||||||
|
@ -360,6 +369,16 @@ void Dialog_AquireInto::on_pbtn_changeName_clicked()
|
||||||
if (dlg.exec())
|
if (dlg.exec())
|
||||||
{
|
{
|
||||||
QString newCfgName = dlg.getText();
|
QString newCfgName = dlg.getText();
|
||||||
|
|
||||||
|
for (int i = 0; i < ui->comboBox_cfgScheme->count(); ++i)
|
||||||
|
{
|
||||||
|
if (newCfgName == ui->comboBox_cfgScheme->itemText(i))
|
||||||
|
{
|
||||||
|
QMessageBox::information(this, tr("tips"), tr("The configuration scheme already exists"));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
int count = ui->comboBox_cfgScheme->count();
|
int count = ui->comboBox_cfgScheme->count();
|
||||||
for (int i = 0; i < count; ++i)
|
for (int i = 0; i < count; ++i)
|
||||||
{
|
{
|
||||||
|
|
|
@ -216,7 +216,7 @@ FORMS += \
|
||||||
RESOURCES += \
|
RESOURCES += \
|
||||||
../../../app/fwupgrade/FWUpgrade_resource.qrc
|
../../../app/fwupgrade/FWUpgrade_resource.qrc
|
||||||
|
|
||||||
DISTFILES += \
|
TRANSLATIONS += \
|
||||||
../../../app/fwupgrade/FWUpgrade_zh_CN.qm \
|
../../../app/fwupgrade/FWUpgrade_zh_CN.qm \
|
||||||
../../../app/fwupgrade/FWUpgrade_zh_CN.ts \
|
../../../app/fwupgrade/FWUpgrade_zh_CN.ts \
|
||||||
../../../app/fwupgrade/qt_zh_CN.qm \
|
../../../app/fwupgrade/qt_zh_CN.qm \
|
||||||
|
|
|
@ -338,7 +338,7 @@ FORMS += \
|
||||||
RESOURCES += \
|
RESOURCES += \
|
||||||
../../../app/scanner/Scanner_resource.qrc
|
../../../app/scanner/Scanner_resource.qrc
|
||||||
|
|
||||||
DISTFILES += \
|
TRANSLATIONS += \
|
||||||
../../../app/scanner/Scanner_zh_CN.qm \
|
../../../app/scanner/Scanner_zh_CN.qm \
|
||||||
../../../app/scanner/Scanner_zh_CN.ts \
|
../../../app/scanner/Scanner_zh_CN.ts \
|
||||||
../../../app/scanner/Scanner_zh_EN.qm \
|
../../../app/scanner/Scanner_zh_EN.qm \
|
||||||
|
|
|
@ -192,6 +192,6 @@ FORMS += \
|
||||||
RESOURCES += \
|
RESOURCES += \
|
||||||
../../../app/upgrade/Upgrade_resource.qrc
|
../../../app/upgrade/Upgrade_resource.qrc
|
||||||
|
|
||||||
DISTFILES += \
|
TRANSLATIONS += \
|
||||||
../../../app/upgrade/Upgrade_zh_CN.qm \
|
../../../app/upgrade/Upgrade_zh_CN.qm \
|
||||||
../../../app/upgrade/Upgrade_zh_CN.ts
|
../../../app/upgrade/Upgrade_zh_CN.ts
|
||||||
|
|
Loading…
Reference in New Issue