diff --git a/tpvs17/tpMain/lpMainWin.ui b/tpvs17/tpMain/lpMainWin.ui
index a4ab51e..0049a90 100644
--- a/tpvs17/tpMain/lpMainWin.ui
+++ b/tpvs17/tpMain/lpMainWin.ui
@@ -1,27 +1,145 @@
-
+
+
lpMainWin
-
-
- lpMainWin
-
-
+
+
- 0
- 0
- 400
- 300
+ 0
+ 0
+ 1028
+ 745
-
+
lpMainWin
-
-
-
-
+
+
+
+
+
+
+ 11
+
+
+
+ Qt::ToolButtonTextUnderIcon
+
+
+ TopToolBarArea
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/newspaper.png:/ToolBarPic/ToolBarpic/newspaper.png
+
+
+ 模板管理
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/bars39.png:/ToolBarPic/ToolBarpic/bars39.png
+
+
+ 数据查询
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/clipboard109.png:/ToolBarPic/ToolBarpic/clipboard109.png
+
+
+ 检测模板勾选
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/settings38.png:/ToolBarPic/ToolBarpic/settings38.png
+
+
+ 辅助工具
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/2447.png:/ToolBarPic/ToolBarpic/2447.png
+
+
+ 班次设置
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/pair.png:/ToolBarPic/ToolBarpic/pair.png
+
+
+ 光栅标定
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/attachment6.png:/ToolBarPic/ToolBarpic/attachment6.png
+
+
+ IP设置
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/help.png:/ToolBarPic/ToolBarpic/help.png
+
+
+ 关于
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/administrator.png:/ToolBarPic/ToolBarpic/administrator.png
+
+
+ 登录
+
+
+
+
+
+ :/ToolBarPic/ToolBarpic/conference.png:/ToolBarPic/ToolBarpic/conference.png
+
+
+ 用户管理
+
+
-
-
-
+
+
+
+
-
+
diff --git a/tpvs17/tpMain/tpMain.vcxproj b/tpvs17/tpMain/tpMain.vcxproj
index f8e829c..11f2278 100644
--- a/tpvs17/tpMain/tpMain.vcxproj
+++ b/tpvs17/tpMain/tpMain.vcxproj
@@ -352,6 +352,16 @@
+
+
+
+
+
+
+
+
+
+
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing %(Identity)...
@@ -1108,8 +1118,106 @@
.\GeneratedFiles\ui_%(Filename).h;%(Outputs)
"$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
-
-
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
+
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+ $(QTDIR)\bin\uic.exe;%(AdditionalInputs)
+ Uic%27ing %(Identity)...
+ .\GeneratedFiles\ui_%(Filename).h;%(Outputs)
+ "$(QTDIR)\bin\uic.exe" -o ".\GeneratedFiles\ui_%(Filename).h" "%(FullPath)"
+
{A229CF5C-81EF-4909-AB6E-49C746F1ED4C}
@@ -1160,7 +1268,7 @@
Windows
$(SolutionDir)..\runner17\$(TargetName)$(TargetExt)
- $(QTDIR)\lib;$(OutDir);..\..\3part\opencv3.4.1\x64\vc15\lib;..\..\3part\Cyclops\lib;F:\ValueProject\wheel\3part\libzkq\lib;%(AdditionalLibraryDirectories)
+ $(QTDIR)\lib;$(OutDir);..\..\3part\opencv3.4.1\x64\vc15\lib;..\..\3part\Cyclops\lib;..\..\3part\libzkq\lib;%(AdditionalLibraryDirectories)
true
qtmaind.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5AxContainerd.lib;Qt5AxBased.lib;Qt5Sqld.lib;Qt5PrintSupportd.lib;Qt5Networkd.lib;Qt5SerialPortd.lib;luffyd.lib;Cyclopsd.lib;libzkqd.lib;opencv_world341d.lib;%(AdditionalDependencies)
true
diff --git a/tpvs17/tpMain/tpMain.vcxproj.filters b/tpvs17/tpMain/tpMain.vcxproj.filters
index e1e4860..799063f 100644
--- a/tpvs17/tpMain/tpMain.vcxproj.filters
+++ b/tpvs17/tpMain/tpMain.vcxproj.filters
@@ -63,11 +63,6 @@
{c2c39a47-2d33-40d6-8fec-b19d02e02bcf}
-
- {639EADAA-A684-42e4-A9AD-28FC9BCB8F7C}
- ts
- false
-
{1c912f7f-f95e-4887-9b55-19f143f30d2a}
@@ -77,6 +72,9 @@
{e391fcf8-d043-4a98-a8f8-4d6393c9db52}
+
+ {2dc00cbb-8bfd-4764-9117-503dd9e5935f}
+
@@ -247,18 +245,12 @@
Generated Files\Release
-
- Source Files
-
Generated Files\Debug
Generated Files\Release
-
- Source Files
-
Generated Files\Debug
@@ -436,36 +428,18 @@
sql
-
- UI
-
Thread
Thread
-
- UI
-
-
- UI
-
UI
-
- UI
-
UI
-
- UI
-
-
- UI
-
UI
@@ -478,12 +452,6 @@
sql
-
- UI
-
-
- UI
-
Generated Files\Debug
@@ -529,6 +497,36 @@
Generated Files\Release
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
@@ -612,6 +610,36 @@
lpMain\CoreCtrl
+
+ Generated Files
+
+
+ Generated Files
+
+
+ Generated Files
+
+
+ Generated Files
+
+
+ Generated Files
+
+
+ Generated Files
+
+
+ Generated Files
+
+
+ Generated Files
+
+
+ Generated Files
+
+
+ Generated Files
+
@@ -644,9 +672,6 @@
Header Files
-
- Header Files
-
Header Files
@@ -692,33 +717,6 @@
Thread
-
- UI
-
-
- UI
-
-
- UI
-
-
- UI
-
-
- UI
-
-
- UI
-
-
- UI
-
-
- UI
-
-
- UI
-
UI
@@ -740,9 +738,6 @@
sql
-
- UI
-
Form Files
@@ -758,6 +753,69 @@
lpMain\CoreCtrl
+
+ UI
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
+
+ UIFile
+
@@ -944,12 +1002,4 @@
-
-
- Translation Files
-
-
- Translation Files
-
-
\ No newline at end of file
diff --git a/tpvs17/tpMain/tpMain.vcxproj.user b/tpvs17/tpMain/tpMain.vcxproj.user
index 32da314..f6d8def 100644
--- a/tpvs17/tpMain/tpMain.vcxproj.user
+++ b/tpvs17/tpMain/tpMain.vcxproj.user
@@ -1,14 +1,14 @@
- D:\Qt\Qt5.9.4\5.9.4\msvc2017_64
+ C:\Qt\Qt5.9.4\5.9.4\msvc2017_64
$(SolutionDir)..\runner17\Enchanterd.exe
$(SolutionDir)..\runner17\
WindowsLocalDebugger
PATH=$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(QTDIR)\bin%3b"$(QTDIR)\bin%3b$(PATH)
- D:\Qt\Qt5.9.4\5.9.4\msvc2017_64
+ C:\Qt\Qt5.9.4\5.9.4\msvc2017_64
E:\LeaperProject\hubDetect\runner13\tpShell.exe
E:\LeaperProject\hubDetect\runner13\
WindowsLocalDebugger