aji/ScreenTranslator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated ocr<->translation codes functions.

Browse Source
This commit is contained in:
Gres 2015-10-10 21:00:29 +03:00
parent 1c922db961
commit c1dab33e7c
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
LanguageHelper.cpp
View File

@ -72,13 +72,22 @@ QString LanguageHelper::ocrUiToCode (const QString &text) const {
return ocrLanguages_.value (text, text); return ocrLanguages_.value (text, text);
} }
QString LanguageHelper::translateForOcrCode (const QString &text) const { QString LanguageHelper::ocrToTranslateCodes (const QString &text) const {
QString ocrUi = ocrUiToCode (text); QString ocrUi = ocrCodeToUi (text);
QString translate = translateCodeToUi (ocrUi); QString translateCode = translateUiToCode (ocrUi);
if (translate == ocrUi) { if (translateCode == ocrUi) {
translate = "auto"; translateCode = "auto";
} }
return translate; return translateCode;
}
QString LanguageHelper::translateToOcrCodes (const QString &text) const {
QString translateUi = translateCodeToUi (text);
QString ocrCode = ocrUiToCode (translateUi);
if (translateUi == ocrCode) {
return QString ();
}
return ocrCode;
} }
void LanguageHelper::init () { void LanguageHelper::init () {

3
LanguageHelper.h
View File

@ -19,7 +19,8 @@ class LanguageHelper {
QString translateUiToCode (const QString &text) const; QString translateUiToCode (const QString &text) const;
QString ocrCodeToUi (const QString &text) const; QString ocrCodeToUi (const QString &text) const;
QString ocrUiToCode (const QString &text) const; QString ocrUiToCode (const QString &text) const;
QString translateForOcrCode (const QString &text) const; QString ocrToTranslateCodes (const QString &text) const;
QString translateToOcrCodes (const QString &text) const;
void updateAvailableOcrLanguages (); void updateAvailableOcrLanguages ();

2
SelectionDialog.cpp
View File

@ -90,7 +90,7 @@ bool SelectionDialog::eventFilter (QObject *object, QEvent *event) {
} }
item.ocrLanguage = dictionary_.ocrUiToCode (action->text ()); item.ocrLanguage = dictionary_.ocrUiToCode (action->text ());
ST_ASSERT (!item.ocrLanguage.isEmpty ()); ST_ASSERT (!item.ocrLanguage.isEmpty ());
item.sourceLanguage = dictionary_.translateForOcrCode (item.ocrLanguage); item.sourceLanguage = dictionary_.ocrToTranslateCodes (item.ocrLanguage);
ST_ASSERT (!item.sourceLanguage.isEmpty ()); ST_ASSERT (!item.sourceLanguage.isEmpty ());
} }
emit selected (item); emit selected (item);

2
SettingsEditor.cpp
View File

@ -127,7 +127,7 @@ void SettingsEditor::saveSettings () const {
settings.setValue (translationDebugMode, ui->translatorDebugCheck->isChecked ()); settings.setValue (translationDebugMode, ui->translatorDebugCheck->isChecked ());
QString trLanguage = dictionary_.translateUiToCode (ui->translateLangCombo->currentText ()); QString trLanguage = dictionary_.translateUiToCode (ui->translateLangCombo->currentText ());
settings.setValue (translationLanguage, trLanguage); settings.setValue (translationLanguage, trLanguage);
QString sourceLanguageVal = dictionary_.translateForOcrCode (ocrLanguage); QString sourceLanguageVal = dictionary_.ocrToTranslateCodes (ocrLanguage);
settings.setValue (sourceLanguage, sourceLanguageVal); settings.setValue (sourceLanguage, sourceLanguageVal);
settings.setValue (translationTimeout, ui->translateTimeoutSpin->value ()); settings.setValue (translationTimeout, ui->translateTimeoutSpin->value ());