From 56f2c57cc440e7bde624cf5081594a65c5fd37d8 Mon Sep 17 00:00:00 2001 From: bobpan Date: Wed, 7 Apr 2021 16:19:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=B1=95PLC=E7=B4=A2=E5=BC=95?= =?UTF-8?q?=E5=80=BC=E5=88=B01000=20=E4=B8=89=E4=BD=8D=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tpvs17/Enchanter/Enchanter.qrc | 3 +-- tpvs17/Enchanter/Enchanter.rc | Bin 0 -> 5088 bytes tpvs17/Enchanter/Enchanter.vcxproj | 9 +++++++ tpvs17/Enchanter/Enchanter.vcxproj.filters | 11 +++++++++ tpvs17/Enchanter/resource.h | 16 ++++++++++++ tpvs17/lpMain/QModelMangerUI.cpp | 2 +- tpvs17/lpMain/QModelMangerUI.ui | 27 ++++++++++++++++++++- tpvs17/lpMain/QPLCIndexUI.ui | 27 ++++++++++++++++----- tpvs17/tpCamBaumer/tpCamBaumer.vcxproj | 2 +- 9 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 tpvs17/Enchanter/Enchanter.rc create mode 100644 tpvs17/Enchanter/resource.h diff --git a/tpvs17/Enchanter/Enchanter.qrc b/tpvs17/Enchanter/Enchanter.qrc index 7c87735..587d81b 100644 --- a/tpvs17/Enchanter/Enchanter.qrc +++ b/tpvs17/Enchanter/Enchanter.qrc @@ -1,4 +1,3 @@ - - + diff --git a/tpvs17/Enchanter/Enchanter.rc b/tpvs17/Enchanter/Enchanter.rc new file mode 100644 index 0000000000000000000000000000000000000000..f0c7008dc2e6f3027876c9b05988501a267a9520 GIT binary patch literal 5088 zcmd6r&u&{q6vodMMBm}!Y#Oyq;f+@U?CCcp~ds$NID(<74_$#)kCbyW;JH_lPe^JGV<{*6fbG%PQ-x zUtzS*>;=@Pj<%5DU$bXcaMa>ladc;nPqII;x;3n6hqhy7t6AF)tiUdDU!~xd$HIE$OpO0)d%e&drScbL4N%AZra3rf30j?bG0IdVt_Z4*0fBB;V6x!>_bb2*#HI3P~j@I5BOR^6%< zMyre-((k!g3?rUSky?VfWcQKXfNqP`JkKnJa=1(m*P$q*ZyBzg8QbQ2T`RS)?8%gC zxqO<`Cipk>^D;Zkt5++6;k+84`7LbUbJam#(d5amwnw%xskkMOi*Z&hS!9j8DqpZ{ zjVag>wd#lr_Vqs2a-K#H7u4vs>#VpMd`eYRUGa~+mRDo4(H4A^^z(APOG9ZCdhPex z)kj!7z#m~eSkfXN+t8HAdu68f+O~_XUEal=oDm`#7kA{cx59jyCL)6G6L-E9C$x3s z*NDJFDogXNI8+-Xeb?2JJ+#}WrZmX?259s;>0Y5~S0YOe$&$35u_P~{ zIOXqfZW)2o&GZ`ydhJbGHO)~&KQH?cI_h~e;fc{|a)zm+VOocH-q+7GRaiMc_f>6c z;3{MaXfVd#I*oO~?i|ZHAlXOP!Av&hOAA?%mbzgdIBR6lQ{K{f9rNVXrZ5}&7Jk&Z zMi>;(Tj!rk&YgX`CccjO>M*Xoq+q@7Z(pt+ydM2}{o?66-TDs~pZ?j%UprrVKwt-% z$1}J zCTl24WmoW$zLMVmKkTcs)_`oi0;zEZ!KSN9HT#fg`^bK*{?xqF{Pl@nIo#Wz5*yOi+Ehs%~wCKZ>(+n zrg^pH+9Q+N1noi}Q7cb~m+Vd{u6Qpvg58{GWQN5C?v#d5t% U!}&4YCli#b+5b7RewU.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets + + + + + + + + + diff --git a/tpvs17/Enchanter/Enchanter.vcxproj.filters b/tpvs17/Enchanter/Enchanter.vcxproj.filters index 0a7e78a..368c4db 100644 --- a/tpvs17/Enchanter/Enchanter.vcxproj.filters +++ b/tpvs17/Enchanter/Enchanter.vcxproj.filters @@ -44,4 +44,15 @@ Resource Files + + + Header Files + + + + + + + + \ No newline at end of file diff --git a/tpvs17/Enchanter/resource.h b/tpvs17/Enchanter/resource.h new file mode 100644 index 0000000..efe3556 --- /dev/null +++ b/tpvs17/Enchanter/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ 生成的包含文件。 +// 供 Enchanter.rc 使用 +// +#define IDI_ICON1 109 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 111 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/tpvs17/lpMain/QModelMangerUI.cpp b/tpvs17/lpMain/QModelMangerUI.cpp index c2b95f8..435a327 100644 --- a/tpvs17/lpMain/QModelMangerUI.cpp +++ b/tpvs17/lpMain/QModelMangerUI.cpp @@ -6,7 +6,7 @@ #include "QPLCIndexUI.h" #include "WfModel.h" #include "QAddModeUI.h" -#define LP_WF_PLC_MAX_INDEX 100 +#define LP_WF_PLC_MAX_INDEX 1000 #pragma execution_character_set("utf-8") QModelMangerUI::QModelMangerUI(QWidget *parent) : QWidget(parent) diff --git a/tpvs17/lpMain/QModelMangerUI.ui b/tpvs17/lpMain/QModelMangerUI.ui index 63425a6..8ce9121 100644 --- a/tpvs17/lpMain/QModelMangerUI.ui +++ b/tpvs17/lpMain/QModelMangerUI.ui @@ -10,6 +10,11 @@ 450 + + + 12 + + 鍨嬪彿绠＄悊 @@ -89,6 +94,11 @@ 25 + + + 12 + + 娣诲姞 @@ -102,6 +112,11 @@ 25 + + + 12 + + 淇敼 @@ -115,6 +130,11 @@ 25 + + + 12 + + 鍒犻櫎 @@ -128,6 +148,11 @@ 25 + + + 12 + + 璁剧疆涓哄綋鍓嶈繍琛屾ā鍨 @@ -144,7 +169,7 @@ 寰蒋闆呴粦 - 10 + 12 diff --git a/tpvs17/lpMain/QPLCIndexUI.ui b/tpvs17/lpMain/QPLCIndexUI.ui index ef562a5..a138866 100644 --- a/tpvs17/lpMain/QPLCIndexUI.ui +++ b/tpvs17/lpMain/QPLCIndexUI.ui @@ -7,7 +7,7 @@ 0 0 230 - 91 + 104 @@ -19,6 +19,9 @@ QPLCIndexUI + + QLayout::SetFixedSize + @@ -27,9 +30,15 @@ 0 + + + 0 + 30 + + - 11 + 12 @@ -45,9 +54,15 @@ 0 + + + 0 + 30 + + - 11 + 12 @@ -73,7 +88,7 @@ - 11 + 12 @@ -91,11 +106,11 @@ - 11 + 15 - 100 + 1000 diff --git a/tpvs17/tpCamBaumer/tpCamBaumer.vcxproj b/tpvs17/tpCamBaumer/tpCamBaumer.vcxproj index 753c34b..49100d1 100644 --- a/tpvs17/tpCamBaumer/tpCamBaumer.vcxproj +++ b/tpvs17/tpCamBaumer/tpCamBaumer.vcxproj @@ -74,7 +74,7 @@ $(SolutionDir)..\runner17\$(TargetName)$(TargetExt) $(QTDIR)\lib;.\..\..\3part\camera_Baumer\v2.8\Dev\C++\Lib\x64;$(OutDir);%(AdditionalLibraryDirectories) true - qtmaind.lib;Qt5Cored.lib;bgapi2_genicam.lib;tpBased.lib;libzkqd.lib;%(AdditionalDependencies) + qtmaind.lib;Qt5Cored.lib;bgapi2_genicam.lib;%(AdditionalDependencies)