diff --git a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj index 921034a..9bde151 100644 --- a/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj +++ b/Controls/Mesnac.Controls.ChemicalWeighing/Mesnac.Controls.ChemicalWeighing.csproj @@ -642,9 +642,15 @@ - - - + + Always + + + Always + + + Always + diff --git a/Controls/Mesnac.Controls.Feeding/Mesnac.Controls.Feeding.csproj b/Controls/Mesnac.Controls.Feeding/Mesnac.Controls.Feeding.csproj index 19ced52..3e0fcae 100644 --- a/Controls/Mesnac.Controls.Feeding/Mesnac.Controls.Feeding.csproj +++ b/Controls/Mesnac.Controls.Feeding/Mesnac.Controls.Feeding.csproj @@ -239,9 +239,11 @@ UserControl + Always Jzf.cs + Always Component @@ -524,6 +526,7 @@ Jzf.cs + Always Mixer2.cs @@ -1315,7 +1318,9 @@ - + + Always + @@ -1324,7 +1329,9 @@ - + + Always + diff --git a/Main/MCEdit/Data/MCProject/nodeDataSource.xml b/Main/MCEdit/Data/MCProject/nodeDataSource.xml index 3600a0d..32d0662 100644 --- a/Main/MCEdit/Data/MCProject/nodeDataSource.xml +++ b/Main/MCEdit/Data/MCProject/nodeDataSource.xml @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/Main/MCEdit/Data/MCProject/nodeDevice.xml b/Main/MCEdit/Data/MCProject/nodeDevice.xml index 3a3e7bd..4394f27 100644 --- a/Main/MCEdit/Data/MCProject/nodeDevice.xml +++ b/Main/MCEdit/Data/MCProject/nodeDevice.xml @@ -4,7 +4,7 @@
- + @@ -720,7 +720,7 @@ - + diff --git a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml index bf4f0f6..213211e 100644 --- a/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml +++ b/Main/MCEdit/Data/MCProject/nodeForm/FormDeviceDetail2.xml @@ -2,9 +2,8 @@ - - - ParametersWithPc.B1.topPressure_V1_ActualValue + + ParametersWithPc.B1.topPressure_V2_ActualValue Red DarkGray @@ -18,14 +17,13 @@ True 0 ButtonHighlight - 272, 145 + 267, 146 MCLabel18 11, 12 - - - ParametersWithPc.B1.topPressure_V1_ActualValue + + ParametersWithPc.B1.topPressure_V3_ActualValue Red DarkGray @@ -39,14 +37,13 @@ True 0 ButtonHighlight - 388, 145 + 383, 145 MCLabel17 11, 12 - - - ParametersWithPc.B1.topPressure_V1_ActualValue + + ParametersWithPc.B1.topPressure_V4_ActualValue Red DarkGray @@ -60,14 +57,13 @@ True 0 ButtonHighlight - 500, 145 + 497, 145 MCLabel16 11, 12 - - - ParametersWithPc.B1.topPressure_V1_ActualValue + + ParametersWithPc.B1.topPressure_V5_ActualValue Red DarkGray @@ -81,13 +77,12 @@ True 0 ButtonHighlight - 667, 169 + 662, 169 MCLabel15 11, 12 - - + ParametersWithPc.B1.topPressure_V1_ActualValue Red DarkGray @@ -102,13 +97,12 @@ True 0 ButtonHighlight - 157, 144 + 153, 145 MCLabel14 11, 12 - - + ParametersWithPc.B1.mainPress_V2_ActualValue Red DarkGray @@ -123,13 +117,12 @@ True 0 ButtonHighlight - 202, 338 + 195, 338 MCLabel13 11, 12 - - + ParametersWithPc.B1.mainPress_V3_ActualValue Red DarkGray @@ -144,13 +137,12 @@ True 0 ButtonHighlight - 317, 338 + 310, 339 MCLabel12 11, 12 - - + ParametersWithPc.B1.mainPress_V5_ActualValue Red DarkGray @@ -165,13 +157,12 @@ True 0 ButtonHighlight - 563, 309 + 555, 309 MCLabel11 11, 12 - - + ParametersWithPc.B1.mainPress_V1_ActualValue Red DarkGray @@ -191,8 +182,7 @@ 11, 12 - - + ParametersWithPc.B1.purgeV2_PV Red DarkGray @@ -212,8 +202,7 @@ 11, 12 - - + ParametersWithPc.B1.purgeV3_PV Red DarkGray @@ -233,8 +222,7 @@ 11, 12 - - + ParametersWithPc.B1.purgeV5_PV Red DarkGray @@ -254,8 +242,7 @@ 11, 12 - - + ParametersWithPc.B1.purgeV1_PV Red DarkGray @@ -275,8 +262,7 @@ 11, 12 - - + ParametersWithPc.B1.conveyV5_PV Red DarkGray @@ -291,13 +277,12 @@ True 0 ButtonHighlight - 587, 308 + 580, 309 MCLabel4 11, 12 - - + ParametersWithPc.B1.conveyV2_PV Red DarkGray @@ -312,13 +297,12 @@ True 0 ButtonHighlight - 222, 338 + 218, 338 MCLabel3 11, 12 - - + ParametersWithPc.B1.conveyV3_PV Red DarkGray @@ -333,13 +317,12 @@ True 0 ButtonHighlight - 336, 338 + 331, 338 MCLabel2 11, 12 - - + ParametersWithPc.B1.conveyV1_PV Red DarkGray