diff --git a/device/device.def b/device/device.def index ba90ec9..72b095a 100644 --- a/device/device.def +++ b/device/device.def @@ -6,8 +6,8 @@ EXPORTS hg_scanner_enum hg_scanner_open hg_scanner_close - hg_scanner_get_parameter - hg_scanner_set_parameter + hg_scanner_get_option + hg_scanner_set_option hg_scanner_start hg_scanner_stop hg_scanner_get_img_info diff --git a/device/scanner.vcxproj b/device/scanner.vcxproj index 26586d9..22debd1 100644 --- a/device/scanner.vcxproj +++ b/device/scanner.vcxproj @@ -212,6 +212,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf + @@ -221,10 +222,11 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf - + + @@ -266,6 +268,8 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf + + @@ -274,6 +278,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf + @@ -284,12 +289,12 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf - - + + @@ -335,6 +340,8 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf + + diff --git a/device/scanner.vcxproj.filters b/device/scanner.vcxproj.filters index 8f63244..6d50054 100644 --- a/device/scanner.vcxproj.filters +++ b/device/scanner.vcxproj.filters @@ -28,6 +28,12 @@ {3d22771d-a2cc-4972-ab37-f1979d973a4f} + + {ab2dd2e9-f5d1-40f8-ad1d-67b97a60e547} + + + {9e729376-6047-4153-b0b8-dda8f8f722f6} + @@ -147,9 +153,6 @@ dev - - dev - dev @@ -201,11 +204,26 @@ image + + dev\fs + - 源文件 + utils - 源文件 + utils + + + utils + + + utils + + + dev + + + dev @@ -338,12 +356,6 @@ dev - - dev - - - dev - dev @@ -428,12 +440,6 @@ image - - 头文件 - - - 头文件 - 头文件 @@ -455,6 +461,27 @@ 头文件 + + dev\fs + + + utils + + + utils + + + utils + + + utils + + + dev + + + dev + diff --git a/sane/sane.vcxproj b/sane/sane.vcxproj index bb744c0..b2669dd 100644 --- a/sane/sane.vcxproj +++ b/sane/sane.vcxproj @@ -73,7 +73,7 @@ true - $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath) + $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath) $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath) $(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\ $(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\ @@ -81,7 +81,7 @@ false - $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath) + $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath) $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath) $(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\ $(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\ @@ -91,7 +91,7 @@ true $(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\ $(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath) + $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath) $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath) true @@ -99,7 +99,7 @@ false $(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\ $(SolutionDir)..\..\tmp\$(PlatformTarget)\huagao\$(Configuration)\$(ProjectName)\ - $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath) + $(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\sdk\;$(IncludePath) $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\oem\huagao;$(LibraryPath) false @@ -204,17 +204,18 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf - - + - + + + - - - + + + diff --git a/sane/sane.vcxproj.filters b/sane/sane.vcxproj.filters index febe37d..e0c3034 100644 --- a/sane/sane.vcxproj.filters +++ b/sane/sane.vcxproj.filters @@ -13,31 +13,34 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + {4729d343-3a52-4c6c-8239-7de6d820f184} + + + {2204d16a-4bdb-4121-b96a-44b6a6310b06} + - - 源文件 - - - 源文件 - 源文件 源文件 - + + json + + + json + + 源文件 + + sane_opt + - - 头文件 - - - 头文件 - 头文件 @@ -62,15 +65,21 @@ 头文件 - - 头文件 - 头文件 头文件 + + json + + + json + + + sane_opt + diff --git a/sln/hgscanner.sln b/sln/hgscanner.sln index b2d57b4..06bdea7 100644 --- a/sln/hgscanner.sln +++ b/sln/hgscanner.sln @@ -4,9 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 16.0.33214.272 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sane", "..\sane\sane.vcxproj", "{6EEC8A02-7F98-4422-8ED6-2434D43BD1E1}" - ProjectSection(ProjectDependencies) = postProject - {9ED4B425-73E0-423E-9712-455E777481B4} = {9ED4B425-73E0-423E-9712-455E777481B4} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scanner", "..\device\scanner.vcxproj", "{9ED4B425-73E0-423E-9712-455E777481B4}" ProjectSection(ProjectDependencies) = postProject