diff --git a/docs/G139-239.txt b/docs/G139-239.txt index 672e830..479f863 100644 --- a/docs/G139-239.txt +++ b/docs/G139-239.txt @@ -1,7 +1,7 @@ { "global": { "device_type": "G139-G239", - "option_count": 75 + "option_count": 76 }, "restore": { "category": "base", @@ -67,7 +67,8 @@ "size": 4, "range": { "min": 0, - "max": 255 + "max": 255, + "step": 1 }, "depend_or": ["is-multiout==true", "mode==黑白"] }, @@ -132,7 +133,8 @@ "size": 4, "range": { "min": 1, - "max": 128 + "max": 128, + "step": 1 }, "depend_or": ["is-erase-bkg==true"] }, @@ -197,7 +199,8 @@ "size": 4, "range": { "min": 10, - "max": 50 + "max": 50, + "step": 1 }, "depend_or": ["is-noise-optimize==true"] }, @@ -231,7 +234,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 210.000000 + "max": 210.000000, + "step": 21.000000 }, "depend_and": ["is-custom-area==true"] }, @@ -245,7 +249,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 210.000000 + "max": 210.000000, + "step": 21.000000 }, "depend_and": ["is-custom-area==true"] }, @@ -259,7 +264,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 297.000000 + "max": 297.000000, + "step": 29.700000 }, "depend_and": ["is-custom-area==true"] }, @@ -273,7 +279,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 297.000000 + "max": 297.000000, + "step": 29.700000 }, "depend_and": ["is-custom-area==true"] }, @@ -307,7 +314,8 @@ "size": 4, "range": { "min": 1, - "max": 100 + "max": 100, + "step": 1 }, "depend_or": ["page==跳过空白页(通用)", "==跳过空白页(发票纸)"] }, @@ -331,8 +339,9 @@ "default": 200, "size": 4, "range": { - "min": 1, - "max": 600 + "min": 100, + "max": 600, + "step": 1 } }, "image-quality": { @@ -380,7 +389,8 @@ "size": 4, "range": { "min": 1, - "max": 255 + "max": 255, + "step": 1 }, "depend_and": ["is-custom-gamma==false"] }, @@ -394,7 +404,8 @@ "size": 4, "range": { "min": 1, - "max": 7 + "max": 7, + "step": 1 }, "depend_and": ["is-custom-gamma==false"] }, @@ -408,7 +419,8 @@ "size": 4, "range": { "min": 0.010000, - "max": 5.000000 + "max": 5.000000, + "step": 0.499000 }, "depend_and": ["is-custom-gamma==false"] }, @@ -417,6 +429,15 @@ "title": "图像处理", "type": "group" }, + "color-correction": { + "category": "base", + "title": "色偏校正", + "desc": "色彩还原度矫正功能", + "type": "bool", + "cur": false, + "default": false, + "size": 4 + }, "is-anti-skew": { "category": "base", "title": "自动纠偏", @@ -477,7 +498,8 @@ "size": 4, "range": { "min": 30, - "max": 50 + "max": 50, + "step": 1 }, "depend_or": ["is-erase-black-frame==true", "paper==匹配原始尺寸", "==最大扫描尺寸", "==最大扫描尺寸自动裁切", "is-anti-skew==true"] }, @@ -491,7 +513,8 @@ "size": 4, "range": { "min": 1, - "max": 20 + "max": 20, + "step": 1 }, "depend_or": ["is-erase-black-frame==true", "paper==匹配原始尺寸", "==最大扫描尺寸", "==最大扫描尺寸自动裁切", "is-anti-skew==true"] }, @@ -505,7 +528,8 @@ "size": 4, "range": { "min": 5, - "max": 30 + "max": 30, + "step": 1 }, "depend_or": ["is-erase-black-frame==true", "paper==匹配原始尺寸", "==最大扫描尺寸自动裁切", "==最大扫描尺寸", "is-anti-skew==true"] }, @@ -558,7 +582,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 0.500000 + "max": 0.500000, + "step": 0.050000 }, "depend_and": ["is-rid-hole-l==true"] }, @@ -581,7 +606,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 0.500000 + "max": 0.500000, + "step": 0.050000 }, "depend_and": ["is-rid-hole-r==true"] }, @@ -604,7 +630,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 0.500000 + "max": 0.500000, + "step": 0.050000 }, "depend_and": ["is-rid-hole-t==true"] }, @@ -627,7 +654,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 0.500000 + "max": 0.500000, + "step": 0.050000 }, "depend_and": ["is-rid-hole-b==true"] }, @@ -734,7 +762,8 @@ "size": 4, "range": { "min": 1, - "max": 5 + "max": 5, + "step": 1 }, "depend_or": ["is-check-askew==true"] }, @@ -757,7 +786,8 @@ "size": 4, "range": { "min": 0, - "max": 100 + "max": 100, + "step": 1 }, "depend_or": ["is-check-dog-ear==true"] }, @@ -800,7 +830,8 @@ "size": 4, "range": { "min": 0.100000, - "max": 0.900000 + "max": 0.900000, + "step": 0.080000 }, "depend_or": ["is-auto-strength==true"] } diff --git a/docs/G402.txt b/docs/G402.txt index 748ce65..8803399 100644 --- a/docs/G402.txt +++ b/docs/G402.txt @@ -1,7 +1,7 @@ { "global": { "device_type": "G402", - "option_count": 62 + "option_count": 63 }, "restore": { "category": "base", @@ -67,7 +67,8 @@ "size": 4, "range": { "min": 0, - "max": 255 + "max": 255, + "step": 1 }, "depend_or": ["is-multiout==true", "mode==黑白"] }, @@ -132,7 +133,8 @@ "size": 4, "range": { "min": 1, - "max": 128 + "max": 128, + "step": 1 }, "depend_or": ["is-erase-bkg==true"] }, @@ -197,7 +199,8 @@ "size": 4, "range": { "min": 10, - "max": 50 + "max": 50, + "step": 1 }, "depend_or": ["is-noise-optimize==true"] }, @@ -231,7 +234,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 210.000000 + "max": 210.000000, + "step": 21.000000 }, "depend_and": ["is-custom-area==true"] }, @@ -245,7 +249,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 210.000000 + "max": 210.000000, + "step": 21.000000 }, "depend_and": ["is-custom-area==true"] }, @@ -259,7 +264,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 297.000000 + "max": 297.000000, + "step": 29.700000 }, "depend_and": ["is-custom-area==true"] }, @@ -273,7 +279,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 297.000000 + "max": 297.000000, + "step": 29.700000 }, "depend_and": ["is-custom-area==true"] }, @@ -297,7 +304,8 @@ "size": 4, "range": { "min": 1, - "max": 100 + "max": 100, + "step": 1 }, "depend_or": ["page==跳过空白页(发票纸)", "==跳过空白页(通用)"] }, @@ -321,8 +329,9 @@ "default": 200, "size": 4, "range": { - "min": 1, - "max": 600 + "min": 100, + "max": 600, + "step": 1 } }, "is-exchange": { @@ -359,7 +368,8 @@ "size": 4, "range": { "min": 1, - "max": 255 + "max": 255, + "step": 1 } }, "contrast": { @@ -372,7 +382,8 @@ "size": 4, "range": { "min": 1, - "max": 7 + "max": 7, + "step": 1 } }, "gamma": { @@ -385,7 +396,8 @@ "size": 4, "range": { "min": 0.010000, - "max": 5.000000 + "max": 5.000000, + "step": 0.499000 } }, "grp-3": { @@ -393,6 +405,16 @@ "title": "图像处理", "type": "group" }, + "color-correction": { + "category": "base", + "title": "色偏校正", + "desc": "色彩还原度矫正功能", + "type": "bool", + "cur": false, + "default": false, + "size": 4, + "depend_or": ["mode==24位彩色", "==24位彩色"] + }, "is-anti-skew": { "category": "base", "title": "自动纠偏", @@ -453,7 +475,8 @@ "size": 4, "range": { "min": 30, - "max": 50 + "max": 50, + "step": 1 }, "depend_or": ["is-erase-black-frame==true", "paper==匹配原始尺寸", "==最大扫描尺寸", "==最大扫描尺寸自动裁切", "is-anti-skew==true"] }, @@ -467,7 +490,8 @@ "size": 4, "range": { "min": 1, - "max": 20 + "max": 20, + "step": 1 }, "depend_or": ["is-erase-black-frame==true", "paper==匹配原始尺寸", "==最大扫描尺寸", "==最大扫描尺寸自动裁切", "is-anti-skew==true"] }, @@ -481,7 +505,8 @@ "size": 4, "range": { "min": 5, - "max": 30 + "max": 30, + "step": 1 }, "depend_or": ["is-erase-black-frame==true", "paper==匹配原始尺寸", "==最大扫描尺寸自动裁切", "==最大扫描尺寸", "is-anti-skew==true"] }, @@ -534,7 +559,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 0.500000 + "max": 0.500000, + "step": 0.050000 }, "depend_or": ["is-rid-hole-l==true"] }, @@ -557,7 +583,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 0.500000 + "max": 0.500000, + "step": 0.050000 }, "depend_or": ["is-rid-hole-r==true"] }, @@ -580,7 +607,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 0.500000 + "max": 0.500000, + "step": 0.050000 }, "depend_or": ["is-rid-hole-t==true"] }, @@ -603,7 +631,8 @@ "size": 4, "range": { "min": 0.000000, - "max": 0.500000 + "max": 0.500000, + "step": 0.050000 }, "depend_or": ["is-rid-hole-b==true"] }, diff --git a/tools/apps/hgjson/hgjsonDlg.cpp b/tools/apps/hgjson/hgjsonDlg.cpp index b1eb4eb..c1ceb2b 100644 --- a/tools/apps/hgjson/hgjsonDlg.cpp +++ b/tools/apps/hgjson/hgjsonDlg.cpp @@ -5849,6 +5849,7 @@ 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} }, 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 9e8a348..b05936a 100644 Binary files a/tools/solution/Release/hgjson.exe and b/tools/solution/Release/hgjson.exe differ