diff --git a/Modules/SicModules/Config/Recipe/Sic/Process/PN2.xml b/Modules/SicModules/Config/Recipe/Sic/Process/PN2.xml index feeacb5..abd3756 100644 --- a/Modules/SicModules/Config/Recipe/Sic/Process/PN2.xml +++ b/Modules/SicModules/Config/Recipe/Sic/Process/PN2.xml @@ -1,281 +1,288 @@  - + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - - + + + + + - + + + + - + - - - + - - - - - - - - + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + - - - + + + + + + + - - - - - - - + + + + + + + + + + + - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - + + + + + + - - - - - - + + + + + + - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SicUI/Bootstrapper.cs b/SicUI/Bootstrapper.cs index 6c99344..9f41529 100644 --- a/SicUI/Bootstrapper.cs +++ b/SicUI/Bootstrapper.cs @@ -315,22 +315,7 @@ namespace SicUI.Client container.Singleton("PN2"); container.Singleton("NH3_1"); container.Singleton("NH3_2"); - container.Singleton("NH3_3"); - container.Singleton("NH3_4"); - container.Singleton("NH3_5"); - container.Singleton("NH3_6"); - container.Singleton("NH3_7"); - container.Singleton("NH3_8"); - container.Singleton("NH3_9"); - container.Singleton("NH3_10"); - container.Singleton("NH3_11"); - container.Singleton("NH3_12"); - container.Singleton("NH3_13"); - container.Singleton("NH3_14"); - container.Singleton("NH3_16"); - container.Singleton("NH3_17"); - container.Singleton("NH3_18"); - container.Singleton("NH3_19"); + container.PerRequest(); } diff --git a/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml b/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml index 5c88456..cd2a115 100644 --- a/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml +++ b/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml @@ -1,4 +1,5 @@ - - + - + @@ -177,7 +178,7 @@ RobotMoveInfo="{Binding TmRobotMoveInfo}" RotateAngle="123" ShowDock="False" - TranslateX="120"/> + TranslateX="120" /> - + - + @@ -7563,16 +7573,16 @@ + EnableControl="True" + IsShowSensor="False" /> + EnableControl="True" + IsShowSensor="False" />