From 64049f8be57df4a391c64c4200e2b3208ae1b460 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Sun, 25 Jul 2021 19:07:26 +0300
Subject: RML Extension. Added logic to calculate Different% from ref (white
 color thread) and value in color  in Test Results page.

Related Work Items: #4219
---
 .../Views/TestResultsView.xaml                     | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml
index 819200ea1..a78a09415 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml
@@ -269,14 +269,14 @@
 
                         <Button DockPanel.Dock="Bottom" Width="200" HorizontalAlignment="Right" Margin="20" Command="{Binding SelectedTab.ExportToFileCommand}" IsEnabled="False"> Export to File</Button>
 
-                        <Grid DockPanel.Dock="Bottom" Margin="20 20 20 0">
+                        <Grid DockPanel.Dock="Bottom" Margin="20 10 20 0">
                             <TextBlock FontSize="21">Conclusion:</TextBlock>
-                            <TextBox Margin="120 0 20 0" HorizontalAlignment="Stretch" MinHeight="40" Text="{Binding SelectedTab.TestResult.Conclusions}" Style="{StaticResource Rounded_Corners_TextBox_Multiline}"></TextBox>
+                            <TextBox Margin="120 0 10 0" HorizontalAlignment="Stretch" MinHeight="40" Text="{Binding SelectedTab.TestResult.Conclusions}" Style="{StaticResource Rounded_Corners_TextBox_Multiline}"></TextBox>
                         </Grid>
 
-                        <Grid DockPanel.Dock="Bottom" Margin="20 20 20 0">
+                        <Grid DockPanel.Dock="Bottom" Margin="20 10 20 0">
                             <TextBlock FontSize="21">Comments:</TextBlock>
-                            <TextBox Margin="120 0 20 0"  Style="{StaticResource Rounded_Corners_TextBox_Multiline}"   HorizontalAlignment="Stretch" MinHeight="40" Text="{Binding SelectedTab.TestResult.Comment}"></TextBox>
+                            <TextBox Margin="120 0 10 0"  Style="{StaticResource Rounded_Corners_TextBox_Multiline}"   HorizontalAlignment="Stretch" MinHeight="40" Text="{Binding SelectedTab.TestResult.Comment}"></TextBox>
 
                         </Grid>
                         
@@ -296,8 +296,8 @@
                                     <Border>
                                     <StackPanel x:Name="DryerTempPanel"  HorizontalAlignment="Stretch" Grid.Column="0" Grid.Row="0" >
                                             <DockPanel Margin="0 0 0 0">
-                                                <Button DockPanel.Dock="Right" Margin="0 0 40 0" HorizontalAlignment="Left"  Padding="2" Height="30" Width="200"  Command="{Binding ApplyToProcessParametersCommand}" ToolTip="Apply to Process Parameters">
-                                                    <TextBlock FontSize="14" Background="Transparent" >Apply to Process Parameters</TextBlock>
+                                                <Button DockPanel.Dock="Right" Margin="0 0 40 0" HorizontalAlignment="Left"  Padding="0" Height="Auto" Width="200"  Command="{Binding ApplyToProcessParametersCommand}" ToolTip="Apply to Process Parameters" VerticalContentAlignment="Center">
+                                                    <TextBlock FontSize="14" Background="Transparent"  VerticalAlignment="Center" Margin="0 2 0 0">Apply to Process Parameters</TextBlock>
                                                 </Button>
                                                 <TextBlock HorizontalAlignment="Center"  FontSize="21" Margin="180 10 0 0"> Process Parameters</TextBlock>
                                         </DockPanel> 
@@ -330,7 +330,7 @@
                                         </UniformGrid>
                                             </Border>
                                         </StackPanel></Border>
-                                    <StackPanel x:Name="RubbingResultsPanel"  Grid.Column="0" Grid.Row="1" Margin="0 30 0 0">
+                                    <StackPanel x:Name="RubbingResultsPanel"  Grid.Column="0" Grid.Row="1" Margin="0 5 0 0">
                                         <TextBlock HorizontalAlignment="Center"  FontSize="21"> Rubbing results</TextBlock>
 
                                         <DataGrid x:Name="RubbingResultsGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="280" RowHeight="26" Padding="0"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.TestResult.RubbingResults}" Margin="20 10 40 10" FontSize="16">
@@ -475,8 +475,8 @@
                                         </UniformGrid>
                                             </Border>
                                     </StackPanel>
-                                    <StackPanel x:Name="MechanicalPropertiesPanel" Grid.Column="1" Grid.Row="1" Margin="0 30 0 0">
-                                        <TextBlock HorizontalAlignment="Center"  FontSize="21" MaxHeight="600" >Mechanical properties</TextBlock>
+                                    <StackPanel x:Name="MechanicalPropertiesPanel" Grid.Column="1" Grid.Row="1" Margin="0 5 0 0">
+                                        <TextBlock HorizontalAlignment="Center"  FontSize="21"  >Mechanical properties</TextBlock>
                                         <DataGrid x:Name="MechanicalPropertiesGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="250" RowHeight="26" Padding="0"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.TestResult.TensileResults}" Margin="0 10 20 10" FontSize="16">
                                             <DataGrid.ColumnHeaderStyle >
                                                 <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
@@ -530,7 +530,7 @@
 
                                     </StackPanel>
                                     <StackPanel x:Name="UniformityPanel" HorizontalAlignment="Center" Grid.Column="0" Grid.Row="2" >
-                                        <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontSize="21"> Uniformity</TextBlock>
+                                        <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" FontSize="21"> Uniformity</TextBlock>
                                         <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="20 10 40 10">
                                             <UniformGrid Columns="2"  HorizontalAlignment="Left"  MinWidth="{ Binding ElementName=RubbingResultsGrid, Path= ActualWidth }"  >
                                                 <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
@@ -563,7 +563,7 @@
                         </Border>
                         </StackPanel>
                                     <StackPanel x:Name="COFPanel" HorizontalAlignment="Center" Grid.Column="1" Grid.Row="2" >
-                                        <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontSize="21"> COF</TextBlock>
+                                        <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" FontSize="21"> COF</TextBlock>
                                         <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="0 10 20 10" >
                                             <UniformGrid Columns="4"  HorizontalAlignment="Left" MinWidth="{ Binding ElementName=MechanicalPropertiesGrid, Path= ActualWidth }" >
                                                 <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-- 
cgit v1.3.1