Explorar el Código

add dm reservoir UI

chenzk hace 1 semana
padre
commit
62410fa049

+ 2 - 2
PunkHPX8_MainPages/ViewModels/DMReservoirViewModel.cs

@@ -236,7 +236,7 @@ namespace PunkHPX8_MainPages.ViewModels
         /// <param name="param"></param>
         private void CAPumpSpeedSetAction(object param)
         {
-            InvokeClient.Instance.Service.DoOperation($"{Module}.InitializeAll");
+            InvokeClient.Instance.Service.DoOperation($"{Module}.CAPumpSpeed",InputCAPumpSpeed);
         }
         /// <summary>
         /// 设置AN pump泵速
@@ -244,7 +244,7 @@ namespace PunkHPX8_MainPages.ViewModels
         /// <param name="param"></param>
         private void ANPumpSpeedSetAction(object param)
         {
-            InvokeClient.Instance.Service.DoOperation($"{Module}.InitializeAll");
+            InvokeClient.Instance.Service.DoOperation($"{Module}.ANPumpSpeed", InputANPumpSpeed);
         }
         /// <summary>
         /// 设置return flow valve开闭的程度

+ 1 - 1
PunkHPX8_MainPages/Views/DMReservoirView.xaml

@@ -222,7 +222,7 @@
                         <Button IsEnabled="{Binding IsEnabled}" Style="{StaticResource SysBtnStyle}" Command="{Binding ANPumpSpeedSetCommand}" Height="30" Width="50" Margin="0,0,10,0" HorizontalAlignment="Center" VerticalAlignment="Center"  Content="Set"/>
                     </Grid>
                     <Grid Grid.Row="3" Grid.Column="0" >
-                        <Control:IntegerTextBox IsEnabled="{Binding InputANPumpSpeed}" Value="{Binding ManualFillSeconds,Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,0" Height="30"  Width="70"/>
+                        <Control:IntegerTextBox IsEnabled="{Binding IsEnabled}" Value="{Binding InputANPumpSpeed,Mode=TwoWay}" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,0,0,0" Height="30"  Width="70"/>
                     </Grid>
                     <Border Grid.Row="3" Grid.Column="1" Background="Black" Width="80" Height="30" Margin="0 0 0 0">
                         <TextBlock Text="{Binding ReservoirData.AnPumpSpeed}" Foreground="Lime" FontSize="14" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center"/>

+ 2 - 2
PunkHPX8_RT/Devices/Reservoir/DMReservoirDevice.cs

@@ -61,9 +61,9 @@ namespace PunkHPX8_RT.Devices.Reservoir
         protected override void InitializeOperation()
         {
             base.InitializeOperation(); 
-            OP.Subscribe($"{Module}.AnPumpOn", AnPumpOnOperation);
+            OP.Subscribe($"{Module}.ANPumpEnable", AnPumpOnOperation);
             OP.Subscribe($"{Module}.ANPumpSpeed", ANPumpSpeedOperation);
-            OP.Subscribe($"{Module}.AnPumpOff", AnPumpOffOperation);
+            OP.Subscribe($"{Module}.ANPumpDisable", AnPumpOffOperation);
         }
 
         #region AnPump

+ 2 - 2
PunkHPX8_RT/Devices/Reservoir/ReservoirDevice.cs

@@ -249,9 +249,9 @@ namespace PunkHPX8_RT.Devices.Reservoir
             OP.Subscribe($"{Module}.AutoAction", AutoOperation);
             OP.Subscribe($"{Module}.EngineeringModeAction", EngineeringModeOperation);
             OP.Subscribe($"{Module}.ProductionModeAction", ProductionModeOperation); 
-            OP.Subscribe($"{Module}.CAPumpOn", CAPumpOn);
+            OP.Subscribe($"{Module}.CAPumpEnable", CAPumpOn);
             OP.Subscribe($"{Module}.CAPumpSpeed", CAPumpSpeedOperation);
-            OP.Subscribe($"{Module}.CAPumpOff", CAPumpOff);
+            OP.Subscribe($"{Module}.CAPumpDisable", CAPumpOff);
             OP.Subscribe($"{Module}.LoadRecipe", LoadRecipeOperation);
         }
         /// <summary>

+ 230 - 16
PunkHPX8_Themes/UserControls/DMReservoirUIControl.xaml

@@ -39,7 +39,117 @@
         </ContextMenu>
     </UserControl.Resources>
     <Canvas>
-        <userControls:ReservoirPump IsEnabled="True" ModuleName="{Binding ModuleName,ElementName=self}" PumpType="VacuumPump" RotateTransformValue="0" IsOpenPump="{Binding IsANPumpOpen,Mode=TwoWay,ElementName=self}" Height="60" Width="60"   Tag="26" HorizontalAlignment="Center" VerticalAlignment="Top" Canvas.Left="96" Canvas.Top="170" RenderTransformOrigin="0.25,0.517"  >
+        <Canvas Canvas.Left="171" Canvas.Top="428" HorizontalAlignment="Center" VerticalAlignment="Top" >
+            <Border 
+                Width="220"  
+                Height="220" 
+                CornerRadius="10"
+                Background="AntiqueWhite" 
+                BorderBrush="Gray"
+                BorderThickness="2" Canvas.Left="-83" Canvas.Top="-21" 
+        />
+        </Canvas>
+        <Canvas Width="200" Height="120" Canvas.Left="430" Canvas.Top="124">
+            <Rectangle Width="200" Height="100" Fill="Yellow" Canvas.Top="0" />
+            <!-- 中间橙色矩形 -->
+            <Rectangle Width="160" Height="60" Fill="Gold" Canvas.Top="26" Canvas.Left="20" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+            <!-- 顶部浅色矩形 -->
+            <Rectangle Width="180" Height="40" Fill="#FFF5F5DC" Canvas.Top="0" Canvas.Left="7" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <!-- 左右三角形装饰 -->
+            <Polygon Points="0,20 10,0 20,20" Fill="Yellow" Canvas.Left="7" Canvas.Top="0" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Center" VerticalAlignment="Top">
+                <Polygon.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform/>
+                        <SkewTransform/>
+                        <RotateTransform Angle="90"/>
+                        <TranslateTransform/>
+                    </TransformGroup>
+                </Polygon.RenderTransform>
+            </Polygon>
+            <Polygon Points="0,20 10,0 20,20" Fill="Yellow" Canvas.Left="168" Canvas.Top="0" RenderTransformOrigin="0.5,0.5" HorizontalAlignment="Left" VerticalAlignment="Center">
+                <Polygon.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform/>
+                        <SkewTransform/>
+                        <RotateTransform Angle="-90"/>
+                        <TranslateTransform/>
+                    </TransformGroup>
+                </Polygon.RenderTransform>
+            </Polygon>
+            <Polygon Points="50,50 210,50 200,60 60,60" 
+             Fill="White"  
+             StrokeThickness="1" Canvas.Left="-30" Canvas.Top="-10"/>
+        </Canvas>
+        <Canvas Width="50" Height="100" Canvas.Left="536" Canvas.Top="458">
+            <Ellipse 
+      Width="30" 
+      Height="17" 
+      Fill="#A9B0E5" 
+      Stroke="Black" 
+      StrokeThickness="1"
+      Canvas.Left="20" 
+      Canvas.Top="33" />
+            <Rectangle 
+            Width="30" 
+            Height="75" 
+            Fill="#A9B0E5" 
+            Stroke="Black" 
+            StrokeThickness="1"
+            Canvas.Left="20" 
+            Canvas.Top="43" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+            <Rectangle 
+            Width="50" 
+            Height="20" 
+            Fill="#A9B0E5" 
+            Stroke="Black" 
+            StrokeThickness="1"
+            Canvas.Left="11" 
+            Canvas.Top="115" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+        </Canvas>
+        <Canvas Width="50" Height="100" Canvas.Left="203" Canvas.Top="26">
+            <Ellipse 
+                Width="45" 
+                Height="25" 
+                Fill="AntiqueWhite" 
+                Stroke="Black" 
+                StrokeThickness="1"
+                Canvas.Left="23" 
+                Canvas.Top="33" />
+            <Rectangle 
+                  Width="50" 
+                  Height="150" 
+                  Fill="AntiqueWhite" 
+                  Stroke="Black" 
+                  StrokeThickness="1"
+                  Canvas.Left="20" 
+                  Canvas.Top="43" HorizontalAlignment="Left" VerticalAlignment="Center"/>
+            <Ellipse 
+                Width="45" 
+                Height="26" 
+                Fill="AntiqueWhite" 
+                Stroke="Black" 
+                StrokeThickness="1"
+                Canvas.Left="25" 
+                Canvas.Top="158" HorizontalAlignment="Left" VerticalAlignment="Center" />
+            <Rectangle 
+       Width="20" 
+       Height="100" 
+       Fill="AntiqueWhite" 
+       Stroke="Black" 
+       StrokeThickness="1"
+       Canvas.Left="30" 
+       Canvas.Top="61" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+
+        </Canvas>
+        <Canvas Width="40" Height="200" Canvas.Left="760" Canvas.Top="205">
+            <Rectangle Canvas.Left="11" Canvas.Top="51" Width="45" Height="160" RadiusX="50" RadiusY="10" Fill="AntiqueWhite" Stroke="Black" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Top"/>
+            <Line X1="18" Y1="100" X2="50" Y2="100" Stroke="Black" StrokeThickness="1" StrokeDashArray="3,2"/>
+            <Line X1="18" Y1="140" X2="50" Y2="140" Stroke="Black" StrokeThickness="1" StrokeDashArray="3,2"/>
+            <Line X1="18" Y1="180" X2="50" Y2="180" Stroke="Black" StrokeThickness="1" StrokeDashArray="3,2"/>
+        </Canvas>
+
+
+        <userControls:ReservoirPump IsEnabled="True" ModuleName="{Binding ModuleName,ElementName=self}" PumpType="ANPump" RotateTransformValue="0" IsOpenPump="{Binding IsANPumpOpen,Mode=TwoWay,ElementName=self}" Height="60" Width="60"   Tag="26" HorizontalAlignment="Left" VerticalAlignment="Top" Canvas.Left="94" Canvas.Top="233" RenderTransformOrigin="0.25,0.517"  >
             <local:ReservoirPump.RenderTransform>
                 <TransformGroup>
                     <ScaleTransform/>
@@ -49,9 +159,9 @@
                 </TransformGroup>
             </local:ReservoirPump.RenderTransform>
         </userControls:ReservoirPump>
-        <userControls:ReservoirPump IsEnabled="True" ModuleName="{Binding ModuleName,ElementName=self}" PumpType="BoosterPump" RotateTransformValue="0" IsOpenPump="{Binding IsCAPumpOpen,Mode=TwoWay,ElementName=self}" Height="60" Width="60"  Tag="26" HorizontalAlignment="Center" VerticalAlignment="Top" Canvas.Left="400" Canvas.Top="550" />
+        <userControls:ReservoirPump IsEnabled="True" ModuleName="{Binding ModuleName,ElementName=self}" PumpType="CAPump" RotateTransformValue="0" IsOpenPump="{Binding IsCAPumpOpen,Mode=TwoWay,ElementName=self}" Height="60" Width="60"  Tag="26" HorizontalAlignment="Left" VerticalAlignment="Top" Canvas.Left="385" Canvas.Top="530" />
 
-        <Grid Height="50" Width="100" Canvas.Left="206" Canvas.Top="83" HorizontalAlignment="Center" VerticalAlignment="Top"  >
+        <Grid Height="50" Width="100" Canvas.Left="200" Canvas.Top="305" HorizontalAlignment="Left" VerticalAlignment="Top"  >
             <Grid.RowDefinitions>
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="20"></RowDefinition>
@@ -66,7 +176,7 @@
                 <Label Margin="12,0,0,0" Height="20" Width="100" FontSize="10"  FontWeight="Bold" Content="AN Isolation" />
             </Grid>
         </Grid>
-        <Grid Height="50" Width="100" Canvas.Left="500" Canvas.Top="60" HorizontalAlignment="Center" VerticalAlignment="Top"  >
+        <Grid Height="50" Width="100" Canvas.Left="657" Canvas.Top="188" HorizontalAlignment="Left" VerticalAlignment="Top"  >
             <Grid.RowDefinitions>
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="20"></RowDefinition>
@@ -81,7 +191,7 @@
                 <Label Margin="12,0,0,0" Height="20" Width="100" FontSize="10"  FontWeight="Bold" Content="CA Isolation" />
             </Grid>
         </Grid>
-        <Grid Height="50" Width="100" Canvas.Left="600" Canvas.Top="460" HorizontalAlignment="Center" VerticalAlignment="Top"  >
+        <Grid Height="50" Width="100" Canvas.Left="814" Canvas.Top="412" HorizontalAlignment="Left" VerticalAlignment="Top"  >
             <Grid.RowDefinitions>
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="20"></RowDefinition>
@@ -90,13 +200,22 @@
                 <customControls:CommonValveControl Height="16" Width="16"   ValveOrientation="Horizontal" 
             Status="{Binding ElementName=self,Path=DegasValve}"  
             IsCanEdit="True" 
-            ContextMenu="{StaticResource DegasValve}"/>
+            ContextMenu="{StaticResource DegasValve}" RenderTransformOrigin="0.5,0.5">
+                    <customControls:CommonValveControl.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform/>
+                            <SkewTransform/>
+                            <RotateTransform Angle="90"/>
+                            <TranslateTransform/>
+                        </TransformGroup>
+                    </customControls:CommonValveControl.RenderTransform>
+                </customControls:CommonValveControl>
             </Grid>
             <Grid Grid.Row="1">
                 <Label Margin="12,0,0,0" Height="20" Width="100" FontSize="10"  FontWeight="Bold" Content="Degas Valve" />
             </Grid>
         </Grid>
-        <Grid Height="50" Width="100" Canvas.Left="500" Canvas.Top="600" HorizontalAlignment="Center" VerticalAlignment="Top"  >
+        <Grid Height="50" Width="100" Canvas.Left="536" Canvas.Top="608" HorizontalAlignment="Left" VerticalAlignment="Top"  >
             <Grid.RowDefinitions>
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="20"></RowDefinition>
@@ -105,18 +224,35 @@
                 <customControls:CommonValveControl Height="16" Width="16"   ValveOrientation="Horizontal" 
                     Status="{Binding ElementName=self,Path=SampleValve}"  
                     IsCanEdit="True" 
-                    ContextMenu="{StaticResource SampleValve}"/>
+                    ContextMenu="{StaticResource SampleValve}" RenderTransformOrigin="0.5,0.5">
+                    <customControls:CommonValveControl.RenderTransform>
+                        <TransformGroup>
+                            <ScaleTransform/>
+                            <SkewTransform/>
+                            <RotateTransform Angle="90"/>
+                            <TranslateTransform/>
+                        </TransformGroup>
+                    </customControls:CommonValveControl.RenderTransform>
+                </customControls:CommonValveControl>
             </Grid>
             <Grid Grid.Row="1">
                 <Label Margin="12,0,0,0" Height="20" Width="100" FontSize="10"  FontWeight="Bold" Content="Sample Valve" />
             </Grid>
         </Grid>
-        <Grid Height="50" Width="120" Canvas.Left="300" Canvas.Top="260" HorizontalAlignment="Center" VerticalAlignment="Top"  >
+        <Grid Height="50" Width="120" Canvas.Left="539" Canvas.Top="326" HorizontalAlignment="Left" VerticalAlignment="Top"  >
             <Grid.RowDefinitions>
                 <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="20"></RowDefinition>
             </Grid.RowDefinitions>
-            <Grid Grid.Row="0">
+            <Grid Grid.Row="0" RenderTransformOrigin="0.5,0.5">
+                <Grid.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform/>
+                        <SkewTransform/>
+                        <RotateTransform Angle="90.829"/>
+                        <TranslateTransform/>
+                    </TransformGroup>
+                </Grid.RenderTransform>
                 <customControls:CommonValveControl Height="16" Width="16"   ValveOrientation="Horizontal" 
                     Status="{Binding ElementName=self,Path=ReturnFlowValve}"  
                     IsCanEdit="True" 
@@ -126,12 +262,12 @@
                 <Label Margin="12,0,0,0" Height="20" Width="100" FontSize="10"  FontWeight="Bold" Content="ReturnFlow Valve" />
             </Grid>
         </Grid>
-        <Canvas Width="150" Height="100" Canvas.Left="778" Canvas.Top="476" HorizontalAlignment="Center" VerticalAlignment="Top">
+        <Canvas Width="150" Height="100" Canvas.Left="727" Canvas.Top="528" HorizontalAlignment="Left" VerticalAlignment="Top">
             <userControls:TempControl TempValue="{Binding ReservoirTemperature}" Status="{Binding TCStatus}"
                               DisableStatus="{Binding TCEnableStatus}">
             </userControls:TempControl>
         </Canvas>
-        <Grid Canvas.Left="205" Canvas.Top="470">
+        <Grid Canvas.Left="178" Canvas.Top="430" HorizontalAlignment="Center" VerticalAlignment="Top">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="140"/>
             </Grid.ColumnDefinitions>
@@ -165,10 +301,88 @@
                 <Ellipse Margin="61,2,20,2"  Width="16" Height="16" Fill="{Binding ElementName=self,Path=IsCALevelLow,Converter={StaticResource boolToRedGreenColor}}"  Stroke="Gray"/>
             </Grid>
         </Grid>
-        <ctrls:TextboxWithLabel  Canvas.Top="368" Canvas.Left="274" LabelValue="AN Flow"   TextBoxValue="{Binding ANFlow, StringFormat={}{0:F2} L/min,ElementName=self}" TextBoxColor="Black" HorizontalAlignment="Center" VerticalAlignment="Top" />
-        <ctrls:TextboxWithLabel  Canvas.Top="268" Canvas.Left="474" LabelValue="CA Flow"   TextBoxValue="{Binding CAFlow, StringFormat={}{0:F2} L/min,ElementName=self}" TextBoxColor="Black" HorizontalAlignment="Center" VerticalAlignment="Top" />
+        <ctrls:TextboxWithLabel  Canvas.Top="271" Canvas.Left="326" LabelValue="AN Flow"   TextBoxValue="{Binding ANFlow, StringFormat={}{0:F2} L/min,ElementName=self}" TextBoxColor="Black" HorizontalAlignment="Center" VerticalAlignment="Top" />
+        <ctrls:TextboxWithLabel  Canvas.Top="141" Canvas.Left="671" LabelValue="CA Flow"   TextBoxValue="{Binding CAFlow, StringFormat={}{0:F2} L/min,ElementName=self}" TextBoxColor="Black" HorizontalAlignment="Center" VerticalAlignment="Top" />
+
+        <Ellipse Canvas.Left="256" Canvas.Top="100" Width="16" Height="16"  Fill="{Binding IsANLevelHigh, Converter={StaticResource boolToRedColor}}" Stroke="Silver"/>
+        <Ellipse Canvas.Left="256" Canvas.Top="160" Width="16" Height="16"  Fill="{Binding IsANLevelLow, Converter={StaticResource boolToRedColor}}" Stroke="Silver" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CAByPass}" Height="8"  Width="120"  Canvas.Left="135"  Canvas.Top="198" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Center" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CAByPass}" Height="8"  Width="95"  Canvas.Left="463"  Canvas.Top="224" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CAByPass}" Height="8"  Width="200"  Canvas.Left="603"  Canvas.Top="224" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Center" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CAByPass}" Height="8"  Width="80"  Canvas.Left="590"  Canvas.Top="591" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Center" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CAByPass}" Height="8"  Width="120"  Canvas.Left="797"  Canvas.Top="415" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CAByPass}" Height="8"  Width="60"  Canvas.Left="797"  Canvas.Top="210" RotateTransformValue="90" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CAByPass}" Height="8"  Width="160"  Canvas.Left="868"  Canvas.Top="328" RotateTransformValue="90" HorizontalAlignment="Left" VerticalAlignment="Center" Panel.ZIndex="-1"/>
 
-        <Ellipse Canvas.Left="100" Canvas.Top="20" Width="16" Height="16"  Fill="{Binding IsANLevelHigh, Converter={StaticResource boolToRedColor}}" Stroke="Silver"/>
-        <Ellipse Canvas.Left="100" Canvas.Top="120" Width="16" Height="16"  Fill="{Binding IsANLevelLow, Converter={StaticResource boolToRedColor}}" Stroke="Silver"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CADiReplen}" Height="8"  Width="420"  Canvas.Left="308"  Canvas.Top="580" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Center" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CADiReplen}" Height="8"  Width="290"  Canvas.Left="308"  Canvas.Top="420" RotateTransformValue="0" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CADiReplen}" Height="8"  Width="325"  Canvas.Left="131"  Canvas.Top="317" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Center" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CADiReplen}" Height="8"  Width="325"  Canvas.Left="135"  Canvas.Top="191" RotateTransformValue="0" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CADiReplen}" Height="8"  Width="160"  Canvas.Left="629"  Canvas.Top="200" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Center" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CADiReplen}" Height="8"  Width="50"  Canvas.Left="812"  Canvas.Top="319" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+        <ctrls:FlowPipe IsFlowing="{Binding ReservoirData.CADiReplen}" Height="8"  Width="50"  Canvas.Left="812"  Canvas.Top="380" RotateTransformValue="0" HorizontalAlignment="Left" VerticalAlignment="Top" Panel.ZIndex="-1"/>
+
+
+        <ctrls:Pipe2   Canvas.Left="590"  Canvas.Top="415" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="0" RenderTransformOrigin="0.5,0.5" >
+            <local:Pipe2.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform/>
+                    <SkewTransform/>
+                    <RotateTransform Angle="90"/>
+                    <TranslateTransform/>
+                </TransformGroup>
+            </local:Pipe2.RenderTransform>
+        </ctrls:Pipe2>
+        <ctrls:Pipe2   Canvas.Left="450"  Canvas.Top="312" HorizontalAlignment="Left" VerticalAlignment="Center" RotateTransformValue="0" RenderTransformOrigin="0.5,0.5" >
+            <local:Pipe2.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform/>
+                    <SkewTransform/>
+                    <RotateTransform Angle="90"/>
+                    <TranslateTransform/>
+                </TransformGroup>
+            </local:Pipe2.RenderTransform>
+        </ctrls:Pipe2>
+        <ctrls:Pipe2   Canvas.Left="127"  Canvas.Top="312" HorizontalAlignment="Left" VerticalAlignment="Center" RotateTransformValue="0" RenderTransformOrigin="0.5,0.5" >
+            <local:Pipe2.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform/>
+                    <SkewTransform/>
+                    <RotateTransform Angle="180"/>
+                    <TranslateTransform/>
+                </TransformGroup>
+            </local:Pipe2.RenderTransform>
+        </ctrls:Pipe2>
+        <ctrls:Pipe2   Canvas.Left="127"  Canvas.Top="191" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="0" RenderTransformOrigin="0.5,0.5" >
+            <local:Pipe2.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform/>
+                    <SkewTransform/>
+                    <RotateTransform Angle="270"/>
+                    <TranslateTransform/>
+                </TransformGroup>
+            </local:Pipe2.RenderTransform>
+        </ctrls:Pipe2>
+        <ctrls:Pipe2   Canvas.Left="784"  Canvas.Top="200" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="0" RenderTransformOrigin="0.5,0.5" >
+            <local:Pipe2.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform/>
+                    <SkewTransform/>
+                    <RotateTransform Angle="0"/>
+                    <TranslateTransform/>
+                </TransformGroup>
+            </local:Pipe2.RenderTransform>
+        </ctrls:Pipe2>
+        <ctrls:Pipe2   Canvas.Left="855"  Canvas.Top="319" HorizontalAlignment="Center" VerticalAlignment="Top" RotateTransformValue="0" RenderTransformOrigin="0.5,0.5" >
+            <local:Pipe2.RenderTransform>
+                <TransformGroup>
+                    <ScaleTransform/>
+                    <SkewTransform/>
+                    <RotateTransform Angle="0"/>
+                    <TranslateTransform/>
+                </TransformGroup>
+            </local:Pipe2.RenderTransform>
+        </ctrls:Pipe2>
     </Canvas>
 </UserControl>