revise metal pump on bug,revise reservoir ui

CyberX8_MainPages/Views/StandardHotReservoirsView.xaml

@@ -528,6 +528,9 @@ Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canv
                 <Ellipse Margin="80,2,20,2"  Width="16" Height="16"  Fill="{Binding IsHighSafety, Converter={StaticResource boolToRedColor}}"   Stroke="Gray"/>
                 <Label Content="High Safety" FontSize="12" FontWeight="Bold" Margin="0,0,40,0" />
             </Grid>
+            <Border Grid.Row="6" Grid.Column="0" Margin="-115,86,135,-86" Background="Black">
+                <TextBlock Text="{Binding MetalDataCollection[0].CellFlow,StringFormat=\{0:F1\} L/min}" Foreground="Lime" FontSize="13" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+            </Border>
         </Grid>
         <Grid Canvas.Left="20" Canvas.Top="240">
             <Grid.ColumnDefinitions>
@@ -550,7 +553,6 @@ Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canv
             <Button Grid.Row="1" Grid.Column ="2" IsEnabled="{Binding IsAutoEnabled}" Style="{StaticResource SysBtnStyle}" Command="{Binding ResPowerOnCommand}" Margin="0,0,0,0" Height="20" Width="30" HorizontalAlignment="Center" VerticalAlignment="Center"  Content="ON"></Button>
             <Button Grid.Row="1" Grid.Column ="3" IsEnabled="{Binding IsAutoEnabled}" Style="{StaticResource SysBtnStyle}" Command="{Binding ResPowerOffCommand}" Margin="0,0,0,0" Height="20" Width="30" HorizontalAlignment="Center" VerticalAlignment="Center"  Content="OFF"></Button>
         </Grid>
-        <ctrls:TextboxWithLabel TextBoxValue="{Binding MetalDataCollection[0].CellFlow,StringFormat=\{0:F1\} L/min}" Canvas.Top="445" Canvas.Left="125" LabelValue="Flow"  TextBoxColor="White" HorizontalAlignment="Center"  VerticalAlignment="Top"/>
         <TextBlock FontSize="14" Width="70" Canvas.Top="396" Canvas.Left="102" HorizontalAlignment="Center" VerticalAlignment="Top" Text="DI Replen" RenderTransformOrigin="0.5,0.5"></TextBlock>
         <TextBlock FontSize="14" Width="72" Canvas.Top="664" Canvas.Left="587" HorizontalAlignment="Left" VerticalAlignment="Top" Text="Circulation" RenderTransformOrigin="0.5,0.5"></TextBlock>
 
@@ -586,7 +588,7 @@ Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canv
                        Visibility="{Binding MetalDataCollection[0].CellPump,Converter={StaticResource boolToVisibility2}}" Fill="Lime"/>
             <userControls:Pump1 IsEnabled="{Binding IsEnabled}" Name="pump2" ModuleName="{Binding CellModuleNameCollection[0]}" IsOpenPump="{Binding MetalDataCollection[0].CellPump,Mode=TwoWay}" 
                                  Visibility="{Binding CellModuleSignalPump[0],Converter={StaticResource boolToVisibility2}}"
-                                RotateTransformValue="270" Height="60" Width="60"  Canvas.Left="20"  Canvas.Top="439" Tag="26" HorizontalAlignment="Center" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5" >
+                                RotateTransformValue="270" Height="60" Width="60"  Canvas.Left="124"  Canvas.Top="440" Tag="26" HorizontalAlignment="Left" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5" >
                 <userControls:Pump1.RenderTransform>
                     <TransformGroup>
                         <ScaleTransform/>
@@ -597,43 +599,18 @@ Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canv
                 </userControls:Pump1.RenderTransform>
             </userControls:Pump1>
             <userControls:ReservoirPump IsEnabled="{Binding IsEnabled}" ModuleName="{Binding Module}" PumpType="RegulatPump" IsOpenPump="{Binding ReservoirData.RegulatePumpSignalIn}" 
-                                        Visibility="{Binding IsRegulatePump,Converter={StaticResource boolToVisibility2}}" Height="60" Width="60" Canvas.Top="439" Tag="26" HorizontalAlignment="Left" VerticalAlignment="Top" Canvas.Left="20" />
-            <TextBlock FontSize="14" Width="120" Canvas.Top="504" Canvas.Left="-10" HorizontalAlignment="Center" VerticalAlignment="Top" Text="Reservoir Pump" RenderTransformOrigin="0.5,0.5"
+                                        Visibility="{Binding IsRegulatePump,Converter={StaticResource boolToVisibility2}}" Height="60" Width="60" Canvas.Top="439" Tag="26" HorizontalAlignment="Left" VerticalAlignment="Center" Canvas.Left="125" />
+            <TextBlock FontSize="14" Width="120" Canvas.Top="504" Canvas.Left="96" HorizontalAlignment="Left" VerticalAlignment="Center" Text="Reservoir Pump" RenderTransformOrigin="0.5,0.5"
                        Visibility="{Binding IsRegulatePump,Converter={StaticResource boolToVisibility2}}"></TextBlock>
-            <TextBlock FontSize="14" Width="70" Canvas.Top="504" Canvas.Left="15" HorizontalAlignment="Left" VerticalAlignment="Top" Text="Cell Pump" RenderTransformOrigin="0.5,0.5"
+            <TextBlock FontSize="14" Width="70" Canvas.Top="504" Canvas.Left="120" HorizontalAlignment="Center" VerticalAlignment="Center" Text="Cell Pump" RenderTransformOrigin="0.5,0.5"
                        Visibility="{Binding CellModuleSignalPump[0],Converter={StaticResource boolToVisibility2}}"></TextBlock>
-            <Canvas Width="40" Height="20" Canvas.Left="-35" Canvas.Top="471" HorizontalAlignment="Left" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5" >
-                <Canvas.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform/>
-                        <SkewTransform/>
-                        <RotateTransform Angle="-0.588"/>
-                        <TranslateTransform/>
-                    </TransformGroup>
-                </Canvas.RenderTransform>
-
-                <Polygon Width="10" Points="0,10 20,0 20,20" Fill="Black" StrokeThickness="1" HorizontalAlignment="Left" VerticalAlignment="Center"></Polygon>
-                <Polygon Points="0,0 30,0 30,4 0,4" Fill="Black" StrokeThickness="1" Canvas.Left="10" Canvas.Top="8" HorizontalAlignment="Left" VerticalAlignment="Center"></Polygon>
-            </Canvas>
-            <Canvas Width="40" Height="20" Canvas.Left="-134" Canvas.Top="630" HorizontalAlignment="Left" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5" >
-                <Canvas.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform/>
-                        <SkewTransform/>
-                        <RotateTransform Angle="179.566"/>
-                        <TranslateTransform/>
-                    </TransformGroup>
-                </Canvas.RenderTransform>
-
-                <Polygon Width="10" Points="0,10 20,0 20,20" Fill="Black" StrokeThickness="1" HorizontalAlignment="Left" VerticalAlignment="Center"></Polygon>
-                <Polygon Points="0,0 30,0 30,4 0,4" Fill="Black" StrokeThickness="1" Canvas.Left="10" Canvas.Top="8" HorizontalAlignment="Left" VerticalAlignment="Center"></Polygon>
-            </Canvas>
         </Canvas>
         <Canvas Width="150" Height="100" Canvas.Left="175" Canvas.Top="582" HorizontalAlignment="Left" VerticalAlignment="Top">
             <userControls:TempControl MouseLeftButtonUp="ClickJumpTCCommand"  HorizontalAlignment="Left" VerticalAlignment="Top" 
                                       TempValue="{Binding TemperatureControlData.ReserviorTemperature}" ModuleName="{Binding TemperatureControlData.Name}"
                                       Status="{Binding TemperatureControlData.Status}" DisableStatus="{Binding TCEnableStatus}"/>
         </Canvas>
+        <TextBlock FontSize="12" Width="42" Canvas.Top="438" Canvas.Left="180" Text="Flow" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Center"/>
     </Canvas>
 
 </UserControl>

CyberX8_RT/Devices/Metal/StandardHotMetalCellPumpRoutine.cs

@@ -11,6 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using MECF.Framework.Common.IOCore;
+using MECF.Framework.Common.ToolLayout;
 
 namespace CyberX8_RT.Devices.Metal
 {
@@ -32,6 +33,7 @@ namespace CyberX8_RT.Devices.Metal
         private int _cellFlowFaultHoldOffTime = 5000;
         private double _minPumpFlow = 0.2;
         private bool _pumpOn = false;
+        private bool _isSignalPump = false;
         private StandardHotMetalDevice _device;
         #endregion
         /// <summary>
@@ -55,7 +57,7 @@ namespace CyberX8_RT.Devices.Metal
         /// <returns></returns>
         public RState Monitor()
         {
-            Runner.Run(PumpStep.Pump, ExecutePump, () => { return _device.MetalDeviceData.CellPump ==_pumpOn; }, _delay_1s)
+            Runner.RunIf(PumpStep.Pump, _isSignalPump, ExecutePump, () => { return _device.MetalDeviceData.CellPump ==_pumpOn; }, _delay_1s)
                 .Delay(PumpStep.Delay, _cellFlowFaultHoldOffTime)
                 .RunIf(PumpStep.CheckFlow, _pumpOn, CheckFlow, NullFun, _delay_1ms)
                 .End(PumpStep.End, NullFun, _delay_1ms);
@@ -93,7 +95,13 @@ namespace CyberX8_RT.Devices.Metal
             {
                 _cellFlowFaultHoldOffTime = 0;
             }
+            MetalItem metalItem = MetalItemManager.Instance.GetMetalItem(Module);
+            if (metalItem != null && metalItem.DepPump)
+            {
+                _isSignalPump = true;
+            }
             return Runner.Start(Module.ToString(), "Cell Pump");
+            
         }
     }
 }