From d36e3d561740b247ffe16926fea7914f5969f42a Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Fri, 21 Jun 2024 09:48:56 +0800 Subject: [PATCH] =?UTF-8?q?439=E8=AE=BE=E5=A4=87=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E5=9B=BA=E4=BB=B6=E6=96=B0=E5=A2=9E=E6=9C=80=E5=A4=A7=E5=B9=85?= =?UTF-8?q?=E9=9D=A2=E9=87=87=E9=9B=86=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/G439.txt | 22 ++++++++++++++++++++++ tools/apps/hgjson/CDlgLang.cpp | 2 +- tools/apps/hgjson/hgjsonDlg.cpp | 1 + tools/solution/Release/hgjson.exe | Bin 499200 -> 499200 bytes 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/docs/G439.txt b/docs/G439.txt index 5987830..23b860b 100644 --- a/docs/G439.txt +++ b/docs/G439.txt @@ -605,6 +605,28 @@ "range": ["速度优先", "画质优先"], "depend_or": ["resolution>=300"] }, + "maxsize-collect-height": { + "cat": "base", + "readonly": false, + "affect": 0, + "group": "light", + "visible": true, + "field": "Common", + "pos": 0, + "unit": "None", + "title": "最大幅面采集高度", + "desc": "最大幅面采集高度", + "type": "int", + "cur": 420, + "default": 420, + "size": 4, + "range": { + "min": 420, + "max": 3050, + "step": 1 + }, + "depend_or": ["paper==最大扫描尺寸", "paper==最大扫描尺寸自动裁切"] + }, "is-exchange": { "cat": "base", "readonly": false, diff --git a/tools/apps/hgjson/CDlgLang.cpp b/tools/apps/hgjson/CDlgLang.cpp index 9c31458..8d224dc 100644 --- a/tools/apps/hgjson/CDlgLang.cpp +++ b/tools/apps/hgjson/CDlgLang.cpp @@ -1,4 +1,4 @@ -// CDlgLang.cpp: 实现文件 +// CDlgLang.cpp: 实现文件 // #include "stdafx.h" diff --git a/tools/apps/hgjson/hgjsonDlg.cpp b/tools/apps/hgjson/hgjsonDlg.cpp index a3e0aff..b5b6c40 100644 --- a/tools/apps/hgjson/hgjsonDlg.cpp +++ b/tools/apps/hgjson/hgjsonDlg.cpp @@ -5956,6 +5956,7 @@ struct , {SANE_STD_OPT_NAME_PERIOD , OPTION_TITLE_PWMZKB} , {SANE_STD_OPT_NAME_OUT_BOUNDARY , OPTION_TITLE_BJJC} , {SANE_STD_OPT_NAME_SETTOKEN , OPTION_TITLE_SDLP} + , {SANE_STD_OPT_NAME_MAXSIZE_COLLECT_HEIGHT ,OPTION_TITLE_ZDFMCJGD} }, g_discard[] = { {SANE_STD_OPT_NAME_REVERSE_01 , "\351\273\221\347\231\275\345\233\276\345\203\217\345\217\215\350\211\262\350\276\223\345\207\272\357\274\210\346\255\243\345\270\270\351\242\234\350\211\262\344\270\272\357\274\2320-\351\273\221\350\211\262\357\274\2331-\347\231\275\350\211\262\357\274\211"} // ڰͼɫɫΪ0-ɫ1-ɫ , {SANE_STD_OPT_NAME_FILTER , "\347\201\260\345\272\246\346\210\226\351\273\221\347\231\275\345\233\276\345\203\217 - \351\231\244\350\211\262"} // ҶȻڰͼ - ɫ diff --git a/tools/solution/Release/hgjson.exe b/tools/solution/Release/hgjson.exe index 5fcd2839e07ff7ea552dfee06940b4af275c9111..b754b5e1be5128bdd3a5ea8fd7f248a94e362c5b 100644 GIT binary patch delta 8781 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 TclJdt