diff --git a/docs/G139-239.txt b/docs/G139-239.txt index a9738d1..1c81ad7 100644 --- a/docs/G139-239.txt +++ b/docs/G139-239.txt @@ -1,6 +1,6 @@ { "device_type": "G139-G239", - "option_count": 68, + "option_count": 75, "1": { "category": "base", "name": "restore", @@ -77,6 +77,17 @@ "depend_or": ["6==黑白"] }, "8": { + "category": "base", + "name": "reverse-bw", + "title": "黑白图像反色输出（正常颜色为：0-黑色；1-白色）", + "desc": "输出的黑白图像以“1”代表黑色，“0”代表白色", + "type": "bool", + "cur": false, + "default": false, + "size": 4, + "depend_or": ["4==true", "6==黑白"] + }, + "9": { "category": "base", "name": "filter", "title": "灰度或黑白图像 - 除色", @@ -88,7 +99,7 @@ "range": ["不除色", "除红色", "除绿色", "除蓝色", "红色增强", "绿色增强", "蓝色增强"], "depend_and": ["4!=true", "6!=24位彩色", "6!=颜色自动识别"] }, - "9": { + "10": { "category": "base", "name": "is-rid-multiout-red", "title": "24位彩色图像 - 多流输出除红", @@ -99,7 +110,7 @@ "size": 4, "depend_and": ["4!=true", "6!=256级灰度", "6!=黑白", "6!=颜色自动识别"] }, - "10": { + "11": { "category": "base", "name": "is-rid-answer-sheet-red", "title": "24位彩色图像 - 答题卡除红", @@ -110,7 +121,7 @@ "size": 4, "depend_and": ["4!=true", "6!=256级灰度", "6!=黑白", "6!=颜色自动识别"] }, - "11": { + "12": { "category": "base", "name": "is-erase-bkg", "title": "背景移除", @@ -121,7 +132,7 @@ "size": 4, "depend_and": ["4!=true", "6!=256级灰度", "6!=黑白", "6!=颜色自动识别"] }, - "12": { + "13": { "category": "base", "name": "bkg-color-range", "title": " 背景色彩浮动范围", @@ -134,9 +145,9 @@ "min": 1, "max": 128 }, - "depend_or": ["11==true"] + "depend_or": ["12==true"] }, - "13": { + "14": { "category": "base", "name": "sharpen", "title": "锐化与模糊", @@ -148,7 +159,7 @@ "range": ["无", "锐化", "进一步锐化", "模糊", "进一步模糊"], "depend_and": ["4!=true", "6!=黑白", "6!=颜色自动识别"] }, - "14": { + "15": { "category": "base", "name": "is-rid-morr", "title": "去除摩尔纹", @@ -159,7 +170,7 @@ "size": 4, "depend_and": ["4!=true", "6!=黑白", "6!=颜色自动识别"] }, - "15": { + "16": { "category": "base", "name": "is-rid-grid", "title": "除网纹", @@ -170,7 +181,7 @@ "size": 4, "depend_and": ["4!=true", "6!=黑白", "6!=颜色自动识别"] }, - "16": { + "17": { "category": "base", "name": "is-err-extension", "title": "错误扩散", @@ -181,7 +192,7 @@ "size": 4, "depend_or": ["6==黑白"] }, - "17": { + "18": { "category": "base", "name": "is-noise-optimize", "title": "黑白图像噪点优化", @@ -192,7 +203,7 @@ "size": 4, "depend_or": ["6==黑白"] }, - "18": { + "19": { "category": "base", "name": "noise-size", "title": " 噪点优化尺寸", @@ -205,9 +216,9 @@ "min": 10, "max": 50 }, - "depend_or": ["17==true"] + "depend_or": ["18==true"] }, - "19": { + "20": { "category": "base", "name": "paper", "title": "纸张尺寸", @@ -218,7 +229,7 @@ "size": 48, "range": ["A3", "8开", "A4", "A4横向", "16开", "16开横向", "A5", "A5横向", "A6", "A6横向", "B4", "B5", "B5横向", "B6", "B6横向", "Letter", "Letter横向", "Double Letter", "LEGAL", "匹配原始尺寸", "最大扫描尺寸自动裁切", "最大扫描尺寸", "三联试卷"] }, - "20": { + "21": { "category": "base", "name": "is-custom-area", "title": "自定义扫描区域", @@ -227,9 +238,9 @@ "cur": false, "default": false, "size": 4, - "depend_and": ["19!=匹配原始尺寸", "19!=三联试卷", "19!=最大扫描尺寸", "19!=最大扫描尺寸自动裁切"] + "depend_and": ["20!=匹配原始尺寸", "20!=三联试卷", "20!=最大扫描尺寸", "20!=最大扫描尺寸自动裁切"] }, - "21": { + "22": { "category": "base", "name": "tl-x", "title": "扫描区域左侧（mm）", @@ -242,9 +253,9 @@ "min": 0.000000, "max": 210.000000 }, - "depend_and": ["20==true"] + "depend_and": ["21==true"] }, - "22": { + "23": { "category": "base", "name": "br-x", "title": "扫描区域右侧（mm）", @@ -257,9 +268,9 @@ "min": 0.000000, "max": 210.000000 }, - "depend_and": ["20==true"] + "depend_and": ["21==true"] }, - "23": { + "24": { "category": "base", "name": "tl-y", "title": "扫描区域上侧（mm）", @@ -272,9 +283,9 @@ "min": 0.000000, "max": 297.000000 }, - "depend_and": ["20==true"] + "depend_and": ["21==true"] }, - "24": { + "25": { "category": "base", "name": "br-y", "title": "扫描区域下侧（mm）", @@ -287,9 +298,9 @@ "min": 0.000000, "max": 297.000000 }, - "depend_and": ["20==true"] + "depend_and": ["21==true"] }, - "25": { + "26": { "category": "base", "name": "is-size-check", "title": "尺寸检测", @@ -298,9 +309,9 @@ "cur": false, "default": false, "size": 4, - "depend_or": ["19==A3", "19==A4", "19==A4横向", "19==A5", "19==A5横向", "19==A6", "19==A6横向", "19==B4", "19==B5", "19==B5横向", "19==B6", "19==B6横向", "19==Double Letter", "19==LEGAL", "19==Letter", "19==Letter横向"] + "depend_or": ["20==A3", "20==A4", "20==A4横向", "20==A5", "20==A5横向", "20==A6", "20==A6横向", "20==B4", "20==B5", "20==B5横向", "20==B6", "20==B6横向", "20==Double Letter", "20==LEGAL", "20==Letter", "20==Letter横向"] }, - "26": { + "27": { "category": "base", "name": "page", "title": "扫描页面", @@ -311,7 +322,7 @@ "size": 40, "range": ["单面", "双面", "跳过空白页（通用）", "跳过空白页（发票纸）", "对折"] }, - "27": { + "28": { "category": "base", "name": "blank-sensitivity", "title": " 跳过空白页灵敏度", @@ -324,9 +335,9 @@ "min": 1, "max": 100 }, - "depend_or": ["26==跳过空白页（通用）", "26==跳过空白页（发票纸）"] + "depend_or": ["27==跳过空白页（通用）", "27==跳过空白页（发票纸）"] }, - "28": { + "29": { "category": "base", "name": "resolution", "title": "分辨率", @@ -337,7 +348,7 @@ "size": 4, "range": [100, 150, 200, 240, 300, 600] }, - "29": { + "30": { "category": "base", "name": "image-quality", "title": "画质", @@ -347,9 +358,9 @@ "default": "速度优先", "size": 24, "range": ["速度优先", "画质优先"], - "depend_or": ["28==300", "28==600"] + "depend_or": ["29==300", "29==600"] }, - "30": { + "31": { "category": "base", "name": "is-exchange", "title": "交换正反面", @@ -358,9 +369,9 @@ "cur": false, "default": false, "size": 4, - "depend_and": ["26!=单面"] + "depend_and": ["27!=单面"] }, - "31": { + "32": { "category": "base", "name": "is-split", "title": "图像拆分", @@ -369,9 +380,9 @@ "cur": false, "default": false, "size": 4, - "depend_and": ["26!=对折", "26!=跳过空白页（发票纸）", "26!=跳过空白页（通用）"] + "depend_and": ["27!=对折", "27!=跳过空白页（发票纸）", "27!=跳过空白页（通用）"] }, - "32": { + "33": { "category": "base", "name": "is-anti-skew", "title": "自动纠偏", @@ -380,15 +391,15 @@ "cur": true, "default": true, "size": 4, - "depend_or": ["26!=对折"] + "depend_or": ["27!=对折"] }, - "33": { + "34": { "category": "base", "name": "grp-2", "title": "亮度", "type": "group" }, - "34": { + "35": { "category": "base", "name": "is-custom-gamma", "title": "启用色调曲线", @@ -398,7 +409,7 @@ "default": false, "size": 4 }, - "35": { + "36": { "category": "base", "name": "brightness", "title": "亮度值", @@ -411,9 +422,9 @@ "min": 1, "max": 255 }, - "depend_and": ["34==false"] + "depend_and": ["35==false"] }, - "36": { + "37": { "category": "base", "name": "contrast", "title": "对比度", @@ -426,9 +437,9 @@ "min": 1, "max": 7 }, - "depend_and": ["34==false"] + "depend_and": ["35==false"] }, - "37": { + "38": { "category": "base", "name": "gamma", "title": "伽马值", @@ -441,15 +452,15 @@ "min": 0.010000, "max": 5.000000 }, - "depend_and": ["34==false"] + "depend_and": ["35==false"] }, - "38": { + "39": { "category": "base", "name": "grp-3", "title": "图像处理", "type": "group" }, - "39": { + "40": { "category": "base", "name": "is-photo-mode", "title": "照片模式", @@ -459,7 +470,7 @@ "default": false, "size": 4 }, - "40": { + "41": { "category": "base", "name": "is-erase-black-frame", "title": "消除黑框", @@ -469,7 +480,7 @@ "default": true, "size": 4 }, - "41": { + "42": { "category": "base", "name": "is-dark-sample", "title": "深色样张", @@ -478,9 +489,9 @@ "cur": false, "default": false, "size": 4, - "depend_and": ["26!=对折", "40!=true", "19!=匹配原始尺寸", "19!=最大扫描尺寸", "19!=最大扫描尺寸自动裁切", "32!=true"] + "depend_and": ["27!=对折", "41!=true", "20!=匹配原始尺寸", "20!=最大扫描尺寸", "20!=最大扫描尺寸自动裁切", "33!=true"] }, - "42": { + "43": { "category": "advanced", "name": "threshold", "title": "阈值", @@ -493,9 +504,9 @@ "min": 30, "max": 50 }, - "depend_or": ["40==true", "19==匹配原始尺寸", "19==最大扫描尺寸", "19==最大扫描尺寸自动裁切", "32==true"] + "depend_or": ["41==true", "20==匹配原始尺寸", "20==最大扫描尺寸", "20==最大扫描尺寸自动裁切", "33==true"] }, - "43": { + "44": { "category": "advanced", "name": "anti-noise-level", "title": "背景抗噪等级", @@ -508,9 +519,9 @@ "min": 1, "max": 20 }, - "depend_or": ["40==true", "19==匹配原始尺寸", "19==最大扫描尺寸", "19==最大扫描尺寸自动裁切", "32==true"] + "depend_or": ["41==true", "20==匹配原始尺寸", "20==最大扫描尺寸", "20==最大扫描尺寸自动裁切", "33==true"] }, - "44": { + "45": { "category": "advanced", "name": "margin", "title": "边缘缩进", @@ -523,9 +534,9 @@ "min": 5, "max": 30 }, - "depend_or": ["40==true", "19==匹配原始尺寸", "19==最大扫描尺寸自动裁切", "32==true", "19==最大扫描尺寸"] + "depend_or": ["41==true", "20==匹配原始尺寸", "20==最大扫描尺寸自动裁切", "33==true", "20==最大扫描尺寸"] }, - "45": { + "46": { "category": "advanced", "name": "bkg-fill-mode", "title": "背景填充方式", @@ -535,9 +546,9 @@ "default": "凸多边形", "size": 40, "range": ["凸多边形", "凹多边形"], - "depend_or": ["40==true"] + "depend_or": ["41==true"] }, - "46": { + "47": { "category": "base", "name": "is-anti-permeate", "title": "防止渗透", @@ -547,7 +558,7 @@ "default": false, "size": 4 }, - "47": { + "48": { "category": "base", "name": "permeate-level", "title": " 防止渗透等级", @@ -557,22 +568,22 @@ "default": "较弱", "size": 16, "range": ["弱", "较弱", "一般", "较强", "强"], - "depend_or": ["46==true"] + "depend_or": ["47==true"] }, - "48": { + "49": { "category": "base", - "name": "is-rid-hole", - "title": "穿孔移除", - "desc": "移除纸张中的穿孔", + "name": "is-rid-hole-l", + "title": "穿孔移除—左侧", + "desc": "穿孔在纸张上的左侧", "type": "bool", "cur": false, "default": false, "size": 4 }, - "49": { + "50": { "category": "base", - "name": "search-hole-range", - "title": " 穿孔搜索范围占幅面比例", + "name": "search-hole-range-l", + "title": " 左侧穿孔搜索范围占幅面比例", "desc": "穿孔搜索范围占幅面比例", "type": "float", "cur": 0.100000, @@ -582,9 +593,84 @@ "min": 0.010000, "max": 0.500000 }, - "depend_or": ["48==true"] + "depend_and": ["49==true"] }, - "50": { + "51": { + "category": "base", + "name": "is-rid-hole-r", + "title": "穿孔移除—右侧", + "desc": "穿孔在纸张上的右侧", + "type": "bool", + "cur": false, + "default": false, + "size": 4 + }, + "52": { + "category": "base", + "name": "search-hole-range-r", + "title": " 右侧穿孔搜索范围占幅面比例", + "desc": "穿孔搜索范围占幅面比例", + "type": "float", + "cur": 0.100000, + "default": 0.100000, + "size": 4, + "range": { + "min": 0.010000, + "max": 0.500000 + }, + "depend_and": ["51==true"] + }, + "53": { + "category": "base", + "name": "is-rid-hole-t", + "title": "穿孔移除—上侧", + "desc": "穿孔在纸张的上部", + "type": "bool", + "cur": false, + "default": false, + "size": 4 + }, + "54": { + "category": "base", + "name": "search-hole-range-t", + "title": " 上侧穿孔搜索范围占幅面比例", + "desc": "穿孔搜索范围占幅面比例", + "type": "float", + "cur": 0.100000, + "default": 0.100000, + "size": 4, + "range": { + "min": 0.010000, + "max": 0.500000 + }, + "depend_and": ["53==true"] + }, + "55": { + "category": "base", + "name": "is-rid-hole-b", + "title": "穿孔移除—下侧", + "desc": "穿孔在纸张的下部", + "type": "bool", + "cur": false, + "default": false, + "size": 4 + }, + "56": { + "category": "base", + "name": "search-hole-range-b", + "title": " 下侧穿孔搜索范围占幅面比例", + "desc": "穿孔搜索范围占幅面比例", + "type": "float", + "cur": 0.100000, + "default": 0.100000, + "size": 4, + "range": { + "min": 0.010000, + "max": 0.500000 + }, + "depend_and": ["55==true"] + }, + "57": { "category": "base", "name": "is-fill-color", "title": "色彩填充", @@ -593,15 +679,15 @@ "cur": false, "default": false, "size": 4, - "depend_and": ["40==true"] + "depend_and": ["41==true"] }, - "51": { + "58": { "category": "base", "name": "grp-4", "title": "送纸方式设置", "type": "group" }, - "52": { + "59": { "category": "base", "name": "is-ultrosonic", "title": "超声波检测", @@ -611,7 +697,7 @@ "default": true, "size": 4 }, - "53": { + "60": { "category": "base", "name": "double-feed", "title": "双张图片处理", @@ -621,9 +707,9 @@ "default": "丢弃图像并停止扫描", "size": 40, "range": ["丢弃图像并停止扫描", "上传图像并停止扫描"], - "depend_or": ["52==true"] + "depend_or": ["55==true"] }, - "54": { + "61": { "category": "base", "name": "is-staple", "title": "装订检测", @@ -633,7 +719,7 @@ "default": false, "size": 4 }, - "55": { + "62": { "category": "base", "name": "is-wait-scan", "title": "待纸扫描", @@ -643,7 +729,7 @@ "default": false, "size": 4 }, - "56": { + "63": { "category": "base", "name": "scan-mode", "title": "扫描张数", @@ -654,7 +740,7 @@ "size": 32, "range": ["连续扫描", "扫描指定张数"] }, - "57": { + "64": { "category": "base", "name": "scan-count", "title": " 扫描数量", @@ -663,9 +749,9 @@ "cur": 1, "default": 1, "size": 4, - "depend_or": ["56==扫描指定张数"] + "depend_or": ["63==扫描指定张数"] }, - "58": { + "65": { "category": "base", "name": "direction", "title": "文稿方向", @@ -676,7 +762,7 @@ "size": 40, "range": ["0°", "90°", "180°", "-90°", "自动文本方向识别°"] }, - "59": { + "66": { "category": "base", "name": "is-rotate-bkg-180", "title": "背面旋转180°", @@ -685,9 +771,9 @@ "cur": false, "default": false, "size": 4, - "depend_and": ["26!=单面", "26!=对折", "58!=自动文本方向识别°"] + "depend_and": ["27!=单面", "27!=对折", "65!=自动文本方向识别°"] }, - "60": { + "67": { "category": "base", "name": "is-check-dog-ear", "title": "折角检测", @@ -697,7 +783,7 @@ "default": false, "size": 4 }, - "61": { + "68": { "category": "base", "name": "dog-ear-size", "title": " 折角大小", @@ -710,9 +796,9 @@ "min": 0, "max": 100 }, - "depend_or": ["60==true"] + "depend_or": ["67==true"] }, - "62": { + "69": { "category": "base", "name": "is-check-askew", "title": "歪斜检测", @@ -722,7 +808,7 @@ "default": true, "size": 4 }, - "63": { + "70": { "category": "base", "name": "askew-range", "title": "歪斜容忍度", @@ -735,9 +821,9 @@ "min": 1, "max": 5 }, - "depend_or": ["62==true"] + "depend_or": ["69==true"] }, - "64": { + "71": { "category": "base", "name": "feed-strength", "title": "分纸强度", @@ -748,7 +834,7 @@ "size": 16, "range": ["弱", "一般", "强"] }, - "65": { + "72": { "category": "base", "name": "time-to-sleep", "title": "休眠时间", @@ -759,7 +845,7 @@ "size": 24, "range": ["不休眠", "五分钟", "十分钟", "半小时", "一小时", "两小时", "四小时"] }, - "66": { + "73": { "category": "base", "name": "is-auto-strength", "title": "自动搓纸强度", @@ -769,7 +855,7 @@ "default": false, "size": 4 }, - "67": { + "74": { "category": "base", "name": "feed-strength-value", "title": " 搓纸阈值", @@ -782,6 +868,6 @@ "min": 0.100000, "max": 0.900000 }, - "depend_or": ["66==true"] + "depend_or": ["73==true"] } } \ No newline at end of file diff --git a/tools/apps/hgjson/hgjsonDlg.cpp b/tools/apps/hgjson/hgjsonDlg.cpp index def7ff6..265a421 100644 --- a/tools/apps/hgjson/hgjsonDlg.cpp +++ b/tools/apps/hgjson/hgjsonDlg.cpp @@ -5757,6 +5757,7 @@ struct , {SANE_STD_OPT_NAME_MULTI_OUT_TYPE , OPTION_TITLE_DLSCLX} , {SANE_STD_OPT_NAME_COLOR_MODE , OPTION_TITLE_YSMS} , {SANE_STD_OPT_NAME_BINARY_THRESHOLD , OPTION_TITLE_HBTXYZ} + , {SANE_STD_OPT_NAME_REVERSE_01 , OPTION_TITLE_HBTXFSSC} , {SANE_STD_OPT_NAME_FILTER , OPTION_TITLE_HDHHBTX_CS} , {SANE_STD_OPT_NAME_RID_MULTIOUT_RED , OPTION_TITLE_24WCSTX_DLSCCH} , {SANE_STD_OPT_NAME_RID_ANSWER_SHEET_RED , OPTION_TITLE_24WCSTX_DTKCH} @@ -5796,8 +5797,14 @@ struct , {SANE_STD_OPT_NAME_FILL_BKG_MODE , OPTION_TITLE_BJTCFS} , {SANE_STD_OPT_NAME_IS_ANTI_PERMEATE , OPTION_TITLE_FZST} , {SANE_STD_OPT_NAME_ANTI_PERMEATE_LEVEL , OPTION_TITLE_FZSTDJ} - , {SANE_STD_OPT_NAME_RID_HOLE , OPTION_TITLE_CKYC} - , {SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE , OPTION_TITLE_CKSSFWZFMBL} + , {SANE_STD_OPT_NAME_RID_HOLE_L , OPTION_TITLE_CKYCZC} + , {SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_L , OPTION_TITLE_ZCCKSSFWZFMBL} + , {SANE_STD_OPT_NAME_RID_HOLE_R , OPTION_TITLE_CKYCYC} + , {SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_R , OPTION_TITLE_YCCKSSFWZFMBL} + , {SANE_STD_OPT_NAME_RID_HOLE_T , OPTION_TITLE_CKYCSC} + , {SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_T , OPTION_TITLE_SCCKSSFWZFMBL} + , {SANE_STD_OPT_NAME_RID_HOLE_B , OPTION_TITLE_CKYCXC} + , {SANE_STD_OPT_NAME_SEARCH_HOLE_RANGE_B , OPTION_TITLE_XCCKSSFWZFMBL} , {SANE_STD_OPT_NAME_IS_FILL_COLOR , OPTION_TITLE_SCTC} , {SANE_STD_OPT_NAME_IS_ULTROSONIC_CHECK , OPTION_TITLE_CSBJC} , {SANE_STD_OPT_NAME_DOUBLE_FEED_HANDLE , OPTION_TITLE_SZTPCL} diff --git a/tools/solution/Release/hgjson.exe b/tools/solution/Release/hgjson.exe index 1ebe4a9..5e8cdb2 100644 Binary files a/tools/solution/Release/hgjson.exe and b/tools/solution/Release/hgjson.exe differ