lmh188
/
doc_and_tools
mirror of http://192.168.10.5:8099/sane/doc_and_tools.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

添加界面顺序属性

This commit is contained in:
gb 2023-12-14 14:29:43 +08:00
parent 33da0a7463
commit 55bbec8d28
8 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
tools/apps/hgjson/DlgOptJson.cpp
View File

File diff suppressed because one or more lines are too long

1
tools/apps/hgjson/DlgOptJson.h
View File

@ -94,6 +94,7 @@ public:
int size; int size;
int ver; int ver;
int pos; int pos;
int ui_pos;
int fix_id; int fix_id;
int auth; // 用户权限 int auth; // 用户权限
bool readonly; bool readonly;

BIN
tools/apps/hgjson/hgjson.rc
View File

Binary file not shown.

13
tools/apps/hgjson/hgjson.vcxproj
View File

@ -115,10 +115,9 @@
<Text Include="ReadMe.txt" /> <Text Include="ReadMe.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\scanner_setting.h" />
<ClInclude Include="..\..\..\..\code_device\hgsane\sane_opt\sane_opts.h" /> <ClInclude Include="..\..\..\..\code_device\hgsane\sane_opt\sane_opts.h" />
<ClInclude Include="..\..\..\..\code_device\sdk\hginclude\ini_file.h" /> <ClInclude Include="..\..\..\..\code_device\sdk\base\ini_file.h" />
<ClInclude Include="..\..\..\..\code_device\sdk\hginclude\utils.h" /> <ClInclude Include="..\..\..\..\code_device\sdk\base\utils.h" />
<ClInclude Include="..\..\..\..\code_device\sdk\json\cJSON.h" /> <ClInclude Include="..\..\..\..\code_device\sdk\json\cJSON.h" />
<ClInclude Include="..\..\..\..\code_device\sdk\json\gb_json.h" /> <ClInclude Include="..\..\..\..\code_device\sdk\json\gb_json.h" />
<ClInclude Include="..\..\..\..\code_device\sdk\sane_opt_json\base_opt.h" /> <ClInclude Include="..\..\..\..\code_device\sdk\sane_opt_json\base_opt.h" />
@ -143,19 +142,15 @@
<ClInclude Include="targetver.h" /> <ClInclude Include="targetver.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\scanner_setting.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\code_device\hgsane\sane_opt\sane_opts.cpp"> <ClCompile Include="..\..\..\..\code_device\hgsane\sane_opt\sane_opts.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>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\code_device\sdk\hginclude\ini_file.cpp"> <ClCompile Include="..\..\..\..\code_device\sdk\base\ini_file.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>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\code_device\sdk\hginclude\utils.cpp"> <ClCompile Include="..\..\..\..\code_device\sdk\base\utils.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>
</ClCompile> </ClCompile>

30
tools/apps/hgjson/hgjson.vcxproj.filters
View File

@ -45,9 +45,6 @@
<ClInclude Include="DlgInput.h"> <ClInclude Include="DlgInput.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\code_device\hgdriver\hgdev\scanner_setting.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="CDlgMain.h"> <ClInclude Include="CDlgMain.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -87,12 +84,6 @@
<ClInclude Include="DlgCondition.h"> <ClInclude Include="DlgCondition.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\code_device\sdk\hginclude\utils.h">
<Filter>sane_opt</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\code_device\sdk\hginclude\ini_file.h">
<Filter>sane_opt</Filter>
</ClInclude>
<ClInclude Include="DlgManualUSB.h"> <ClInclude Include="DlgManualUSB.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@ -105,6 +96,12 @@
<ClInclude Include="..\..\..\..\code_device\sdk\sane_opt_json\simple_logic.h"> <ClInclude Include="..\..\..\..\code_device\sdk\sane_opt_json\simple_logic.h">
<Filter>sane_opt</Filter> <Filter>sane_opt</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\..\..\code_device\sdk\base\ini_file.h">
<Filter>sane_opt</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\code_device\sdk\base\utils.h">
<Filter>sane_opt</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="hgjson.cpp"> <ClCompile Include="hgjson.cpp">
@ -119,9 +116,6 @@
<ClCompile Include="DlgInput.cpp"> <ClCompile Include="DlgInput.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\code_device\hgdriver\hgdev\scanner_setting.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="CDlgMain.cpp"> <ClCompile Include="CDlgMain.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -161,12 +155,6 @@
<ClCompile Include="DlgCondition.cpp"> <ClCompile Include="DlgCondition.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\code_device\sdk\hginclude\utils.cpp">
<Filter>sane_opt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\code_device\sdk\hginclude\ini_file.cpp">
<Filter>sane_opt</Filter>
</ClCompile>
<ClCompile Include="DlgManualUSB.cpp"> <ClCompile Include="DlgManualUSB.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -179,6 +167,12 @@
<ClCompile Include="..\..\..\..\code_device\sdk\sane_opt_json\simple_logic.cpp"> <ClCompile Include="..\..\..\..\code_device\sdk\sane_opt_json\simple_logic.cpp">
<Filter>sane_opt</Filter> <Filter>sane_opt</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\..\code_device\sdk\base\ini_file.cpp">
<Filter>sane_opt</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\code_device\sdk\base\utils.cpp">
<Filter>sane_opt</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="hgjson.rc"> <ResourceCompile Include="hgjson.rc">

6
tools/apps/hgjson/hgjsonDlg.cpp
View File

@ -19,7 +19,7 @@
#include <file/file_util.h> #include <file/file_util.h>
#include <sane/sane_ex.h> #include <sane/sane_ex.h>
#include <sane/sane_option_definitions.h> #include <sane/sane_option_definitions.h>
#include "../../../../code_device/hgdriver/hgdev/scanner_setting.h" //#include "../../../../code_device/hgdriver/hgdev/scanner_setting.h"
#define TREE_ITEM_PRODUCT MAKELONG(MAKEWORD('P', 'R'), MAKEWORD('D', 'T')) #define TREE_ITEM_PRODUCT MAKELONG(MAKEWORD('P', 'R'), MAKEWORD('D', 'T'))
#define TREE_ITEM_GROUP MAKELONG(MAKEWORD('G', 'R'), MAKEWORD('U', 'P')) #define TREE_ITEM_GROUP MAKELONG(MAKEWORD('G', 'R'), MAKEWORD('U', 'P'))
@ -8412,8 +8412,8 @@ void ChgjsonDlg::OnBnClickedToFile()
name.insert(0, path); name.insert(0, path);
name += L".hsc"; name += L".hsc";
ansi = coding::u2a(name.c_str()); ansi = coding::u2a(name.c_str());
if (save_scanner_setting(ansi.c_str(), txt) == 0) //if (save_scanner_setting(ansi.c_str(), txt) == 0)
file_util::display_file_in_explorer(name.c_str()); // file_util::display_file_in_explorer(name.c_str());
} }

BIN
tools/apps/hgjson/resource.h
View File

Binary file not shown.

BIN
tools/solution/Release/hgjson.exe
View File

Binary file not shown.