Skip to content

fix: Hide language selector when using OCR V5 plugin #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Dec 2, 2025
Merged

fix: Hide language selector when using OCR V5 plugin #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/engine/OCREngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ OCREngine::OCREngine()

auto plugins = ocrDriver->installedPluginNames();
if (plugins.contains(ocrV5, Qt::CaseInsensitive)) {
if(ocrDriver->loadPlugin(ocrV5)) {
if (ocrDriver->loadPlugin(ocrV5)) {
load = true;
m_isV5 = true;
qCInfo(dmOcr) << "OCR V5 plugin loaded";
}
else {
} else {
qCWarning(dmOcr) << "Failed to load OCR V5 plugin";
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/engine/OCREngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@
return m_isRunning;
}

bool isV5() const

Check warning on line 29 in src/engine/OCREngine.h

View workflow job for this annotation

GitHub Actions / cppcheck 

The function 'isV5' is never used.
{
return m_isV5;
}

bool setLanguage(const QString &language);
void setImage(const QImage &image);
QString getRecogitionResult();
Expand All @@ -43,4 +48,5 @@
Dtk::Ocr::DOcr *ocrDriver;
std::atomic_bool m_isRunning;
QSettings *ocrSetting;
bool m_isV5 {false};
};
87 changes: 48 additions & 39 deletions src/mainwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,47 +172,56 @@ void MainWidget::setupUi(QWidget *Widget)
//配置文件读写
ocrSetting = new QSettings(Dtk::Core::DStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/config.conf", QSettings::IniFormat);

//语种读写设置
//目前仅支持默认插件，默认插件支持的语种字符串：zh-Hans_en，zh-Hant_en，en
auto currentLanguage = ocrSetting->value("language", "zh-Hans_en").toString();
OCREngine::instance()->setLanguage(currentLanguage);

//设置语种选择框
auto recLabel = new DLabel(tr("Recognize language"));
languageSelectBox = new DComboBox(this);
languageSelectBox->setFixedSize(160, 36);
languageSelectBox->addItems({tr("Simplified Chinese"), tr("English"), tr("Traditional Chinese")});
static std::map<QString, int> languageIndexMap{ {"zh-Hans_en", 0},
{"en", 1},
{"zh-Hant_en", 2}
};
languageSelectBox->setCurrentIndex(languageIndexMap[currentLanguage]);
connect(languageSelectBox, static_cast<void(DComboBox::*)(int)>(&DComboBox::currentIndexChanged), [this](int index) {
QString resultLanguage;
switch(index) {
default:
resultLanguage = "zh-Hans_en";
break;
case 0:
resultLanguage = "zh-Hans_en";
break;
case 1:
resultLanguage = "en";
break;
case 2:
resultLanguage = "zh-Hant_en";
break;
};
if(!OCREngine::instance()->setLanguage(resultLanguage)) {
return;
// 使用 V5 插件时，不显示语言选择控件，只设置一次默认语言
if (OCREngine::instance()->isV5()) {
OCREngine::instance()->setLanguage("zh-Hans_en");
} else {
//语种读写设置
//目前仅支持默认插件，默认插件支持的语种字符串：zh-Hans_en，zh-Hant_en，en
auto currentLanguage = ocrSetting->value("language", "zh-Hans_en").toString();
OCREngine::instance()->setLanguage(currentLanguage);

//设置语种选择框
auto recLabel = new DLabel(tr("Recognize language"));
languageSelectBox = new DComboBox(this);
languageSelectBox->setFixedSize(160, 36);
languageSelectBox->addItems({tr("Simplified Chinese"), tr("English"), tr("Traditional Chinese")});
static std::map<QString, int> languageIndexMap{ {"zh-Hans_en", 0},
{"en", 1},
{"zh-Hant_en", 2}
};
if (languageIndexMap.find(currentLanguage) != languageIndexMap.end()) {
languageSelectBox->setCurrentIndex(languageIndexMap[currentLanguage]);
} else {
languageSelectBox->setCurrentIndex(0);
}
ocrSetting->setValue("language", resultLanguage);
runRec(false);
m_noResult->setVisible(false);
});
connect(languageSelectBox, static_cast<void(DComboBox::*)(int)>(&DComboBox::currentIndexChanged), [this](int index) {
QString resultLanguage;
switch(index) {
default:
resultLanguage = "zh-Hans_en";
break;
case 0:
resultLanguage = "zh-Hans_en";
break;
case 1:
resultLanguage = "en";
break;
case 2:
resultLanguage = "zh-Hant_en";
break;
};
if(!OCREngine::instance()->setLanguage(resultLanguage)) {
return;
}
ocrSetting->setValue("language", resultLanguage);
runRec(false);
m_noResult->setVisible(false);
});

m_buttonHorizontalLayout->addWidget(recLabel, 0, Qt::AlignRight);
m_buttonHorizontalLayout->addWidget(languageSelectBox, 0, Qt::AlignRight);
m_buttonHorizontalLayout->addWidget(recLabel, 0, Qt::AlignRight);
m_buttonHorizontalLayout->addWidget(languageSelectBox, 0, Qt::AlignRight);
}

m_copyBtn = new DIconButton(Widget);
m_copyBtn->setObjectName(QStringLiteral("Copy text"));
Expand Down