From 6f314d712cec3e2d2033272d804b32058c696790 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Sun, 29 Jan 2023 16:05:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E7=89=B9=E6=AE=8A=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sane/sane_option_trans.cpp | 52 +++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/sane/sane_option_trans.cpp b/sane/sane_option_trans.cpp index 92226e2..6e723c2 100644 --- a/sane/sane_option_trans.cpp +++ b/sane/sane_option_trans.cpp @@ -2,6 +2,8 @@ #include #include +#include "../../sdk/include/lang/app_language.h" + namespace sane_opt_trans { static struct @@ -61,12 +63,12 @@ namespace sane_opt_trans for (int i = 0; i < _countof(arr); ++i) \ { \ if (arr[i].twain_id == val) \ - return arr[i].opt_val; \ + return from_default_language(arr[i].opt_val, NULL); \ } #define VALUE_TO_TWAIN(arr, val) \ for (int i = 0; i < _countof(arr); ++i) \ { \ - if (strcmp(arr[i].opt_val, val) == 0) \ + if (strcmp(from_default_language(arr[i].opt_val, NULL), val) == 0) \ return arr[i].twain_id; \ } @@ -103,7 +105,7 @@ namespace sane_opt_trans for (int i = 0; i < _countof(g_filter_map); ++i) { if (g_filter_map[i].twain_id == val) - return g_filter_map[i].opt_val; + return from_default_language(g_filter_map[i].opt_val, NULL); } } else @@ -111,15 +113,16 @@ namespace sane_opt_trans for (int i = 0; i < _countof(g_enhance_map); ++i) { if (g_enhance_map[i].twain_id == val) - return g_enhance_map[i].opt_val; + return from_default_language(g_enhance_map[i].opt_val, NULL); } } - return OPTION_VALUE_HDHHBTX_CSYZQ_BCS; + return from_default_language(OPTION_VALUE_HDHHBTX_CSYZQ_BCS, NULL); } int filter_enhance_value_to_twain(const char* val, bool* is_filter) { bool type = false; + const char* hz = to_default_language(val, NULL); if (!is_filter) is_filter = &type; @@ -127,13 +130,13 @@ namespace sane_opt_trans *is_filter = true; for (int i = 0; i < _countof(g_filter_map); ++i) { - if (strcmp(g_filter_map[i].opt_val, val) == 0) + if (strcmp(g_filter_map[i].opt_val, hz) == 0) return g_filter_map[i].twain_id; } *is_filter = false; for (int i = 0; i < _countof(g_enhance_map); ++i) { - if (strcmp(g_enhance_map[i].opt_val, val) == 0) + if (strcmp(g_enhance_map[i].opt_val, hz) == 0) return g_enhance_map[i].twain_id; } @@ -148,25 +151,26 @@ namespace sane_opt_trans val -= 360.0f; if (60.0f < val && val < 120.0f) - return OPTION_VALUE_WGFX_90; + return from_default_language(OPTION_VALUE_WGFX_90, NULL); else if (150.0f < val && val < 210.0f) - return OPTION_VALUE_WGFX_180; + return from_default_language(OPTION_VALUE_WGFX_180, NULL); else if (240.0f < val && val < 300.0f) - return OPTION_VALUE_WGFX__90; + return from_default_language(OPTION_VALUE_WGFX__90, NULL); else if (330.0f < val || val < 30.0f) - return OPTION_VALUE_WGFX_0; + return from_default_language(OPTION_VALUE_WGFX_0, NULL); else - return OPTION_VALUE_WGFX_ZDWBFXSB; + return from_default_language(OPTION_VALUE_WGFX_ZDWBFXSB, NULL); } float text_direction_to_twain(const char* val) { - if (strcmp(val, OPTION_VALUE_WGFX_90) == 0) + const char* hz = to_default_language(val, NULL); + if (strcmp(hz, OPTION_VALUE_WGFX_90) == 0) return 90.0f; - else if (strcmp(val, OPTION_VALUE_WGFX_180) == 0) + else if (strcmp(hz, OPTION_VALUE_WGFX_180) == 0) return 180.0f; - else if (strcmp(val, OPTION_VALUE_WGFX__90) == 0) + else if (strcmp(hz, OPTION_VALUE_WGFX__90) == 0) return 270.0f; - else if (strcmp(val, OPTION_VALUE_WGFX_0) == 0) + else if (strcmp(hz, OPTION_VALUE_WGFX_0) == 0) return .0f; else return AUTO_MATIC_ROTATE; @@ -200,21 +204,23 @@ namespace sane_opt_trans } const char* switch_paper_lateral(const char* val) { + const char* hz = to_default_language(val, NULL); for (int i = 0; i < _countof(g_lateral_map); ++i) { - if (strcmp(g_lateral_map[i].normal, val) == 0) - return g_lateral_map[i].lateral; - else if (strcmp(g_lateral_map[i].lateral, val) == 0) - return g_lateral_map[i].normal; + if (strcmp(g_lateral_map[i].normal, hz) == 0) + return from_default_language(g_lateral_map[i].lateral, NULL); + else if (strcmp(g_lateral_map[i].lateral, hz) == 0) + return from_default_language(g_lateral_map[i].normal, NULL); } return NULL; } bool is_paper_lateral(const char* val) { + const char* hz = to_default_language(val, NULL); for (int i = 0; i < _countof(g_lateral_map); ++i) { - if (strcmp(g_lateral_map[i].lateral, val) == 0) + if (strcmp(g_lateral_map[i].lateral, hz) == 0) return true; } @@ -225,7 +231,7 @@ namespace sane_opt_trans { VALUE_FROM_TWAIN(g_color_mode_map, val); - return OPTION_VALUE_YSMS_24WCS; + return from_default_language(OPTION_VALUE_YSMS_24WCS, NULL); } int auto_color_type_to_twain(const char* val) { @@ -238,7 +244,7 @@ namespace sane_opt_trans { VALUE_FROM_TWAIN(g_sharpen_map, val); - return OPTION_VALUE_RHYMH_W; + return from_default_language(OPTION_VALUE_RHYMH_W, NULL); } int sharpen_to_twain(const char* val) {