revise SH Resrvoir UI

CyberX8_MainPages/Views/StandardHotReservoirsView.xaml

@@ -81,7 +81,6 @@
                     </Viewbox>
                     <Rectangle x:Name="ErrorRectangle" Fill="Red" Height="450" Width="440" VerticalAlignment="Center" Opacity="0.5" Panel.ZIndex="3"
 Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canvas.Left="20" Canvas.Top="105" HorizontalAlignment="Center"/>
-                    <userControls:Clamp MouseLeftButtonUp="ClickJumpMetalCommand" IsShowSignal="False" LabelValue="{Binding CellModuleNameCollection[1],Converter={StaticResource stringToString}}" Width="85" Height="508" Canvas.Top="-103" Canvas.Left="90" HorizontalAlignment="Left" VerticalAlignment="Top"/>
                     <userControls:Clamp MouseLeftButtonUp="ClickJumpMetalCommand" IsShowSignal="False" LabelValue="{Binding CellModuleNameCollection[0],Converter={StaticResource stringToString}}" Width="85" Height="508" Canvas.Top="-103" Canvas.Left="312" HorizontalAlignment="Center" VerticalAlignment="Top"/>
                 </Canvas>
                 <GroupBox Grid.Row="1" Grid.Column="2" Grid.RowSpan="4" Header="Recipe Settings"  BorderBrush="DarkGray" Padding="5" Margin="0,10,0,0" Height="510" VerticalAlignment="Top">
@@ -428,10 +427,10 @@ Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canv
                         <RowDefinition Height="100"></RowDefinition>
                     </Grid.RowDefinitions>
                     <Grid Grid.Row="0">
-                      
+
                     </Grid>
                     <Grid Grid.Row="1">
-                       
+
                     </Grid>
                 </Grid>
                 <Grid Grid.Row="2" Grid.Column="4">
@@ -458,27 +457,6 @@ Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canv
 
             </Grid>
         </StackPanel>
-
-        <Canvas Canvas.Left="-10">
-            <ctrls:Pipe2    Canvas.Left="465"  Canvas.Top="220" RotateTransformValue="-180" HorizontalAlignment="Center" VerticalAlignment="Top" />
-            <!--Cell1 Clamp-->
-            <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[1].WaferHolderClamp}" Height="8"  Width="30"  Canvas.Left="460"  Canvas.Top="212" RotateTransformValue="0" HorizontalAlignment="Center" VerticalAlignment="Top" />
-            <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[1].WaferHolderClamp}" Height="8"  Width="40"  Canvas.Left="460"  Canvas.Top="170" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Center" />
-            <customControls:CommonValveControl IsEnabled="{Binding IsEnabled}" Status="{Binding MetalDataCollection[1].WaferHolderClamp}"
-                                       Height="20" Width="20"  Canvas.Left="446"  Canvas.Top="182" ValveOrientation="Vertical" 
-                                       ContextMenu="{StaticResource Cell1ClampValve}" IsCanEdit="True" Tag="26"/>
-            <TextBlock FontSize="14" Width="50" Canvas.Top="183" Canvas.Left="411" HorizontalAlignment="Left" VerticalAlignment="Center" Text="Clamp" RenderTransformOrigin="0.5,0.5">
-                <TextBlock.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform/>
-                        <SkewTransform/>
-                        <RotateTransform Angle="-90"/>
-                        <TranslateTransform/>
-                    </TransformGroup>
-                </TextBlock.RenderTransform>
-            </TextBlock>
-        </Canvas>
-
         <Canvas Canvas.Left="210">
             <ctrls:Pipe2    Canvas.Left="465"  Canvas.Top="220" RotateTransformValue="-180" HorizontalAlignment="Center" VerticalAlignment="Top" />
             <!--Cell2 Clamp-->
@@ -538,38 +516,20 @@ Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canv
                 <Label Content="High Safety" FontSize="12" FontWeight="Bold" Margin="0,0,40,0" />
             </Grid>
         </Grid>
-
-        <ctrls:TextboxWithLabel TextBoxValue="{Binding MetalDataCollection[1].CellFlow,StringFormat=\{0:F1\} L/min}"  Canvas.Top="533" Canvas.Left="389" LabelValue="Flow"  TextBoxColor="White" HorizontalAlignment="Center"  VerticalAlignment="Center"/>
         <ctrls:TextboxWithLabel TextBoxValue="{Binding MetalDataCollection[0].CellFlow,StringFormat=\{0:F1\} L/min}" Canvas.Top="533" Canvas.Left="613" LabelValue="Flow"  TextBoxColor="White" HorizontalAlignment="Center"  VerticalAlignment="Center"/>
-        <ctrls:TextboxWithLabel TextBoxValue="{Binding ReservoirData.HedFlow,StringFormat=\{0:F1\} L/min}" Canvas.Top="445" Canvas.Left="102" LabelValue="HED Flow"  TextBoxColor="Black" HorizontalAlignment="Center"  VerticalAlignment="Center"/>
         <TextBlock FontSize="14" Width="70" Canvas.Top="406" Canvas.Left="102" HorizontalAlignment="Left" VerticalAlignment="Center" Text="DI Replen" RenderTransformOrigin="0.5,0.5"></TextBlock>
-        <TextBlock FontSize="14" Width="72" Canvas.Top="625" Canvas.Left="475" HorizontalAlignment="Left" VerticalAlignment="Top" Text="Circulation" RenderTransformOrigin="0.5,0.5"></TextBlock>
         <TextBlock FontSize="14" Width="72" Canvas.Top="625" Canvas.Left="702" HorizontalAlignment="Left" VerticalAlignment="Top" Text="Circulation" RenderTransformOrigin="0.5,0.5"></TextBlock>
 
         <!--DIReplen pipe-->
         <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.DiReplen}" Height="8"  Width="281"  Canvas.Left="93"  Canvas.Top="431" RotateTransformValue="0" HorizontalAlignment="Center" VerticalAlignment="Top" />
         <!--Bypass flow pipe-->
-        <ctrls:FlowPipe IsFlowing="true" Height="8"  Width="360"  Canvas.Left="239"  Canvas.Top="665" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Center" />
-        <ctrls:FlowPipe IsFlowing="true" Height="8"  Width="134"  Canvas.Left="374"  Canvas.Top="556" RotateTransformValue="180" HorizontalAlignment="Center" VerticalAlignment="Top" />
-        <ctrls:FlowPipe IsFlowing="true" Height="8"  Width="105"  Canvas.Left="237"  Canvas.Top="559" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" />
+        <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[0].CellPump,Mode=TwoWay}" Height="8"  Width="507"  Canvas.Left="94"  Canvas.Top="688" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Center" />
         <!--HED Flow pipe-->
-        <ctrls:FlowPipe IsFlowing="{Binding HEDFlowIsOn}" Height="8"  Width="281"  Canvas.Left="93"  Canvas.Top="488" RotateTransformValue="0" HorizontalAlignment="Center" VerticalAlignment="Top" Loaded="FlowPipe_Loaded" />
-        <ctrls:FlowPipe IsFlowing="{Binding HEDFlowIsOn}" IsReverse="True" Height="8"  Width="194"  Canvas.Left="90"  Canvas.Top="493" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" />
-        <ctrls:FlowPipe IsFlowing="{Binding HEDFlowIsOn}" IsReverse="True" Height="8"  Width="592"  Canvas.Left="93"  Canvas.Top="688" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Center" />
-        <ctrls:FlowPipe IsFlowing="{Binding HEDFlowIsOn}" IsReverse="True" Height="8"  Width="96"  Canvas.Left="687"  Canvas.Top="684" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
-        <ctrls:FlowPipe IsFlowing="{Binding HEDFlowIsOn}" IsReverse="True" Height="8"  Width="104"  Canvas.Left="458"  Canvas.Top="691" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
-        <!--Cell1 pump Flow pipe-->
-        <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[1].CellPump,Mode=TwoWay}" Height="8"  Width="80"  Canvas.Left="352"  Canvas.Top="669" RotateTransformValue="-90" HorizontalAlignment="Left" VerticalAlignment="Center" />
-        <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[1].CellPump,Mode=TwoWay}" Height="8"  Width="138"  Canvas.Left="363"  Canvas.Top="582" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Center" />
-        <!--Cell1 CellFlow pipe-->
-        <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[1].Circulation}" Height="8"  Width="38"  Canvas.Left="498"  Canvas.Top="584" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
-        <!--Cell1 CellBypass pipe-->
-        <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[1].Circulation,Converter={StaticResource boolToBool}}" Height="8"  Width="32"  Canvas.Left="498"  Canvas.Top="626" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
-        <userControls:Fan Width="45" Height="45" Canvas.Top="563" Canvas.Left="480" HorizontalAlignment="Center" VerticalAlignment="Top"
-                  ContextMenu="{StaticResource Cell1CirculationValve}" IsEnabled="{Binding IsEnabled}"/>
+        <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[0].CellPump,Mode=TwoWay}" Height="8"  Width="281"  Canvas.Left="93"  Canvas.Top="488" RotateTransformValue="0" HorizontalAlignment="Center" VerticalAlignment="Top" Loaded="FlowPipe_Loaded" />
+        <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[0].CellPump,Mode=TwoWay}" IsReverse="True" Height="8"  Width="194"  Canvas.Left="90"  Canvas.Top="493" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" />
 
         <!--Cell2 pump Flow pipe-->
-        <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[0].CellPump,Mode=TwoWay}" Height="8"  Width="73"  Canvas.Left="602"  Canvas.Top="663" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
+        <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[0].CellPump,Mode=TwoWay}" Height="8"  Width="93"  Canvas.Left="602"  Canvas.Top="685" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
         <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[0].CellPump,Mode=TwoWay}" Height="8"  Width="106"  Canvas.Left="613"  Canvas.Top="582" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Center" />
         <!--Cell2 CellFlow pipe-->
         <ctrls:FlowPipe IsFlowing="{Binding MetalDataCollection[0].Circulation}" Height="8"  Width="38"  Canvas.Left="721"  Canvas.Top="584" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
@@ -578,37 +538,17 @@ Visibility="{Binding IsError,Converter={StaticResource boolToVisibility2}}" Canv
         <userControls:Fan Width="45" Height="45" Canvas.Top="563" Canvas.Left="703" HorizontalAlignment="Left" VerticalAlignment="Center" 
                   ContextMenu="{StaticResource Cell0CirculationValve}"/>
 
-        <ctrls:Pipe2    Canvas.Left="242"  Canvas.Top="673" RotateTransformValue="180" HorizontalAlignment="Left" VerticalAlignment="Center" />
-        <ctrls:Pipe2    Canvas.Left="229"  Canvas.Top="561" RotateTransformValue="-90" HorizontalAlignment="Left" VerticalAlignment="Center" />
+       
         <ctrls:Pipe2    Canvas.Left="82"  Canvas.Top="501" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
         <ctrls:Pipe2    Canvas.Left="95"  Canvas.Top="696" RotateTransformValue="-180" HorizontalAlignment="Center" VerticalAlignment="Top" />
-        <ctrls:Pipe2    Canvas.Left="610"  Canvas.Top="660" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" />
-        <ctrls:Pipe2    Canvas.Left="695"  Canvas.Top="683" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Center" />
+        <ctrls:Pipe2    Canvas.Left="610"  Canvas.Top="683" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" />
+
         <customControls:CommonValveControl ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Left="125"  Canvas.Top="425" 
                                            ContextMenu="{StaticResource DIReplenValve}" Status="{Binding ReservoirData.DiReplen,Mode=TwoWay}" IsEnabled="{Binding IsEnabled}"
                                            IsCanEdit="True" Tag="26" HorizontalAlignment="Left" VerticalAlignment="Center" 
                                            />
 
-        <Canvas>
-            <ctrls:Pipe2    Canvas.Left="352"  Canvas.Top="595" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
-            <userControls:PrewetTankControl Width="40" Height="70" Canvas.Top="581" Canvas.Left="401" HorizontalAlignment="Left" VerticalAlignment="Center"></userControls:PrewetTankControl>
-            <Rectangle Width="18" Height="38" Canvas.Left="412" Canvas.Top="608" HorizontalAlignment="Center" VerticalAlignment="Top" 
-                       Visibility="{Binding MetalDataCollection[1].CellPump,Converter={StaticResource boolToVisibility2}}" Fill="Lime"/>
-            <userControls:Pump1 IsEnabled="{Binding IsEnabled}" Name="pump1" ModuleName="{Binding CellModuleNameCollection[1]}" IsOpenPump="{Binding MetalDataCollection[1].CellPump,Mode=TwoWay}" RotateTransformValue="-90" Height="60" Width="60"  Canvas.Left="303"  Canvas.Top="597" Tag="26" HorizontalAlignment="Center" VerticalAlignment="Top" />
-            <TextBlock FontSize="14" Width="70" Canvas.Top="579" Canvas.Left="271" HorizontalAlignment="Center" VerticalAlignment="Top" Text="Cell Pump" RenderTransformOrigin="0.5,0.5"></TextBlock>
-            <Canvas Width="40" Height="20" Canvas.Left="347" Canvas.Top="615" HorizontalAlignment="Center" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5" >
-                <Canvas.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform/>
-                        <SkewTransform/>
-                        <RotateTransform Angle="90"/>
-                        <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 Canvas.Left="250">
             <ctrls:Pipe2    Canvas.Left="352"  Canvas.Top="595" RotateTransformValue="-90" HorizontalAlignment="Center" VerticalAlignment="Top" />
             <userControls:PrewetTankControl Width="40" Height="70" Canvas.Top="581" Canvas.Left="384" HorizontalAlignment="Left" VerticalAlignment="Center"></userControls:PrewetTankControl>