优化协议转换,适应新JSON配置,实现SANE-TWAIN属性自动转换

This commit is contained in:
gb 2023-09-21 11:25:12 +08:00
parent b59d92baf8
commit 279b57881b
5 changed files with 34 additions and 13 deletions

View File

@ -228,6 +228,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
<ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_setting.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\hgdev\scanner_setting.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\hgdev\simple_logic.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\hgdev\simple_logic.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\hgdev\usb_manager.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\hgdev\usb_manager.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\hgdev\user.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.cpp" />
<ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.cpp" /> <ClCompile Include="..\..\code_device\hgdriver\ImageProcess\ImageApplyColorCastCorrect.cpp" />
@ -297,6 +298,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
<ClInclude Include="..\..\code_device\hgdriver\hgdev\simple_logic.h" /> <ClInclude Include="..\..\code_device\hgdriver\hgdev\simple_logic.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\threadpool.h" /> <ClInclude Include="..\..\code_device\hgdriver\hgdev\threadpool.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\usb_manager.h" /> <ClInclude Include="..\..\code_device\hgdriver\hgdev\usb_manager.h" />
<ClInclude Include="..\..\code_device\hgdriver\hgdev\user.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\CISTestImageProcess.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\G4Tiff.h" />
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h" /> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h" />

View File

@ -225,6 +225,9 @@
<ClCompile Include="..\..\code_device\hgdriver\hgdev\simple_logic.cpp"> <ClCompile Include="..\..\code_device\hgdriver\hgdev\simple_logic.cpp">
<Filter>dev</Filter> <Filter>dev</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\code_device\hgdriver\hgdev\user.cpp">
<Filter>dev</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h"> <ClInclude Include="..\..\code_device\hgdriver\ImageProcess\ImageApply.h">
@ -482,6 +485,9 @@
<ClInclude Include="..\..\code_device\hgdriver\hgdev\simple_logic.h"> <ClInclude Include="..\..\code_device\hgdriver\hgdev\simple_logic.h">
<Filter>dev</Filter> <Filter>dev</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\code_device\hgdriver\hgdev\user.h">
<Filter>dev</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="device.def"> <None Include="device.def">

View File

@ -15,12 +15,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twain", "..\twain\twain.vcx
{6EEC8A02-7F98-4422-8ED6-2434D43BD1E1} = {6EEC8A02-7F98-4422-8ED6-2434D43BD1E1} {6EEC8A02-7F98-4422-8ED6-2434D43BD1E1} = {6EEC8A02-7F98-4422-8ED6-2434D43BD1E1}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setup", "setup", "{F6774650-403F-476C-8373-2EA8D4AF06FF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hgsetver", "hgsetver\hgsetver.vcxproj", "{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lang", "..\lang\lang.vcxproj", "{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lang", "..\lang\lang.vcxproj", "{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "kernel", "kernel", "{C43532EF-1B31-457F-B40B-61F22E91A13E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{53E5EDD9-13BA-4F3C-A387-C73CB06C686D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hgjson", "..\..\doc_and_tools\tools\apps\hgjson\hgjson.vcxproj", "{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
@ -53,14 +55,6 @@ Global
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x64.Build.0 = Release|x64 {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x64.Build.0 = Release|x64
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.ActiveCfg = Release|Win32 {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.ActiveCfg = Release|Win32
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.Build.0 = Release|Win32 {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.Build.0 = Release|Win32
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.ActiveCfg = Debug|x64
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.Build.0 = Debug|x64
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.ActiveCfg = Debug|Win32
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.Build.0 = Debug|Win32
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x64.ActiveCfg = Release|x64
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x64.Build.0 = Release|x64
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x86.ActiveCfg = Release|Win32
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x86.Build.0 = Release|Win32
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Debug|x64.ActiveCfg = Debug|x64 {7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Debug|x64.ActiveCfg = Debug|x64
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Debug|x64.Build.0 = Debug|x64 {7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Debug|x64.Build.0 = Debug|x64
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Debug|x86.ActiveCfg = Debug|Win32 {7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Debug|x86.ActiveCfg = Debug|Win32
@ -69,12 +63,22 @@ Global
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Release|x64.Build.0 = Release|x64 {7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Release|x64.Build.0 = Release|x64
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Release|x86.ActiveCfg = Release|Win32 {7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Release|x86.ActiveCfg = Release|Win32
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Release|x86.Build.0 = Release|Win32 {7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Release|x86.Build.0 = Release|Win32
{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Debug|x64.ActiveCfg = Debug|Win32
{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Debug|x86.ActiveCfg = Debug|Win32
{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Debug|x86.Build.0 = Debug|Win32
{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x64.ActiveCfg = Release|Win32
{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x86.ActiveCfg = Release|Win32
{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x86.Build.0 = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
EndGlobalSection EndGlobalSection
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{A7528596-FBA2-4FFF-8649-C8D0EEBC6554} = {F6774650-403F-476C-8373-2EA8D4AF06FF} {6EEC8A02-7F98-4422-8ED6-2434D43BD1E1} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
{9ED4B425-73E0-423E-9712-455E777481B4} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
{D3579C48-F5AB-4F15-9B49-A2970FBA76C5} = {53E5EDD9-13BA-4F3C-A387-C73CB06C686D}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A89068FF-95C4-3C1E-B126-70B66C9824BB} SolutionGuid = {A89068FF-95C4-3C1E-B126-70B66C9824BB}

View File

@ -294,6 +294,12 @@ move /Y "$(TargetPath)" "$(TargetDir)$(TargetName)"</Command>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\code_device\twain\ds\s2t.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\code_device\twain\ds\sane_helper.cpp"> <ClCompile Include="..\..\code_device\twain\ds\sane_helper.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>

View File

@ -49,6 +49,9 @@
<ClCompile Include="..\..\code_device\twain\ds\scanner.cpp"> <ClCompile Include="..\..\code_device\twain\ds\scanner.cpp">
<Filter>imports</Filter> <Filter>imports</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\code_device\twain\ds\s2t.cpp">
<Filter>imports</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="pch.h"> <ClInclude Include="pch.h">