更新配置及工具

This commit is contained in:
gb 2022-07-23 19:10:59 +08:00
parent c0dc144c72
commit 77a657bcd0
7 changed files with 105 additions and 57 deletions

View File

@ -1,6 +1,6 @@
{
"device_type": "G100",
"option_count": 57,
"option_count": 58,
"1": {
"category": "base",
"name": "cfg-1",
@ -581,6 +581,18 @@
"50": {
"category": "base",
"name": "cfg-50",
"title": "双张图片处理",
"desc": "检测到双张进纸后的处理方式",
"type": "string",
"cur": "丢弃图像并停止扫描",
"default": "丢弃图像并停止扫描",
"size": 40,
"range": ["丢弃图像并停止扫描", "上传图像并停止扫描"],
"depend_or": ["49==true"]
},
"51": {
"category": "base",
"name": "cfg-51",
"title": "装订检测",
"desc": "检测纸张上是否有钉书钉",
"type": "bool",
@ -588,9 +600,9 @@
"default": false,
"size": 4
},
"51": {
"52": {
"category": "base",
"name": "cfg-51",
"name": "cfg-52",
"title": "扫描张数",
"desc": "扫描纸张数量",
"type": "string",
@ -599,20 +611,20 @@
"size": 32,
"range": ["连续扫描", "扫描指定张数"]
},
"52": {
"53": {
"category": "base",
"name": "cfg-52",
"name": "cfg-53",
"title": " 扫描数量",
"desc": "扫描指定数量",
"type": "int",
"cur": 1,
"default": 1,
"size": 4,
"depend_or": ["51==扫描指定张数"]
"depend_or": ["52==扫描指定张数"]
},
"53": {
"54": {
"category": "base",
"name": "cfg-53",
"name": "cfg-54",
"title": "文稿方向",
"desc": "文稿方向",
"type": "string",
@ -621,20 +633,20 @@
"size": 40,
"range": ["0°", "90°", "180°", "-90°", "自动文本方向识别°"]
},
"54": {
"55": {
"category": "base",
"name": "cfg-54",
"name": "cfg-55",
"title": "背面旋转180°",
"desc": "背面扫描的图像旋转180°",
"type": "bool",
"cur": false,
"default": false,
"size": 4,
"depend_and": ["25!=单面", "25!=对折", "53!=自动文本方向识别°"]
"depend_and": ["25!=单面", "25!=对折", "54!=自动文本方向识别°"]
},
"55": {
"56": {
"category": "base",
"name": "cfg-55",
"name": "cfg-56",
"title": "歪斜检测",
"desc": "纸张歪斜检测",
"type": "bool",
@ -642,9 +654,9 @@
"default": true,
"size": 4
},
"56": {
"57": {
"category": "base",
"name": "cfg-56",
"name": "cfg-57",
"title": " 歪斜容忍度",
"desc": "值越小,代表能检测到纸张的歪斜角度越小",
"type": "int",
@ -655,6 +667,6 @@
"min": 1,
"max": 5
},
"depend_or": ["55==true"]
"depend_or": ["56==true"]
}
}

View File

@ -1,6 +1,6 @@
{
"device_type": "G239",
"option_count": 61,
"option_count": 62,
"1": {
"category": "base",
"name": "cfg-1",
@ -604,6 +604,18 @@
"52": {
"category": "base",
"name": "cfg-52",
"title": "双张图片处理",
"desc": "检测到双张进纸后的处理方式",
"type": "string",
"cur": "丢弃图像并停止扫描",
"default": "丢弃图像并停止扫描",
"size": 40,
"range": ["丢弃图像并停止扫描", "上传图像并停止扫描"],
"depend_or": ["51==true"]
},
"53": {
"category": "base",
"name": "cfg-53",
"title": "装订检测",
"desc": "检测纸张上是否有钉书钉",
"type": "bool",
@ -611,9 +623,9 @@
"default": false,
"size": 4
},
"53": {
"54": {
"category": "base",
"name": "cfg-53",
"name": "cfg-54",
"title": "扫描张数",
"desc": "扫描纸张数量",
"type": "string",
@ -622,20 +634,20 @@
"size": 32,
"range": ["连续扫描", "扫描指定张数"]
},
"54": {
"55": {
"category": "base",
"name": "cfg-54",
"name": "cfg-55",
"title": " 扫描数量",
"desc": "扫描指定数量",
"type": "int",
"cur": 1,
"default": 1,
"size": 4,
"depend_or": ["53==扫描指定张数"]
"depend_or": ["54==扫描指定张数"]
},
"55": {
"56": {
"category": "base",
"name": "cfg-55",
"name": "cfg-56",
"title": "文稿方向",
"desc": "文稿方向",
"type": "string",
@ -644,20 +656,20 @@
"size": 40,
"range": ["0°", "90°", "180°", "-90°", "自动文本方向识别°"]
},
"56": {
"57": {
"category": "base",
"name": "cfg-56",
"name": "cfg-57",
"title": "背面旋转180°",
"desc": "背面扫描的图像旋转180°",
"type": "bool",
"cur": false,
"default": false,
"size": 4,
"depend_and": ["26!=单面", "26!=对折", "55!=自动文本方向识别°"]
"depend_and": ["26!=单面", "26!=对折", "56!=自动文本方向识别°"]
},
"57": {
"58": {
"category": "base",
"name": "cfg-57",
"name": "cfg-58",
"title": "折角检测",
"desc": "纸张折角检测",
"type": "bool",
@ -665,9 +677,9 @@
"default": false,
"size": 4
},
"58": {
"59": {
"category": "base",
"name": "cfg-58",
"name": "cfg-59",
"title": " 折角大小",
"desc": "值越小,代表能检测到的折角越小",
"type": "int",
@ -678,11 +690,11 @@
"min": 0,
"max": 100
},
"depend_or": ["57==true"]
"depend_or": ["58==true"]
},
"59": {
"60": {
"category": "base",
"name": "cfg-59",
"name": "cfg-60",
"title": "歪斜检测",
"desc": "纸张歪斜检测",
"type": "bool",
@ -690,9 +702,9 @@
"default": true,
"size": 4
},
"60": {
"61": {
"category": "base",
"name": "cfg-60",
"name": "cfg-61",
"title": "歪斜容忍度",
"desc": "值越小,代表能检测到纸张的歪斜角度越小",
"type": "int",
@ -703,6 +715,6 @@
"min": 1,
"max": 5
},
"depend_or": ["59==true"]
"depend_or": ["60==true"]
}
}

View File

@ -1,6 +1,6 @@
{
"device_type": "G300",
"option_count": 54,
"option_count": 55,
"1": {
"category": "base",
"name": "cfg-1",
@ -581,6 +581,18 @@
"50": {
"category": "base",
"name": "cfg-50",
"title": "双张图片处理",
"desc": "检测到双张进纸后的处理方式",
"type": "string",
"cur": "丢弃图像并停止扫描",
"default": "丢弃图像并停止扫描",
"size": 40,
"range": ["丢弃图像并停止扫描", "上传图像并停止扫描"],
"depend_or": ["49==true"]
},
"51": {
"category": "base",
"name": "cfg-51",
"title": "扫描张数",
"desc": "扫描纸张数量",
"type": "string",
@ -589,20 +601,20 @@
"size": 32,
"range": ["连续扫描", "扫描指定张数"]
},
"51": {
"52": {
"category": "base",
"name": "cfg-51",
"name": "cfg-52",
"title": " 扫描数量",
"desc": "扫描指定数量",
"type": "int",
"cur": 1,
"default": 1,
"size": 4,
"depend_or": ["50==扫描指定张数"]
"depend_or": ["51==扫描指定张数"]
},
"52": {
"53": {
"category": "base",
"name": "cfg-52",
"name": "cfg-53",
"title": "文稿方向",
"desc": "文稿方向",
"type": "string",
@ -611,15 +623,15 @@
"size": 40,
"range": ["0°", "90°", "180°", "-90°", "自动文本方向识别°"]
},
"53": {
"54": {
"category": "base",
"name": "cfg-53",
"name": "cfg-54",
"title": "背面旋转180°",
"desc": "背面扫描的图像旋转180°",
"type": "bool",
"cur": false,
"default": false,
"size": 4,
"depend_and": ["25!=单面", "25!=对折", "52!=自动文本方向识别°"]
"depend_and": ["25!=单面", "25!=对折", "53!=自动文本方向识别°"]
}
}

View File

@ -1,6 +1,6 @@
{
"device_type": "G400",
"option_count": 55,
"option_count": 56,
"1": {
"category": "base",
"name": "cfg-1",
@ -589,6 +589,18 @@
"51": {
"category": "base",
"name": "cfg-51",
"title": "双张图片处理",
"desc": "检测到双张进纸后的处理方式",
"type": "string",
"cur": "丢弃图像并停止扫描",
"default": "丢弃图像并停止扫描",
"size": 40,
"range": ["丢弃图像并停止扫描", "上传图像并停止扫描"],
"depend_or": ["50==true"]
},
"52": {
"category": "base",
"name": "cfg-52",
"title": "扫描张数",
"desc": "扫描纸张数量",
"type": "string",
@ -597,20 +609,20 @@
"size": 32,
"range": ["连续扫描", "扫描指定张数"]
},
"52": {
"53": {
"category": "base",
"name": "cfg-52",
"name": "cfg-53",
"title": " 扫描数量",
"desc": "扫描指定数量",
"type": "int",
"cur": 1,
"default": 1,
"size": 4,
"depend_or": ["51==扫描指定张数"]
"depend_or": ["52==扫描指定张数"]
},
"53": {
"54": {
"category": "base",
"name": "cfg-53",
"name": "cfg-54",
"title": "文稿方向",
"desc": "文稿方向",
"type": "string",
@ -619,15 +631,15 @@
"size": 40,
"range": ["0°", "90°", "180°", "-90°", "自动文本方向识别°"]
},
"54": {
"55": {
"category": "base",
"name": "cfg-54",
"name": "cfg-55",
"title": "背面旋转180°",
"desc": "背面扫描的图像旋转180°",
"type": "bool",
"cur": false,
"default": false,
"size": 4,
"depend_and": ["26!=单面", "26!=对折", "53!=自动文本方向识别°"]
"depend_and": ["26!=单面", "26!=对折", "54!=自动文本方向识别°"]
}
}

View File

@ -27,7 +27,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>

View File

@ -5735,7 +5735,7 @@ namespace hz_2_py
str.erase(i, 1);
i--;
}
else if (str[i] == L'-')
else if (str[i] == L'-' || str[i] == L'+')
{
str.replace(i, 1, L"_");
}

Binary file not shown.