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 0000000..f0c7008 Binary files /dev/null and b/tpvs17/Enchanter/Enchanter.rc differ diff --git a/tpvs17/Enchanter/Enchanter.vcxproj b/tpvs17/Enchanter/Enchanter.vcxproj index bd0876f..c1d8174 100644 --- a/tpvs17/Enchanter/Enchanter.vcxproj +++ b/tpvs17/Enchanter/Enchanter.vcxproj @@ -125,6 +125,15 @@ .\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)