新增待纸扫描时间退出

docs/G139-239.txt

@@ -1,10 +1,12 @@
 {
 	"global": {
 		"device_type": "G139-G239",
-		"option_count": 76
+		"option_count": 77
 	},
 	"restore": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "恢复默认设置",
 		"desc": "恢复默认设置",
 		"type": "button",
@@ -14,6 +16,8 @@
 	},
 	"help": {
 		"category": "advanced",
+		"readonly": false,
+		"hwonly": false,
 		"title": "帮助",
 		"desc": "显示软件帮助文档",
 		"type": "button",
@@ -24,10 +28,14 @@
 	"grp-1": {
 		"category": "base",
 		"title": "基本设置",
-		"type": "group"
+		"type": "group",
+		"readonly": false,
+		"hwonly": false
 	},
 	"is-multiout": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "多流输出",
 		"desc": "同时输出多种颜色模式的图像",
 		"type": "bool",
@@ -37,6 +45,8 @@
 	},
 	"multiout-type": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "多流输出类型",
 		"desc": "选择多流输出的类型",
 		"type": "string",
@@ -48,6 +58,8 @@
 	},
 	"mode": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "颜色模式",
 		"desc": "选择色彩模式",
 		"type": "string",
@@ -59,6 +71,8 @@
 	},
 	"binary-threshold": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "黑白图像阈值",
 		"desc": "高于该阈值为1（白），低于该阈值为0（黑）",
 		"type": "int",
@@ -74,6 +88,8 @@
 	},
 	"reverse-bw": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "黑白图像反色输出",
 		"desc": "输出的黑白图像以“1”代表黑色，“0”代表白色",
 		"type": "bool",
@@ -84,6 +100,8 @@
 	},
 	"filter": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "灰度或黑白图像 - 除色与增强",
 		"desc": "消除或增强指定色彩",
 		"type": "string",
@@ -95,6 +113,8 @@
 	},
 	"is-rid-multiout-red": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "24位彩色图像 - 多流输出除红",
 		"desc": "同时输出彩色图像和灰度除红图像",
 		"type": "bool",
@@ -105,6 +125,8 @@
 	},
 	"is-rid-answer-sheet-red": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "24位彩色图像 - 答题卡除红",
 		"desc": "输出除红彩色图像",
 		"type": "bool",
@@ -115,6 +137,8 @@
 	},
 	"is-erase-bkg": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "背景移除",
 		"desc": "移除文稿背景底色",
 		"type": "bool",
@@ -125,6 +149,8 @@
 	},
 	"bkg-color-range": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "    背景色彩浮动范围",
 		"desc": "与背景底色偏差在该值范围内的颜色，都将被移除",
 		"type": "int",
@@ -140,6 +166,8 @@
 	},
 	"sharpen": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "锐化与模糊",
 		"desc": "选择锐化效果或模糊效果",
 		"type": "string",
@@ -151,6 +179,8 @@
 	},
 	"is-rid-morr": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "去除摩尔纹",
 		"desc": "去除图像中的摩尔纹",
 		"type": "bool",
@@ -161,6 +191,8 @@
 	},
 	"is-rid-grid": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "除网纹",
 		"desc": "去除图像中的网纹",
 		"type": "bool",
@@ -171,6 +203,8 @@
 	},
 	"is-err-extension": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "错误扩散",
 		"desc": "以点阵形式构建图像",
 		"type": "bool",
@@ -181,6 +215,8 @@
 	},
 	"is-noise-optimize": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "黑白图像噪点优化",
 		"desc": "去除图像中的孤立黑点",
 		"type": "bool",
@@ -191,6 +227,8 @@
 	},
 	"noise-size": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": " 噪点优化尺寸",
 		"desc": "设置需要去除的黑色孤立点的连通个数",
 		"type": "int",
@@ -206,6 +244,8 @@
 	},
 	"paper": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "纸张尺寸",
 		"desc": "设置出图大小",
 		"type": "string",
@@ -216,6 +256,8 @@
 	},
 	"is-custom-area": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "自定义扫描区域",
 		"desc": "自定义扫描区域",
 		"type": "bool",
@@ -226,6 +268,8 @@
 	},
 	"tl-x": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "扫描区域左侧（mm）",
 		"desc": "自定义扫描区域左上角x坐标",
 		"type": "float",
@@ -241,6 +285,8 @@
 	},
 	"br-x": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "扫描区域右侧（mm）",
 		"desc": "自定义扫描区域右下角x坐标",
 		"type": "float",
@@ -256,6 +302,8 @@
 	},
 	"tl-y": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "扫描区域上侧（mm）",
 		"desc": "自定义扫描区域左上角y坐标",
 		"type": "float",
@@ -271,6 +319,8 @@
 	},
 	"br-y": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "扫描区域下侧（mm）",
 		"desc": "自定义扫描区域右下角y坐标",
 		"type": "float",
@@ -286,6 +336,8 @@
 	},
 	"is-size-check": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "尺寸检测",
 		"desc": "检测纸张实际尺寸与设置是否匹配",
 		"type": "bool",
@@ -296,6 +348,8 @@
 	},
 	"page": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "扫描页面",
 		"desc": "设置页面扫描方式",
 		"type": "string",
@@ -306,6 +360,8 @@
 	},
 	"blank-sensitivity": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": " 跳过空白页灵敏度",
 		"desc": "数值越大，则越容易跳过",
 		"type": "int",
@@ -321,6 +377,8 @@
 	},
 	"fold-type": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "对折模式",
 		"desc": "",
 		"type": "string",
@@ -332,6 +390,8 @@
 	},
 	"resolution": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "分辨率",
 		"desc": "设置扫描图像的分辨率",
 		"type": "int",
@@ -346,6 +406,8 @@
 	},
 	"image-quality": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "画质",
 		"desc": "选择扫描仪的画质模式",
 		"type": "string",
@@ -357,6 +419,8 @@
 	},
 	"is-exchange": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "交换正反面",
 		"desc": "交换每张文稿的正反面出图顺序",
 		"type": "bool",
@@ -368,10 +432,14 @@
 	"grp-2": {
 		"category": "base",
 		"title": "亮度",
-		"type": "group"
+		"type": "group",
+		"readonly": false,
+		"hwonly": false
 	},
 	"is-custom-gamma": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "启用色调曲线",
 		"desc": "自定义图像色调效果",
 		"type": "bool",
@@ -381,6 +449,8 @@
 	},
 	"brightness": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "亮度值",
 		"desc": "调整图像亮度",
 		"type": "int",
@@ -396,6 +466,8 @@
 	},
 	"contrast": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "对比度",
 		"desc": "调整图像对比度",
 		"type": "int",
@@ -411,6 +483,8 @@
 	},
 	"gamma": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "伽马值",
 		"desc": "调整图像伽玛值",
 		"type": "float",
@@ -427,10 +501,14 @@
 	"grp-3": {
 		"category": "base",
 		"title": "图像处理",
-		"type": "group"
+		"type": "group",
+		"readonly": false,
+		"hwonly": false
 	},
-	"color-correction": {
+	"cfg-39": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "色偏校正",
 		"desc": "色彩还原度矫正功能",
 		"type": "bool",
@@ -440,6 +518,8 @@
 	},
 	"is-anti-skew": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "自动纠偏",
 		"desc": "自动纠正歪斜送入的文稿图像",
 		"type": "bool",
@@ -450,6 +530,8 @@
 	},
 	"is-split": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "图像拆分",
 		"desc": "自动拆分图像",
 		"type": "bool",
@@ -460,6 +542,8 @@
 	},
 	"is-erase-black-frame": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "消除黑框",
 		"desc": "消除文稿范围外的黑色背景",
 		"type": "bool",
@@ -469,6 +553,8 @@
 	},
 	"bkg-fill-mode": {
 		"category": "advanced",
+		"readonly": false,
+		"hwonly": false,
 		"title": "背景填充方式",
 		"desc": "选择背景填充方式",
 		"type": "string",
@@ -480,6 +566,8 @@
 	},
 	"is-fill-color": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "色彩填充",
 		"desc": "启用后黑框部分将填充为文稿底色",
 		"type": "bool",
@@ -490,6 +578,8 @@
 	},
 	"threshold": {
 		"category": "advanced",
+		"readonly": false,
+		"hwonly": false,
 		"title": "阈值",
 		"desc": "文稿底色与黑色背景灰度值的差值大于该值，才会被识别为文稿",
 		"type": "int",
@@ -505,6 +595,8 @@
 	},
 	"anti-noise-level": {
 		"category": "advanced",
+		"readonly": false,
+		"hwonly": false,
 		"title": "背景抗噪等级",
 		"desc": "能够容忍的背景杂色条纹的宽度",
 		"type": "int",
@@ -520,6 +612,8 @@
 	},
 	"margin": {
 		"category": "advanced",
+		"readonly": false,
+		"hwonly": false,
 		"title": "边缘缩进",
 		"desc": "寻找文稿边缘时对边缘的侵入程度",
 		"type": "int",
@@ -535,6 +629,8 @@
 	},
 	"is-dark-sample": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "深色样张",
 		"desc": "启用该模式防止深色底色的文稿图像被误处理",
 		"type": "bool",
@@ -545,6 +641,8 @@
 	},
 	"is-anti-permeate": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "防止渗透",
 		"desc": "防止背面图案渗透",
 		"type": "bool",
@@ -554,6 +652,8 @@
 	},
 	"permeate-level": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": " 防止渗透等级",
 		"desc": "选择防止渗透的等级",
 		"type": "string",
@@ -565,6 +665,8 @@
 	},
 	"is-rid-hole-l": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "穿孔移除—左侧",
 		"desc": "穿孔在纸张上的左侧",
 		"type": "bool",
@@ -574,6 +676,8 @@
 	},
 	"search-hole-range-l": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "        左侧穿孔搜索范围占幅面比例",
 		"desc": "穿孔搜索范围占幅面比例",
 		"type": "float",
@@ -589,6 +693,8 @@
 	},
 	"is-rid-hole-r": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "穿孔移除—右侧",
 		"desc": "穿孔在纸张上的右侧",
 		"type": "bool",
@@ -598,6 +704,8 @@
 	},
 	"search-hole-range-r": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "        右侧穿孔搜索范围占幅面比例",
 		"desc": "穿孔搜索范围占幅面比例",
 		"type": "float",
@@ -613,6 +721,8 @@
 	},
 	"is-rid-hole-t": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "穿孔移除—上侧",
 		"desc": "穿孔在纸张的上部",
 		"type": "bool",
@@ -622,6 +732,8 @@
 	},
 	"search-hole-range-t": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "        上侧穿孔搜索范围占幅面比例",
 		"desc": "穿孔搜索范围占幅面比例",
 		"type": "float",
@@ -637,6 +749,8 @@
 	},
 	"is-rid-hole-b": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "穿孔移除—下侧",
 		"desc": "穿孔在纸张的下部",
 		"type": "bool",
@@ -646,6 +760,8 @@
 	},
 	"search-hole-range-b": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "        下侧穿孔搜索范围占幅面比例",
 		"desc": "穿孔搜索范围占幅面比例",
 		"type": "float",
@@ -662,10 +778,14 @@
 	"grp-4": {
 		"category": "base",
 		"title": "送纸方式设置",
-		"type": "group"
+		"type": "group",
+		"readonly": false,
+		"hwonly": false
 	},
 	"is-wait-scan": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "待纸扫描",
 		"desc": "启用后，文稿放入扫描仪时将自动启动扫描",
 		"type": "bool",
@@ -673,8 +793,23 @@
 		"default": false,
 		"size": 4
 	},
+	"cfg-61": {
+		"category": "base",
+		"readonly": false,
+		"hwonly": false,
+		"title": "待纸扫描退出时间(s)",
+		"desc": "设置结束待纸扫描的时间",
+		"type": "int",
+		"cur": 30,
+		"default": 30,
+		"size": 4,
+		"range": [0, 15, 30, 60, 120, 240, 480],
+		"depend_or": ["is-wait-scan==true"]
+	},
 	"scan-mode": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "扫描张数",
 		"desc": "选择指定数量扫描或连续扫描",
 		"type": "string",
@@ -686,6 +821,8 @@
 	},
 	"scan-count": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": " 扫描数量",
 		"desc": "扫描指定数量",
 		"type": "int",
@@ -696,6 +833,8 @@
 	},
 	"direction": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "文稿方向",
 		"desc": "设置图像的方向",
 		"type": "string",
@@ -706,6 +845,8 @@
 	},
 	"is-rotate-bkg-180": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "背面旋转180°",
 		"desc": "背面扫描的图像旋转180°",
 		"type": "bool",
@@ -716,6 +857,8 @@
 	},
 	"is-ultrosonic": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "超声波检测",
 		"desc": "检测是否出现双张送入",
 		"type": "bool",
@@ -725,6 +868,8 @@
 	},
 	"double-feed": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "双张图片处理",
 		"desc": "检测到双张进纸后的处理方式",
 		"type": "string",
@@ -736,6 +881,8 @@
 	},
 	"is-staple": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "装订检测",
 		"desc": "检测是否出现粘连送入",
 		"type": "bool",
@@ -745,6 +892,8 @@
 	},
 	"is-check-askew": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "歪斜检测",
 		"desc": "检测是否出现歪斜送入",
 		"type": "bool",
@@ -754,6 +903,8 @@
 	},
 	"askew-range": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "歪斜容忍度",
 		"desc": "值越小，能容忍得送入文稿歪斜角度越小",
 		"type": "int",
@@ -769,6 +920,8 @@
 	},
 	"is-check-dog-ear": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "折角检测",
 		"desc": "检测文稿是否存在折角",
 		"type": "bool",
@@ -778,6 +931,8 @@
 	},
 	"dog-ear-size": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": " 折角大小",
 		"desc": "值越小，能检测到的折角越小",
 		"type": "int",
@@ -793,6 +948,8 @@
 	},
 	"feed-strength": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "分纸强度",
 		"desc": "设置扫描仪的分纸力度",
 		"type": "string",
@@ -803,6 +960,8 @@
 	},
 	"time-to-sleep": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "休眠时间",
 		"desc": "设置扫描仪的休眠时间",
 		"type": "string",
@@ -813,6 +972,8 @@
 	},
 	"is-auto-strength": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "自动分纸强度",
 		"desc": "扫描仪自动修正分纸力度",
 		"type": "bool",
@@ -822,6 +983,8 @@
 	},
 	"feed-strength-value": {
 		"category": "base",
+		"readonly": false,
+		"hwonly": false,
 		"title": "   进纸失败率",
 		"desc": "高于该值时扫描仪将调整分纸力度",
 		"type": "float",

tools/apps/hgjson/hgjsonDlg.cpp

@@ -5849,6 +5849,8 @@ struct
 			, {SANE_STD_OPT_NAME_FEED_STRENGTH_VALUE   , OPTION_TITLE_JZSBL}
 			, {SANE_STD_OPT_NAME_WAIT_TO_SCAN          , OPTION_TITLE_DZSM}
 			, {SANE_STD_OPT_NAME_FOLD_TYPE			   , OPTION_TITLE_DZMS}
+			, {SANE_STD_OPT_NAME_COLOR_CORRECTION	   , OPTION_TITLE_SPJZ}
+			, {SANE_STD_OPT_NAME_WAIT_SCAN_EXIT		   , OPTION_TITLE_DZSMTCSJ}
 },
 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"}																																						// 灰度或黑白图像 - 除色