revise dm reservoir ui

PunkHPX8_MainPages/Views/DMReservoirView.xaml

@@ -62,7 +62,7 @@
                       RecipeModeValue="{Binding ReservoirsPersistent.RecipeOperatingMode}"
                       />
             </Grid>
-            <GroupBox Header="CA DIW Replen" FontWeight="Bold" FontSize="15" Grid.Row="2" Grid.Column="0" Width="200" Grid.RowSpan="2" Height="320" Margin="0,0,270,170">
+            <GroupBox Header="CA DIW Replen" FontWeight="Bold" FontSize="15" Grid.Row="2" Grid.Column="0" Width="200" Grid.RowSpan="2" Height="320" Margin="0,0,270,180">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="35"></RowDefinition>
@@ -108,7 +108,7 @@
                     </Grid>
                 </Grid>
             </GroupBox>
-            <GroupBox Header="AN DIW Replen" FontWeight="Bold" FontSize="15" Grid.Row="3" Grid.Column="0" Width="200" Grid.RowSpan="2" Height="320" Margin="0,0,270,170">
+            <GroupBox Header="AN DIW Replen" FontWeight="Bold" FontSize="15" Grid.Row="2" Grid.Column="0" Width="200" Grid.RowSpan="3" Height="320" Margin="0,130,270,0">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="35"></RowDefinition>
@@ -188,15 +188,15 @@
                                    ModuleName="{Binding Module}"
                                    RecipeModeValue="{Binding ReservoirsPersistent.RecipeOperatingMode}" />
             </Grid>
-            <GroupBox Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Grid.RowSpan="3" HorizontalAlignment="Right" Height="240" VerticalAlignment="Center" Margin="0,0,50,120">
+            <GroupBox Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Grid.RowSpan="3" HorizontalAlignment="Right" Height="200" VerticalAlignment="Center" Margin="0,0,50,180">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="30"/>
-                        <RowDefinition Height="50"/>
                         <RowDefinition Height="30"/>
-                        <RowDefinition Height="50"/>
                         <RowDefinition Height="30"/>
-                        <RowDefinition Height="50"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="30"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="100"></ColumnDefinition>
@@ -241,13 +241,13 @@
                     </Grid>
                 </Grid>
             </GroupBox>
-            <GroupBox Header="Status" Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" Grid.RowSpan="2" HorizontalAlignment="Right" Height="190" VerticalAlignment="Center" Margin="0,0,50,150">
+            <GroupBox Header="Status" Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" Grid.RowSpan="2" HorizontalAlignment="Right" Height="150" VerticalAlignment="Center" Margin="0,0,50,170">
                 <Grid>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
-                        <RowDefinition Height="40"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="30"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="200"></ColumnDefinition>
@@ -280,7 +280,7 @@
                     </Border>
                 </Grid>
             </GroupBox>
-            <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Grid.RowSpan="3" Margin="250,0,0,0">
+            <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Grid.RowSpan="3" Margin="230,-50,0,0">
                 <userControls:DMReservoirUIControl
                     ModuleName="{Binding Module}"
                     ANIsolationValve="{Binding ReservoirData.AnIsolation}"

PunkHPX8_Themes/UserControls/DMReservoirUIControl.xaml

@@ -214,10 +214,9 @@
                     </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>
+        <Label Height="20" Width="100" FontSize="10"  FontWeight="Bold" Content="Degas Valve" Canvas.Left="876" Canvas.Top="435" />
         <Grid Height="50" Width="100" Canvas.Left="536" Canvas.Top="608" HorizontalAlignment="Left" VerticalAlignment="Top"  >
             <Grid.RowDefinitions>
                 <RowDefinition Height="30"></RowDefinition>
@@ -238,10 +237,9 @@
                     </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>
+        <Label Height="20" Width="100" FontSize="10"  FontWeight="Bold" Content="Sample Valve" Canvas.Left="599" Canvas.Top="596" />
         <Grid Height="50" Width="120" Canvas.Left="539" Canvas.Top="326" HorizontalAlignment="Left" VerticalAlignment="Top"  >
             <Grid.RowDefinitions>
                 <RowDefinition Height="30"></RowDefinition>
@@ -261,10 +259,8 @@
                     IsCanEdit="True" 
                     ContextMenu="{StaticResource ReturnFlowValve}"/>
             </Grid>
-            <Grid Grid.Row="1">
-                <Label Margin="12,0,0,0" Height="20" Width="100" FontSize="10"  FontWeight="Bold" Content="ReturnFlow Valve" />
-            </Grid>
         </Grid>
+        <Label Height="20" Width="100" FontSize="10"  FontWeight="Bold" Content="ReturnFlow Valve" Canvas.Left="605" Canvas.Top="351" />
         <Canvas Width="150" Height="100" Canvas.Left="727" Canvas.Top="528" HorizontalAlignment="Left" VerticalAlignment="Top">
             <userControls:TempControl TempValue="{Binding ElementName=self,Path=ReservoirTemperature}" Status="{Binding ElementName=self,Path=TCStatus}"
                               DisableStatus="{Binding ElementName=self,Path=TCEnableStatus}">