From 4cb44fc2fae0818ec54d79d94b4aae708f37a36a Mon Sep 17 00:00:00 2001 From: taocong Date: Mon, 1 Jun 2026 09:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E8=AD=A6?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/metadataupdate/metadataprocessor.cpp | 12 +++--- src/metadataupdate/metadataprocessor.h | 12 +++--- src/pages/metadatupdate/metadatupdatepage.cpp | 40 +++++++++---------- src/pages/metadatupdate/metadatupdatepage.h | 12 +++--- src/pages/settings/settingspage.cpp | 3 +- src/pages/settings/settingspage.h | 2 +- 6 files changed, 40 insertions(+), 41 deletions(-) diff --git a/src/metadataupdate/metadataprocessor.cpp b/src/metadataupdate/metadataprocessor.cpp index 10b80ff..aa99a01 100644 --- a/src/metadataupdate/metadataprocessor.cpp +++ b/src/metadataupdate/metadataprocessor.cpp @@ -321,7 +321,7 @@ bool MetadataProcessor::processUft3Interfaces(const QString& basePath) return true; } -bool MetadataProcessor::processUf2DataType(const QString& basePath) +bool MetadataProcessor::processUf2DataType() { LogManager::instance()->log("========== 开始处理 UF2.0 数据类型 =========="); @@ -351,7 +351,7 @@ bool MetadataProcessor::processUf2DataType(const QString& basePath) return true; } -bool MetadataProcessor::processUf2StdFields(const QString& basePath) +bool MetadataProcessor::processUf2StdFields() { LogManager::instance()->log("========== 开始处理 UF2.0 标准字段 =========="); @@ -393,7 +393,7 @@ bool MetadataProcessor::processUf2StdFields(const QString& basePath) return true; } -bool MetadataProcessor::processUf2ErrNumber(const QString& basePath) +bool MetadataProcessor::processUf2ErrNumber() { LogManager::instance()->log("========== 开始处理 UF2.0 标准错误号 =========="); @@ -423,7 +423,7 @@ bool MetadataProcessor::processUf2ErrNumber(const QString& basePath) return true; } -bool MetadataProcessor::processUft3DataType(const QString& basePath) +bool MetadataProcessor::processUft3DataType() { LogManager::instance()->log("========== 开始处理 UFT3.0 数据类型 =========="); @@ -453,7 +453,7 @@ bool MetadataProcessor::processUft3DataType(const QString& basePath) return true; } -bool MetadataProcessor::processUft3StdFields(const QString& basePath) +bool MetadataProcessor::processUft3StdFields() { LogManager::instance()->log("========== 开始处理 UFT3.0 标准字段 =========="); @@ -495,7 +495,7 @@ bool MetadataProcessor::processUft3StdFields(const QString& basePath) return true; } -bool MetadataProcessor::processUft3Table(const QString& basePath) +bool MetadataProcessor::processUft3Table() { LogManager::instance()->log("========== 开始处理 UFT3.0 表结构 =========="); diff --git a/src/metadataupdate/metadataprocessor.h b/src/metadataupdate/metadataprocessor.h index 6fd1a4d..3bacca7 100644 --- a/src/metadataupdate/metadataprocessor.h +++ b/src/metadataupdate/metadataprocessor.h @@ -18,13 +18,13 @@ public: bool processUf2Interfaces(const QString& basePath); bool processUft3Interfaces(const QString& basePath); - bool processUf2StdFields(const QString& basePath); - bool processUf2DataType(const QString& basePath); - bool processUf2ErrNumber(const QString& basePath); + bool processUf2StdFields(); + bool processUf2DataType(); + bool processUf2ErrNumber(); - bool processUft3StdFields(const QString& basePath); - bool processUft3DataType(const QString& basePath); - bool processUft3Table(const QString& basePath); + bool processUft3StdFields(); + bool processUft3DataType(); + bool processUft3Table(); QString getBasePath() const; void setBasePath(const QString& path); diff --git a/src/pages/metadatupdate/metadatupdatepage.cpp b/src/pages/metadatupdate/metadatupdatepage.cpp index b6ed4da..1cd6615 100644 --- a/src/pages/metadatupdate/metadatupdatepage.cpp +++ b/src/pages/metadatupdate/metadatupdatepage.cpp @@ -244,7 +244,6 @@ void MetadataUpdatePage::onUpdateUFT3() void MetadataUpdatePage::updateUf2Interfaces(const QStringList& items) { - QString basePath = QCoreApplication::applicationDirPath(); int itemCount = items.size(); foreach (const QString& item, items) { @@ -254,12 +253,13 @@ void MetadataUpdatePage::updateUf2Interfaces(const QStringList& items) _progressBar->setValue(progress); if (item == "标准字段") { - processUf2StdFields(basePath); + processUf2StdFields(); } else if (item == "数据类型") { - processUf2DataType(basePath); + processUf2DataType(); } else if (item == "标准错误号") { - processUf2ErrNumber(basePath); + processUf2ErrNumber(); } else if (item == "接口数据") { + QString basePath = QCoreApplication::applicationDirPath(); processUf2Interface(basePath); } @@ -274,7 +274,6 @@ void MetadataUpdatePage::updateUf2Interfaces(const QStringList& items) void MetadataUpdatePage::updateUft3Interfaces(const QStringList& items) { - QString basePath = QCoreApplication::applicationDirPath(); int itemCount = items.size(); foreach (const QString& item, items) { @@ -284,12 +283,13 @@ void MetadataUpdatePage::updateUft3Interfaces(const QStringList& items) _progressBar->setValue(progress); if (item == "标准字段") { - processUft3StdFields(basePath); + processUft3StdFields(); } else if (item == "数据类型") { - processUft3DataType(basePath); + processUft3DataType(); } else if (item == "表结构") { - processUft3Table(basePath); + processUft3Table(); } else if (item == "接口数据") { + QString basePath = QCoreApplication::applicationDirPath(); processUft3Interface(basePath); } @@ -302,19 +302,19 @@ void MetadataUpdatePage::updateUft3Interfaces(const QStringList& items) onUpdateFinished(true, "UFT30更新完成"); } -void MetadataUpdatePage::processUf2StdFields(const QString& basePath) +void MetadataUpdatePage::processUf2StdFields() { - _processor->processUf2StdFields(basePath); + _processor->processUf2StdFields(); } -void MetadataUpdatePage::processUf2DataType(const QString& basePath) +void MetadataUpdatePage::processUf2DataType() { - _processor->processUf2DataType(basePath); + _processor->processUf2DataType(); } -void MetadataUpdatePage::processUf2ErrNumber(const QString& basePath) +void MetadataUpdatePage::processUf2ErrNumber() { - _processor->processUf2ErrNumber(basePath); + _processor->processUf2ErrNumber(); } void MetadataUpdatePage::processUf2Interface(const QString& basePath) @@ -322,19 +322,19 @@ void MetadataUpdatePage::processUf2Interface(const QString& basePath) _processor->processUf2Interfaces(basePath); } -void MetadataUpdatePage::processUft3StdFields(const QString& basePath) +void MetadataUpdatePage::processUft3StdFields() { - _processor->processUft3StdFields(basePath); + _processor->processUft3StdFields(); } -void MetadataUpdatePage::processUft3DataType(const QString& basePath) +void MetadataUpdatePage::processUft3DataType() { - _processor->processUft3DataType(basePath); + _processor->processUft3DataType(); } -void MetadataUpdatePage::processUft3Table(const QString& basePath) +void MetadataUpdatePage::processUft3Table() { - _processor->processUft3Table(basePath); + _processor->processUft3Table(); } void MetadataUpdatePage::processUft3Interface(const QString& basePath) diff --git a/src/pages/metadatupdate/metadatupdatepage.h b/src/pages/metadatupdate/metadatupdatepage.h index 35690a4..374752b 100644 --- a/src/pages/metadatupdate/metadatupdatepage.h +++ b/src/pages/metadatupdate/metadatupdatepage.h @@ -40,14 +40,14 @@ private: void updateUf2Interfaces(const QStringList& items); void updateUft3Interfaces(const QStringList& items); - void processUf2StdFields(const QString& basePath); - void processUf2DataType(const QString& basePath); - void processUf2ErrNumber(const QString& basePath); + void processUf2StdFields(); + void processUf2DataType(); + void processUf2ErrNumber(); void processUf2Interface(const QString& basePath); - void processUft3StdFields(const QString& basePath); - void processUft3DataType(const QString& basePath); - void processUft3Table(const QString& basePath); + void processUft3StdFields(); + void processUft3DataType(); + void processUft3Table(); void processUft3Interface(const QString& basePath); QGridLayout* _updateGridLayout{nullptr}; diff --git a/src/pages/settings/settingspage.cpp b/src/pages/settings/settingspage.cpp index 3055421..631b467 100644 --- a/src/pages/settings/settingspage.cpp +++ b/src/pages/settings/settingspage.cpp @@ -384,7 +384,6 @@ void SettingsPage::onSelectOutputPath() } } -void SettingsPage::onThemeChanged(int index) +void SettingsPage::onThemeChanged() { - Q_UNUSED(index); } diff --git a/src/pages/settings/settingspage.h b/src/pages/settings/settingspage.h index ca4037c..ff6028d 100644 --- a/src/pages/settings/settingspage.h +++ b/src/pages/settings/settingspage.h @@ -21,7 +21,7 @@ private slots: void onSelectUF20Path(); void onSelectUF20AccountPath(); void onSelectOutputPath(); - void onThemeChanged(int index); + void onThemeChanged(); private: void initUI();