From 516ee0b585d84bda4fcc3c31aa44d1e3b7da5e93 Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Thu, 28 Jul 2022 18:33:11 +0300
Subject: MS. RML extension. Added table washing test results , GUI and
 database.

Related Work Items: #6660
---
 .../Views/TestResultsView.xaml                     | 602 ++++++++++++---------
 .../Views/TestResultsView.xaml.cs                  |  13 +
 2 files changed, 369 insertions(+), 246 deletions(-)

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

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 0aceebc9a..77cac3648 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
@@ -12,10 +12,12 @@
         xmlns:localconverters="clr-namespace:Tango.MachineStudio.ThreadExtensions.Converters"
         xmlns:global="clr-namespace:Tango.MachineStudio.ThreadExtensions"
         xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+        xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
+        xmlns:components="clr-namespace:Tango.SharedUI.Components;assembly=Tango.SharedUI"
         xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
         xmlns:fa="http://schemas.fontawesome.io/icons/"
         mc:Ignorable="d"
-        d:DesignHeight="950" d:DesignWidth="1200" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" FontSize="16">
+        d:DesignHeight="950" d:DesignWidth="1200" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" FontSize="14">
 
     <UserControl.Resources>
         
@@ -23,7 +25,8 @@
         <localconverters:ColorWithPercentToBrushConverter x:Key="ColorWithPercentToBrushConverter"/>
         <converters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" />
         <autoCompleteMachine:MachinesProvider x:Key="MachinesProvider" />
-        
+        <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
+
 
         <Style TargetType="{x:Type ListBoxItem}" x:Key="basicListBoxItem">
             <Setter Property="Background" Value="Transparent"/>
@@ -156,6 +159,8 @@
             </Setter>
         </Style>
 
+        
+
     </UserControl.Resources>
     <Grid  DataContext="{Binding  TestResultsViewVM}">
         <!--<Grid.RowDefinitions>
@@ -169,7 +174,7 @@
                 <RowDefinition Height="1*"/>
             </Grid.RowDefinitions>
 
-            <StackPanel Orientation="Horizontal" Margin="35 0 0 0">
+            <StackPanel x:Name="TabControlbuttons" Orientation="Horizontal" Margin="35 0 0 0">
                 <ListBox Style="{x:Null}" HorizontalAlignment="Left" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" ItemContainerStyle="{StaticResource basicListBoxItem}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled" Background="Transparent" BorderThickness="0" ItemsSource="{Binding ResultTabs}" SelectedItem="{Binding SelectedTab}">
                     <ListBox.ItemsPanel>
                         <ItemsPanelTemplate>
@@ -244,10 +249,7 @@
                 </ItemsControl>
 
                 <Grid Grid.Column="0" MinWidth="600" HorizontalAlignment="Left" >
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="3*"/>
-                        <RowDefinition Height="1*"/>
-                    </Grid.RowDefinitions>
+                    
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="1*"/>
@@ -260,52 +262,52 @@
                                     <ColumnDefinition Width="1*"></ColumnDefinition>
                                     <ColumnDefinition Width="1*"></ColumnDefinition>
                                 </Grid.ColumnDefinitions>
-                                <StackPanel Orientation="Vertical" Grid.Column="0">
-                                    <Border>
-                                    <StackPanel x:Name="DryerTempPanel"  HorizontalAlignment="Stretch" Grid.Column="0"  >
-                                        <DockPanel Margin="0 10 0 0">
-                                            <Button DockPanel.Dock="Right" Margin="0 0 40 0" HorizontalAlignment="Left"  Padding="0"  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>
-                                        <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}">
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Dryer temperature</TextBlock>
-                                                </Border>
-                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Left"  Minimum="0" Maximum="300" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" Value="{Binding  SelectedTab.TestResult.DryerTemperature, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
-                                                </Border>
-                                                <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel temperature</TextBlock>
-                                                </Border>
-                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="False"  Minimum="0" Maximum="400" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TunnelTemperature,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
-                                                </Border>
-                                                <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel flow</TextBlock>
-                                                </Border>
-                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="20" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TunnelFlow,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
-                                                </Border>
-                                                <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel AVG temperature</TextBlock>
-                                                </Border>
-                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="400" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TunnelAvgTemperature,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
-                                                </Border>
-                                            </UniformGrid>
-                                        </Border>
-                                    </StackPanel>
-                                </Border>
-                                    <StackPanel x:Name="RubbingResultsPanel"  Grid.Column="0"  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">
+                                <DockPanel Grid.Column="0" >
+                                    <Border DockPanel.Dock="Top">
+                                        <StackPanel x:Name="DryerTempPanel"  HorizontalAlignment="Stretch" >
+                                            <DockPanel Margin="0 0 0 0">
+                                                <Button DockPanel.Dock="Right" Margin="0 0 40 0" HorizontalAlignment="Left"  Padding="0"  Width="200"  Command="{Binding ApplyToProcessParametersCommand}" ToolTip="Apply to Process Parameters" VerticalContentAlignment="Center" Height="28">
+                                                    <TextBlock FontSize="14" Background="Transparent"  VerticalAlignment="Center">Apply to Process Parameters</TextBlock>
+                                                </Button>
+                                                <TextBlock HorizontalAlignment="Center"  FontSize="18" Margin="180 10 0 0"> Process Parameters</TextBlock>
+                                            </DockPanel>
+                                            <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="20 5 40 5">
+                                                <UniformGrid Columns="2"  HorizontalAlignment="Left"  MinWidth="{ Binding ElementName=RubbingResultsGrid, Path= ActualWidth }" >
+                                                    <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Dryer temperature</TextBlock>
+                                                    </Border>
+                                                    <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                        <mahapps:NumericUpDown HasDecimals="False" HorizontalContentAlignment="Left"  Minimum="0" Maximum="300" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" Value="{Binding  SelectedTab.TestResult.DryerTemperature, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
+                                                    </Border>
+                                                    <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel temperature</TextBlock>
+                                                    </Border>
+                                                    <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                        <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="False"  Minimum="0" Maximum="400" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TunnelTemperature,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
+                                                    </Border>
+                                                    <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel flow</TextBlock>
+                                                    </Border>
+                                                    <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                        <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="20" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TunnelFlow,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
+                                                    </Border>
+                                                    <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Tunnel AVG temperature</TextBlock>
+                                                    </Border>
+                                                    <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                        <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True" Minimum="0" Maximum="400" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TunnelAvgTemperature,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0"></mahapps:NumericUpDown>
+                                                    </Border>
+                                                </UniformGrid>
+                                            </Border>
+                                        </StackPanel>
+                                    </Border>
+                                    <StackPanel x:Name="RubbingResultsPanel"  DockPanel.Dock="Top"  Margin="0 5 0 0">
+                                        <TextBlock HorizontalAlignment="Center"  FontSize="18"> Rubbing results</TextBlock>
+
+                                        <DataGrid x:Name="RubbingResultsGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="280" RowHeight="20" 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 5 40 5" FontSize="14">
                                         <DataGrid.ColumnHeaderStyle >
                                             <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
-                                                <Setter Property="FontSize" Value="16"/>
+                                                <Setter Property="FontSize" Value="14"/>
                                                 <Setter Property="HorizontalAlignment" Value="Left"/>
                                                 <Setter Property="Margin" Value="2 0 0 0"/>
                                                 <Setter Property="Padding" Value="0 5"/>
@@ -320,6 +322,7 @@
                                                 <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
                                                 <Setter Property="Padding" Value="0"></Setter>
                                                 <Setter Property="Margin" Value="0 0 0 0"></Setter>
+                                                 <Setter Property="VerticalAlignment" Value="Center"></Setter>
                                             </Style>
                                         </DataGrid.CellStyle>
                                         <DataGrid.Columns>
@@ -333,26 +336,26 @@
                                                 </DataGridTemplateColumn.CellTemplate>
                                             </DataGridTemplateColumn>
 
-                                            <mahapps:DataGridNumericUpDownColumn Header="DeltaE CIE 100%" Minimum="0" Maximum="100" Binding="{Binding DeltaeCie100,  StringFormat={}{0:F2}}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" />
+                                                <mahapps:DataGridNumericUpDownColumn Header="DeltaE CIE 100%" Minimum="0" Maximum="100" Binding="{Binding DeltaeCie100,  StringFormat={}{0:F2}}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"  FontSize="14" TextBlock.FontSize="14"/>
 
 
                                             <DataGridTemplateColumn Header="GS 100%"  Width="1*">
                                                 <DataGridTemplateColumn.CellTemplate>
                                                     <DataTemplate>
                                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                            <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
+                                                            <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" VerticalAlignment="Center" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
                                                         </StackPanel>
                                                     </DataTemplate>
                                                 </DataGridTemplateColumn.CellTemplate>
                                             </DataGridTemplateColumn>
 
-                                            <mahapps:DataGridNumericUpDownColumn Header="DeltaE CIE 200%" Minimum="0" Maximum="100" Binding="{Binding DeltaeCie200}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"  FontSize="16"/>
+                                            <mahapps:DataGridNumericUpDownColumn Header="DeltaE CIE 200%" Minimum="0" Maximum="100" Binding="{Binding DeltaeCie200}" HideUpDownButtons="True" Width="1*"  ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}"  FontSize="14" TextBlock.FontSize="14"/>
 
                                             <DataGridTemplateColumn Header="GS 200%"  Width="1*">
                                                 <DataGridTemplateColumn.CellTemplate>
                                                     <DataTemplate>
                                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                            <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs200,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
+                                                            <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" VerticalAlignment="Center" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs200,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
                                                         </StackPanel>
                                                     </DataTemplate>
                                                 </DataGridTemplateColumn.CellTemplate>
@@ -360,49 +363,43 @@
                                         </DataGrid.Columns>
                                     </DataGrid>
 
-                                </StackPanel>
-                                    <StackPanel x:Name="UniformityPanel" HorizontalAlignment="Center" Grid.Column="0" Grid.Row="2" >
-                                        <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}">
-                                                    <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">Uniformity</TextBlock>
-                                                </Border>
-                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock FontWeight="Light" VerticalAlignment="Center" Margin="5 0 0 0">Severity</TextBlock>
-                                                </Border>
-                                                <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}" >
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Zone 1</TextBlock>
-                                                </Border>
-                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                        <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.SeverityZone1Min,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0"  Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" FontSize="16" MinWidth="26"></mahapps:NumericUpDown>
-                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">-</TextBlock>
-                                                        <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.SeverityZone1Max,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  Margin="0 0 0 0" Width="Auto" FontSize="16" StringFormat="{}{0:F1}" ></mahapps:NumericUpDown>
-                                                    </StackPanel>
-                                                </Border>
-                                                <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Zone 2</TextBlock>
-                                                </Border>
-                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                        <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.SeverityZone2Min,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" MaxWidth="20" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" FontSize="16" MinWidth="26"></mahapps:NumericUpDown>
-                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">-</TextBlock>
-                                                        <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.SeverityZone2Max,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  Margin="0 0 0 0" Width="Auto" FontSize="16" StringFormat="{}{0:F1}" ></mahapps:NumericUpDown>
-                                                    </StackPanel>
-                                                </Border>
-                                            </UniformGrid>
-                                        </Border>
                                     </StackPanel>
-                                    <StackPanel x:Name="WashingTestResultsPanel"  Grid.Column="0" Grid.Row="3" Margin="0 5 0 0">
-                                        <TextBlock HorizontalAlignment="Center"  FontSize="21"> Washing results</TextBlock>
-                                        <DataGrid x:Name="WashingTestResultsGrid" 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">
+
+                                    <StackPanel x:Name="WashingTestResultsPanel"  DockPanel.Dock="Top" Margin="0 5 0 0">
+                                        <TextBlock HorizontalAlignment="Center"  FontSize="18"> Washing results</TextBlock>
+                                        <!--<DataGrid x:Name="WashingTestResultsHeader" HeadersVisibility="None" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="280" RowHeight="20" Padding="0"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.ColorsToMaterialCollection}" Margin="20 10 40 10" FontSize="14">
+                                            <DataGrid.CellStyle>
+                                                <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                                                    <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                                                    <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                                                    <Setter Property="Padding" Value="0"></Setter>
+                                                    <Setter Property="Margin" Value="0 0 0 0"></Setter>
+                                                </Style>
+                                            </DataGrid.CellStyle>
+                                            <DataGrid.Columns>
+                                                <DataGridTextColumn Width="100"></DataGridTextColumn>
+                                                <DataGridTextColumn   Width="1*" Binding="{Binding Header1}" FontSize="14"/>
+                                                <DataGridTextColumn   Width="1*" Binding="{Binding Header2}" FontSize="14"/>
+                                                <DataGridTextColumn   Width="1*" Binding="{Binding Header3}" FontSize="14"/>
+                                                <DataGridTextColumn   Width="1*" Binding="{Binding Header4}" FontSize="14"/>
+                                                <DataGridTextColumn   Width="1*" Binding="{Binding Header5}" FontSize="14"/>
+                                                <DataGridTextColumn   Width="1*" Binding="{Binding Header6}" FontSize="14"/>
+                                                <DataGridTextColumn   Width="1*" Binding="{Binding Header7}" FontSize="14"/>
+                                            </DataGrid.Columns>
+                                        </DataGrid>-->
+
+                                            <DataGrid x:Name="WashingTestResultsGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="280" RowHeight="20" Padding="0"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.ColorsToMaterialCollection}" Margin="20 10 40 10" FontSize="14">
+
+                                            <DataGrid.Resources>
+                                                <components:BindingProxy x:Key="proxy" Data="{Binding SelectedTab.ColorsToMaterialCollection}" />
+                                            </DataGrid.Resources>
+
                                             <DataGrid.ColumnHeaderStyle >
                                                 <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
-                                                    <Setter Property="FontSize" Value="16"/>
+                                                    <Setter Property="FontSize" Value="14"/>
                                                     <Setter Property="HorizontalAlignment" Value="Left"/>
                                                     <Setter Property="Margin" Value="2 0 0 0"/>
-                                                    <Setter Property="Padding" Value="0 5"/>
+                                                    <Setter Property="Padding" Value="0 4"/>
                                                     <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/>
                                                     <Setter Property="HorizontalContentAlignment" Value="Left"/>
                                                 </Style>
@@ -416,68 +413,146 @@
                                                 </Style>
                                             </DataGrid.CellStyle>
                                             <DataGrid.Columns>
-                                                <DataGridTemplateColumn Header="Material"  Width="80">
+                                                <DataGridTemplateColumn Header=""  Width="100">
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
-                                                            <Border  BorderThickness="0.4">
-                                                                <TextBlock Text="{Binding TestResultColor, Converter={StaticResource EnumToDescriptionConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10 0 1 0" Padding="0.4"></TextBlock>
-                                                            </Border>
+                                                            <Grid>
+                                                                <ToggleButton Cursor="Hand" x:Name="PopupButton"   BorderThickness="0" Height="26" Background="Transparent"  VerticalAlignment="Center" Margin="0 0 0 0" IsChecked="{Binding ElementName=Popup, Path=IsOpen}">
+                                                                        <ToggleButton.Style>
+                                                                            <Style TargetType="ToggleButton" BasedOn="{StaticResource emptyToggleButton}">
+                                                                                <Style.Triggers>
+                                                                                    <DataTrigger Binding="{Binding IsOpen, ElementName=Popup}" Value="True">
+                                                                                        <Setter Property="IsEnabled" Value="False" />
+                                                                                    </DataTrigger>
+                                                                                </Style.Triggers>
+                                                                            </Style>
+                                                                        </ToggleButton.Style>
+
+                                                                        <StackPanel Orientation="Horizontal">
+                                                                            <materialDesign:PackIcon VerticalAlignment="Center" Kind="Pencil" Width="20" Height="20">
+                                                                                <materialDesign:PackIcon.Foreground>
+                                                                                <SolidColorBrush Color="{Binding Color,Mode=OneWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource ColorToIntegerConverter},Delay=100}"></SolidColorBrush>
+                                                                                </materialDesign:PackIcon.Foreground>
+                                                                            </materialDesign:PackIcon>
+                                                                            <TextBlock Margin="5 0 0 0" FontSize="14" VerticalAlignment="Center">COLOR</TextBlock>
+                                                                        </StackPanel>
+                                                                    </ToggleButton>
+                                                                <Popup x:Name="Popup" MouseDown="Popup_MouseDown" PopupAnimation="Fade" StaysOpen="False" PlacementTarget="{Binding ElementName=PopupButton}"  Placement="Bottom" AllowsTransparency="True">
+                                                                    <Border Background="{StaticResource WhiteBrush}" CornerRadius="5" Margin="10">
+                                                                        <Border.Effect>
+                                                                            <DropShadowEffect ShadowDepth="0" BlurRadius="10" />
+                                                                        </Border.Effect>
+                                                                        <Grid Margin="10" x:Name="pgrid">
+                                                                            <DockPanel>
+                                                                                <TextBlock DockPanel.Dock="Top" HorizontalAlignment="Center">COLOR</TextBlock>
+                                                                                <Viewbox Width="300" Height="180" VerticalAlignment="Center" Stretch="Fill">
+                                                                                    <colorPicker:ColorCanvas SelectedColor="{Binding Color ,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource ColorToIntegerConverter}}"  Background="Transparent" BorderThickness="0" Height="150" Width="230" />
+                                                                                </Viewbox>
+                                                                            </DockPanel>
+                                                                        </Grid>
+                                                                    </Border>
+                                                                </Popup>
+                                                            </Grid>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
 
-                                                <DataGridTemplateColumn Header="Color"  Width="1*">
+                                                <DataGridTemplateColumn   Width="1*">
+                                                    <DataGridTemplateColumn.Header>
+                                                        <Grid Margin="0" x:Name="Color1grid" >
+                                                            <TextBlock Text="{Binding Source={StaticResource proxy},Path=Data.[0].Header1}"/>
+                                                        </Grid>
+                                                    </DataGridTemplateColumn.Header>
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
+                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Path = WashingValue1, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5" VerticalAlignment="Center"/>
                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
                                                 
-                                                <DataGridTemplateColumn Header="Color"  Width="1*">
+                                                <DataGridTemplateColumn  Width="1*">
+                                                    <DataGridTemplateColumn.Header>
+                                                        <Grid Margin="0" x:Name="Color2grid">
+                                                            <TextBlock Text="{Binding Source={StaticResource proxy},Path=Data.[0].Header2}"/>
+                                                        </Grid>
+                                                    </DataGridTemplateColumn.Header>
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
+                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Path = WashingValue2, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5" VerticalAlignment="Center"/>
                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
 
-                                                <DataGridTemplateColumn Header="Color"  Width="1*">
+                                                <DataGridTemplateColumn   Width="1*">
+                                                    <DataGridTemplateColumn.Header>
+                                                        <Grid Margin="0" x:Name="Color53grid">
+                                                            <TextBlock Text="{Binding Source={StaticResource proxy},Path=Data.[0].Header3}"/>
+                                                        </Grid>
+                                                    </DataGridTemplateColumn.Header>
+                                                    <DataGridTemplateColumn.CellTemplate>
+                                                        <DataTemplate>
+                                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Path = WashingValue3, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5" VerticalAlignment="Center"/>
+                                                            </StackPanel>
+                                                        </DataTemplate>
+                                                    </DataGridTemplateColumn.CellTemplate>
+                                                </DataGridTemplateColumn>
+                                                <DataGridTemplateColumn  Width="1*">
+                                                    <DataGridTemplateColumn.Header>
+                                                        <Grid Margin="0" x:Name="Color4grid">
+                                                            <TextBlock Text="{Binding Source={StaticResource proxy},Path=Data.[0].Header4}"/>
+                                                        </Grid>
+                                                    </DataGridTemplateColumn.Header>
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
+                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Path = WashingValue4, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5" VerticalAlignment="Center"/>
                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
-                                                <DataGridTemplateColumn Header="Color"  Width="1*">
+                                                <DataGridTemplateColumn  Width="1*">
+                                                    <DataGridTemplateColumn.Header>
+                                                        <Grid Margin="0" x:Name="Color5grid">
+                                                            <TextBlock Text="{Binding Source={StaticResource proxy},Path=Data.[0].Header5}"/>
+                                                        </Grid>
+                                                    </DataGridTemplateColumn.Header>
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs200,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
+                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Path = WashingValue5, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5" VerticalAlignment="Center"/>
                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
-                                                <DataGridTemplateColumn Header="Color"  Width="1*">
+                                                <DataGridTemplateColumn  Width="1*">
+                                                    <DataGridTemplateColumn.Header>
+                                                        <Grid Margin="0" x:Name="Color6grid">
+                                                            <TextBlock Text="{Binding Source={StaticResource proxy},Path=Data.[0].Header6}"/>
+                                                        </Grid>
+                                                    </DataGridTemplateColumn.Header>
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
+                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"  HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Path = WashingValue6, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="2" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5" VerticalAlignment="Center"/>
                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
-                                                <DataGridTemplateColumn Header="Color"  Width="1*">
+                                                <DataGridTemplateColumn  Width="1*">
+                                                    <DataGridTemplateColumn.Header>
+                                                        <Grid Margin="0" x:Name="Color7grid">
+                                                            <TextBlock Text="{Binding Source={StaticResource proxy},Path=Data.[0].Header7}"/>
+                                                        </Grid>
+                                                    </DataGridTemplateColumn.Header>
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Gs100,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5"/>
+                                                                <mahapps:NumericUpDown  HasDecimals="True" Minimum="1" Maximum="5" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="False" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  Path = WashingValue7, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="2" StringFormat="{}{0:F1}" HorizontalAlignment="Right" MinWidth="26" Interval="0.5" VerticalAlignment="Center"/>
                                                             </StackPanel>
                                                         </DataTemplate>
                                                     </DataGridTemplateColumn.CellTemplate>
@@ -486,93 +561,155 @@
                                         </DataGrid>
 
                                     </StackPanel>
-                                </StackPanel>
-                                <StackPanel Orientation="Vertical" Grid.Column="1">
-                                    <StackPanel x:Name="TensionresultsPanel" Grid.Column="1" Grid.Row="0" Margin="0 20 0 0" >
-                                        <TextBlock HorizontalAlignment="Center" FontSize="21"> Tension through the thread path</TextBlock>
-                                        <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="0 10 20 10" >
+
+                                    <Grid VerticalAlignment="Stretch" DockPanel.Dock="Top" Margin="10 30 10 20">
+                                        <DockPanel    x:Name="ImportExcelFile"  LastChildFill="True">
+                                            <DockPanel DockPanel.Dock="Top" Margin="0 0 20 0">
+                                                <Button  Margin="10 0 0 0"  Padding="2" Height="24" Cursor="Hand" Width="100" Command="{Binding SelectedTab.UploadCommand}" ToolTip="Upload selected files">Upload</Button>
+                                                <Button DockPanel.Dock="Right" Margin="0 0 10 0" HorizontalAlignment="Right" Padding="2" Height="24" Cursor="Hand" Width="100" Command="{Binding SelectedTab.DownLoadAllCommand}" ToolTip="Upload selected files">Download All</Button>
+                                            </DockPanel>
+
+                                            <Grid   Margin="0 0 20 0" VerticalAlignment="Stretch" >
+                                                <DataGrid  Margin="10" RowHeight="20" Padding="0"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}"  AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.TestResultsFiles}" IsReadOnly="True" 
+                                      ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" MinHeight="40">
+                                                    <DataGrid.ColumnHeaderStyle >
+                                                        <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
+                                                            <Setter Property="FontSize" Value="14"/>
+                                                            <Setter Property="HorizontalAlignment" Value="Left"/>
+                                                            <Setter Property="Margin" Value="2 0 0 0"/>
+                                                            <Setter Property="Padding" Value="0 5"/>
+                                                            <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/>
+                                                            <Setter Property="HorizontalContentAlignment" Value="Left"/>
+                                                        </Style>
+                                                    </DataGrid.ColumnHeaderStyle>
+                                                    <DataGrid.CellStyle>
+                                                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                                                            <Setter Property="BorderThickness" Value="0"/>
+                                                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                                                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                                                            <Setter Property="Padding" Value="0"></Setter>
+                                                            <Setter Property="Margin" Value="0 0 0 0"></Setter>
+                                                        </Style>
+                                                    </DataGrid.CellStyle>
+                                                    <DataGrid.Columns>
+                                                        <DataGridTextColumn Header="File Name" Binding="{Binding FileName}" Width="1*" FontSize="14"/>
+                                                        <DataGridTextColumn Header="Progress"  Width="1*" />
+                                                        <DataGridTemplateColumn Header="DownLoad" Width="140">
+                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                <DataTemplate>
+                                                                    <Button Style="{StaticResource emptyButton}" Cursor="Hand"  Command="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid},AncestorLevel=2},Path=DataContext.SelectedTab.DownLoadFileCommand}" CommandParameter="{Binding}">
+                                                                        <StackPanel Orientation="Horizontal">
+                                                                            <TextBlock FontSize="14" Text="Download" VerticalAlignment="Center"></TextBlock>
+                                                                            <materialDesign:PackIcon VerticalAlignment="Center" Margin="5 0 0 0" Kind="Download" Width="18" />
+                                                                        </StackPanel>
+                                                                    </Button>
+                                                                </DataTemplate>
+                                                            </DataGridTemplateColumn.CellTemplate>
+                                                        </DataGridTemplateColumn>
+                                                        <DataGridTemplateColumn Header="Delete" Width="140">
+                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                <DataTemplate>
+                                                                    <Button Style="{StaticResource emptyButton}" Cursor="Hand"  Command="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid},AncestorLevel=2},Path=DataContext.SelectedTab.DeleteCommand}" CommandParameter="{Binding}">
+                                                                        <StackPanel Orientation="Horizontal">
+                                                                            <TextBlock FontSize="14" Text="Delete" VerticalAlignment="Center"></TextBlock>
+                                                                            <materialDesign:PackIcon VerticalAlignment="Center" Margin="5 0 0 0" Kind="Delete" Width="18"  />
+                                                                        </StackPanel>
+                                                                    </Button>
+                                                                </DataTemplate>
+                                                            </DataGridTemplateColumn.CellTemplate>
+                                                        </DataGridTemplateColumn>
+                                                    </DataGrid.Columns>
+                                                </DataGrid>
+                                            </Grid>
+                                        </DockPanel>
+                                    </Grid>
+                                </DockPanel>
+                                <DockPanel Grid.Column="1" LastChildFill="True">
+                                    <StackPanel x:Name="TensionresultsPanel" DockPanel.Dock="Top" Margin="0 20 0 0" >
+                                        <TextBlock HorizontalAlignment="Center" FontSize="18"> Tension through the thread path</TextBlock>
+                                        <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="0 5 20 5" >
                                             <UniformGrid Columns="4"  Background="{StaticResource TransparentBackgroundBrush}"  HorizontalAlignment="Left" MinWidth="{ Binding ElementName=MechanicalPropertiesGrid, Path= ActualWidth }" >
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock FontWeight="Light"  Margin="5 0 0 0" VerticalAlignment="Center">Tension in Zone</TextBlock>
+                                                    <TextBlock FontWeight="Light"  Margin="0 0 0 0" VerticalAlignment="Center" FontSize="14">Tension in Zone</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">Tensiometer (gr)</TextBlock>
+                                                    <TextBlock FontWeight="Light" Margin="10 0 0 0" VerticalAlignment="Center" FontSize="14">Tensiometer (gr)</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock FontWeight="Light"   Margin="5 0 0 0" VerticalAlignment="Center">Tension in Zone</TextBlock>
+                                                    <TextBlock FontWeight="Light"   Margin="0 0 0 0" VerticalAlignment="Center" FontSize="14">Tension in Zone</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">MS</TextBlock>
+                                                    <TextBlock FontWeight="Light" Margin="10 0 0 0" VerticalAlignment="Center" FontSize="14">MS</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0">Head</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Head</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                                     <StackPanel Orientation="Horizontal">
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionHeadMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
-                                                        <!--<TextBlock FontSize="16" VerticalAlignment="Center"> -</TextBlock>
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionHeadMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionHeadMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
+                                                        <!--<TextBlock FontSize="14" VerticalAlignment="Center"> -</TextBlock>
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionHeadMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
                                                     </StackPanel>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0">BTSR</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">BTSR</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                                     <StackPanel Orientation="Horizontal">
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.BtsrMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
-                                                        <!--<TextBlock FontSize="16" VerticalAlignment="Center"> -</TextBlock>
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.BtsrMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.BtsrMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
+                                                        <!--<TextBlock FontSize="14" VerticalAlignment="Center"> -</TextBlock>
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.BtsrMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
                                                     </StackPanel>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0">After dryer</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">After dryer</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                                     <StackPanel Orientation="Horizontal">
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionAfterDryerMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
-                                                        <!--<TextBlock FontSize="16" VerticalAlignment="Center"> -</TextBlock>
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensioinAfterDryerMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionAfterDryerMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
+                                                        <!--<TextBlock FontSize="14" VerticalAlignment="Center"> -</TextBlock>
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensioinAfterDryerMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
                                                     </StackPanel>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0" >Puller tension</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Puller tension</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                                     <StackPanel Orientation="Horizontal">
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.PullerTensionMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
-                                                        <!--<TextBlock FontSize="16" VerticalAlignment="Center"> -</TextBlock>
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.PullerTensionMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.PullerTensionMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
+                                                        <!--<TextBlock FontSize="14" VerticalAlignment="Center"> -</TextBlock>
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.PullerTensionMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
                                                     </StackPanel>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0">Winder</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Winder</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                                     <StackPanel Orientation="Horizontal">
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionWinderMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
-                                                        <!--<TextBlock FontSize="16" VerticalAlignment="Center"> -</TextBlock>
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionWinderMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionWinderMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
+                                                        <!--<TextBlock FontSize="14" VerticalAlignment="Center"> -</TextBlock>
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.TensionWinderMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
                                                     </StackPanel>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock Margin="5 0 0 0">Winder Exit Tension</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Winder Exit Tension</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                                     <StackPanel Orientation="Horizontal">
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.ExitTensionMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
-                                                        <!--<TextBlock FontSize="16" VerticalAlignment="Center"> -</TextBlock>
-                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.ExitTensionMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="16" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.ExitTensionMin,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="10 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Right" MinWidth="26"/>
+                                                        <!--<TextBlock FontSize="14" VerticalAlignment="Center"> -</TextBlock>
+                                                        <mahapps:NumericUpDown  HasDecimals="True" Minimum="0" Maximum="100000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.ExitTensionMax,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" FontSize="14" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" MinWidth="26"/>-->
                                                     </StackPanel>
                                                 </Border>
                                             </UniformGrid>
                                         </Border>
                                     </StackPanel>
-                                    <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">
+                                    <StackPanel x:Name="MechanicalPropertiesPanel" DockPanel.Dock="Top" Margin="0 5 0 0">
+                                        <TextBlock HorizontalAlignment="Center"  FontSize="18"  >Mechanical properties</TextBlock>
+                                        <DataGrid x:Name="MechanicalPropertiesGrid" HorizontalAlignment="Left" VerticalScrollBarVisibility ="Auto" MaxHeight="250" RowHeight="20" 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 5 20 5" FontSize="14">
                                             <DataGrid.ColumnHeaderStyle >
                                                 <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
-                                                    <Setter Property="FontSize" Value="16"/>
+                                                    <Setter Property="FontSize" Value="14"/>
                                                     <Setter Property="HorizontalAlignment" Value="Left"/>
                                                     <Setter Property="Margin" Value="2 0 0 0"/>
                                                     <Setter Property="Padding" Value="0 5"/>
@@ -590,8 +727,8 @@
                                                 </Style>
                                             </DataGrid.CellStyle>
                                             <DataGrid.Columns>
-                                                <DataGridTextColumn Header="% Color" Binding="{ Binding ColorPercent}"  MinWidth="100"></DataGridTextColumn>
-                                                <DataGridTemplateColumn Header="Color"  Width="80">
+                                                <DataGridTextColumn Header="% Color" Binding="{ Binding ColorPercent}"  MinWidth="100" FontSize="14" TextBlock.FontSize="14" ></DataGridTextColumn>
+                                                <DataGridTemplateColumn Header="Color"  Width="80" >
                                                     <DataGridTemplateColumn.CellTemplate>
                                                         <DataTemplate>
                                                             <Border BorderThickness="0">
@@ -607,12 +744,13 @@
                                                     </DataGridTemplateColumn.CellTemplate>
                                                 </DataGridTemplateColumn>
 
-                                                <mahapps:DataGridNumericUpDownColumn Header="Load at &#x0a;Maximum &#x0a;Load(N)" Minimum="0" Maximum="100" Binding="{Binding MaxLoad, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}"  />
-                                                <mahapps:DataGridNumericUpDownColumn Header="STDEV" Minimum="0" Maximum="100" Binding="{Binding StdevMaxLoad}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}" />
-                                                <mahapps:DataGridNumericUpDownColumn Header="% Change" Minimum="-100" Maximum="100" Binding="{Binding PercentChangeLoad, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDownWithTrigger}" StringFormat="{}{0:F2}" >
+                                                <mahapps:DataGridNumericUpDownColumn Header="Load at &#x0a;Maximum &#x0a;Load(N)" Minimum="0" Maximum="100" Binding="{Binding MaxLoad, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}"  FontSize="14"/>
+                                                <mahapps:DataGridNumericUpDownColumn Header="STDEV" Minimum="0" Maximum="100" Binding="{Binding StdevMaxLoad}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}" FontSize="14"/>
+                                                <mahapps:DataGridNumericUpDownColumn Header="% Change" Minimum="-100" Maximum="100" Binding="{Binding PercentChangeLoad, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDownWithTrigger}" StringFormat="{}{0:F2}" FontSize="14">
                                                     <mahapps:DataGridNumericUpDownColumn.CellStyle>
                                                         <Style TargetType="DataGridCell">
                                                             <Setter Property="Visibility" Value="Visible"/>
+                                                            <Setter Property="FontSize" Value="14"/>
                                                             <Style.Triggers>
                                                                 <DataTrigger Binding="{ Binding IsWhiteColor}" Value="True">
                                                                     <Setter Property="Visibility" Value="Hidden"/>
@@ -622,15 +760,16 @@
                                                     </mahapps:DataGridNumericUpDownColumn.CellStyle>
                                                 </mahapps:DataGridNumericUpDownColumn>
 
-                                                <mahapps:DataGridNumericUpDownColumn Header="Percentage &#x0a;Strain at &#x0a;Maximum Load" Minimum="0" Maximum="100" Binding="{Binding StrainMaxLoad, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}" >
+                                                <mahapps:DataGridNumericUpDownColumn Header="Percentage &#x0a;Strain at &#x0a;Maximum Load" Minimum="0" Maximum="100" FontSize="14" TextBlock.FontSize="14" Binding="{Binding StrainMaxLoad, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}" />
+
 
-                                                </mahapps:DataGridNumericUpDownColumn>
 
-                                                <mahapps:DataGridNumericUpDownColumn Header="STDEV" Minimum="0" Maximum="100" Binding="{Binding StdevStrainMaxLoad}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}" />
+                                                <mahapps:DataGridNumericUpDownColumn Header="STDEV" Minimum="0" Maximum="100" FontSize="14"  Binding="{Binding StdevStrainMaxLoad}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDown}" StringFormat="{}{0:F2}"  TextBlock.FontSize="14"/>
 
-                                                <mahapps:DataGridNumericUpDownColumn Header="% Change" Minimum="-100" Maximum="100" Binding="{Binding PercentChangeStrain, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDownWithTrigger}" StringFormat="{}{0:F2}">
+                                                <mahapps:DataGridNumericUpDownColumn Header="% Change" Minimum="-100" Maximum="100" FontSize="14" TextBlock.FontSize="14"  Binding="{Binding PercentChangeStrain, UpdateSourceTrigger=PropertyChanged}" HideUpDownButtons="True" Width="1*" ElementStyle="{StaticResource CellNumericUpDown}" EditingElementStyle="{StaticResource EditableCellNumericUpDownWithTrigger}" StringFormat="{}{0:F2}">
                                                     <mahapps:DataGridNumericUpDownColumn.CellStyle>
                                                         <Style TargetType="DataGridCell">
+                                                            <Setter Property="VerticalAlignment" Value="Center"/>
                                                             <Setter Property="Visibility" Value="Visible"/>
                                                             <Style.Triggers>
                                                                 <DataTrigger Binding="{ Binding IsWhiteColor}" Value="True">
@@ -645,35 +784,34 @@
                                         </DataGrid>
 
                                     </StackPanel>
-                                    <StackPanel x:Name="COFPanel" HorizontalAlignment="Center" Grid.Column="1" Grid.Row="2" >
-                                        <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" FontSize="21"> COF</TextBlock>
-                                        <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="0 10 20 10" >
+                                    <StackPanel x:Name="COFPanel" HorizontalAlignment="Center" DockPanel.Dock="Top" >
+                                        <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" FontSize="18"> COF</TextBlock>
+                                        <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="0 5 20 5" >
                                             <UniformGrid Columns="4"  HorizontalAlignment="Left" MinWidth="{ Binding ElementName=MechanicalPropertiesGrid, Path= ActualWidth }" >
                                                 <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock FontWeight="Light" Margin="5 0 0 0" VerticalAlignment="Center">Thread name</TextBlock>
+                                                    <TextBlock FontWeight="Normal" Margin="5 0 0 0" VerticalAlignment="Center" FontSize="14">Thread name</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock FontWeight="Light" VerticalAlignment="Center" Margin="5 0 0 0">Lub version</TextBlock>
+                                                    <TextBlock FontWeight="Normal" VerticalAlignment="Center" Margin="5 0 0 0" FontSize="14">Lub version</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock FontWeight="Light" VerticalAlignment="Center" Margin="5 0 0 0">COF</TextBlock>
+                                                    <TextBlock FontWeight="Normal" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="14">COF</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 1 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBlock FontWeight="Light" VerticalAlignment="Center" Margin="5 0 0 0">Lub amount</TextBlock>
+                                                    <TextBlock FontWeight="Normal" VerticalAlignment="Center" Margin="10 0 0 0" HorizontalAlignment="Left" FontSize="14">Lub amount</TextBlock>
                                                 </Border>
 
-
                                                 <Border BorderThickness="1 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}" >
                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">REF</TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBox Margin="5 0 0 0" VerticalAlignment="Center" Text="{Binding SelectedTab.TestResult.RefLubVersion}"></TextBox>
+                                                    <TextBox Margin="5 0 25 0" VerticalAlignment="Center" Text="{Binding SelectedTab.TestResult.RefLubVersion}"></TextBox>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.RefCof,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" MaxWidth="20" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" FontSize="16"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.RefCof,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0"  Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" FontSize="14" MinWidth="20"></mahapps:NumericUpDown>
                                                 </Border>
                                                 <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.RefLub,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" MaxWidth="20" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" FontSize="16"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.RefLub,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0"  Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" FontSize="14" MinWidth="20"></mahapps:NumericUpDown>
                                                 </Border>
 
 
@@ -681,98 +819,70 @@
                                                     <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" Text="{Binding ThreadName}"></TextBlock>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <TextBox Margin="5 0 0 0" VerticalAlignment="Center" Text="{Binding SelectedTab.TestResult.ThreadLubVersion}"></TextBox>
+                                                    <TextBox Margin="5 0 25 0" VerticalAlignment="Stretch" Text="{Binding SelectedTab.TestResult.ThreadLubVersion}" ></TextBox>
                                                 </Border>
                                                 <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.ThreadCof,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" MaxWidth="20" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" FontSize="16"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.ThreadCof,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0"  Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" FontSize="14" MinWidth="20"></mahapps:NumericUpDown>
                                                 </Border>
                                                 <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
-                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.ThreadLub,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0" MaxWidth="20" Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" FontSize="16"></mahapps:NumericUpDown>
+                                                    <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="100" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.ThreadLub,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="10 0 0 0"  Padding="0" StringFormat="{}{0:F2}" HorizontalAlignment="Left" FontSize="14" MinWidth="20"></mahapps:NumericUpDown>
                                                 </Border>
                                             </UniformGrid>
                                         </Border>
                                     </StackPanel>
-                                </StackPanel>
+                                    <StackPanel x:Name="UniformityPanel" HorizontalAlignment="Center" DockPanel.Dock="Top">
+                                        <TextBlock HorizontalAlignment="Center" Margin="0 5 0 0" FontSize="18"> Uniformity</TextBlock>
+                                        <Border BorderThickness="1" BorderBrush="{StaticResource GrayBrush200}" Margin="0 5 20 0">
+                                            <UniformGrid Columns="2"  HorizontalAlignment="Left"  MinWidth="{ Binding ElementName=COFPanel, Path= ActualWidth }"  >
+                                                <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                    <TextBlock FontWeight="Normal" Margin="5 0 0 0" VerticalAlignment="Center" FontSize="14">Uniformity</TextBlock>
+                                                </Border>
+                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                    <TextBlock FontWeight="Normal" VerticalAlignment="Center" Margin="0" FontSize="14">Severity</TextBlock>
+                                                </Border>
+                                                <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}" >
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Zone 1</TextBlock>
+                                                </Border>
+                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush700}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                    <DockPanel HorizontalAlignment="Left" VerticalAlignment="Center">
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Left" VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.SeverityZone1Min,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0 0 0 0"  Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" FontSize="14" MinWidth="0"></mahapps:NumericUpDown>
+                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" DockPanel.Dock="Left">-</TextBlock>
+                                                        <mahapps:NumericUpDown VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.SeverityZone1Max,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  Margin="0 0 0 0"  FontSize="14" StringFormat="{}{0:F1}" MinWidth="0"></mahapps:NumericUpDown>
+                                                    </DockPanel>
+                                                </Border>
+                                                <Border BorderThickness="0 0 1 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Zone 2</TextBlock>
+                                                </Border>
+                                                <Border BorderThickness="0 0 0 1" Background="{StaticResource TransparentBackgroundBrush}" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                                                    <DockPanel HorizontalAlignment="Left" VerticalAlignment="Center">
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Left" VerticalAlignment="Center" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Right" Value="{Binding  SelectedTab.TestResult.SeverityZone2Min,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0 0 0 0" Padding="0" StringFormat="{}{0:F1}" HorizontalAlignment="Right" FontSize="14" MinWidth="0"></mahapps:NumericUpDown>
+                                                        <TextBlock DockPanel.Dock="Left" Margin="5 0 0 0" VerticalAlignment="Center">-</TextBlock>
+                                                        <mahapps:NumericUpDown DockPanel.Dock="Left" HasDecimals="True"  Minimum="0" Maximum="10" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0"   HideUpDownButtons="True" InterceptMouseWheel="True" HorizontalContentAlignment="Left" Value="{Binding  SelectedTab.TestResult.SeverityZone2Max,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  Margin="0 0 0 0" Width="Auto"  StringFormat="{}{0:F1}" FontSize="14" MinWidth="0"></mahapps:NumericUpDown>
+                                                    </DockPanel>
+                                                </Border>
+                                            </UniformGrid>
+                                        </Border>
+                                    </StackPanel>
+                                    <DockPanel   Margin="0 0 0 0" DockPanel.Dock="Top">
+                                        <DockPanel DockPanel.Dock="Left" HorizontalAlignment="Stretch">
+                                            <TextBlock FontSize="18" HorizontalAlignment="Left"  VerticalAlignment="Center">Conclusion:</TextBlock>
+                                            <TextBox  Margin="20 0 20 0" HorizontalAlignment="Stretch" Height="80" Text="{Binding SelectedTab.TestResult.Conclusions}" Style="{StaticResource Rounded_Corners_TextBox_Multiline}" Width="315"></TextBox>
+                                        </DockPanel>
+                                        <DockPanel DockPanel.Dock="Right" HorizontalAlignment="Stretch">
+                                            <TextBlock  FontSize="18" HorizontalAlignment="Left" VerticalAlignment="Center">Comments:</TextBlock>
+                                            <TextBox  Margin="20 0 20 0"  Style="{StaticResource Rounded_Corners_TextBox_Multiline}"   HorizontalAlignment="Stretch" Height="80" Text="{Binding SelectedTab.TestResult.Comment}" VerticalAlignment="Center" Width="315"></TextBox>
+                                        </DockPanel>
+
+                                    </DockPanel>
+                                </DockPanel>
                             </Grid>
                         </ScrollViewer>
                     </Border>
-
-                    <Grid Grid.Row="1" Grid.Column="1" Margin="0 0 20 20">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="120"/>
-                            <ColumnDefinition Width="1*"/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="1*"/>
-                            <RowDefinition Height="1*" />
-                        </Grid.RowDefinitions>
-
-                        <TextBlock FontSize="21" HorizontalAlignment="Left"  VerticalAlignment="Center">Conclusion:</TextBlock>
-                        <TextBox Grid.Column="1" Margin="20 0 20 0" HorizontalAlignment="Stretch" Height="46" Text="{Binding SelectedTab.TestResult.Conclusions}" Style="{StaticResource Rounded_Corners_TextBox_Multiline}"></TextBox>
-
-                        <TextBlock Grid.Row="1" FontSize="21" HorizontalAlignment="Left" VerticalAlignment="Center">Comments:</TextBlock>
-                        <TextBox Grid.Column="1" Grid.Row="1" Margin="20 0 20 0"  Style="{StaticResource Rounded_Corners_TextBox_Multiline}"   HorizontalAlignment="Stretch" Height="46" Text="{Binding SelectedTab.TestResult.Comment}" VerticalAlignment="Center"></TextBox>
-                            
-                    </Grid>
-                    <DockPanel  Grid.Row="1" Grid.Column="0" Margin="20 0 20 20" x:Name="ImportExcelFile">
-                        <DockPanel DockPanel.Dock="Top" Margin="0 0 20 0">
-                            <Button  Margin="10 0 0 0"  Padding="2" Height="24" Cursor="Hand" Width="100" Command="{Binding SelectedTab.UploadCommand}" ToolTip="Upload selected files">Upload</Button>
-                            <Button DockPanel.Dock="Right" Margin="0 0 10 0" HorizontalAlignment="Right" Padding="2" Height="24" Cursor="Hand" Width="100" Command="{Binding SelectedTab.DownLoadAllCommand}" ToolTip="Upload selected files">Download All</Button>
-                        </DockPanel>
+                    
                         
-                        <Grid  DockPanel.Dock="Bottom" Margin="0 0 20 0">
-                            <DataGrid  Margin="10" RowHeight="30" Padding="0"  SelectionUnit="FullRow" BorderBrush="{StaticResource DarkGrayBrush }" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}"  AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding SelectedTab.TestResultsFiles}" IsReadOnly="True" 
-                                  ScrollViewer.CanContentScroll="True" ScrollViewer.VerticalScrollBarVisibility="Auto" MinHeight="100">
-                                <DataGrid.ColumnHeaderStyle >
-                                    <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
-                                        <Setter Property="FontSize" Value="16"/>
-                                        <Setter Property="HorizontalAlignment" Value="Left"/>
-                                        <Setter Property="Margin" Value="2 0 0 0"/>
-                                        <Setter Property="Padding" Value="0 5"/>
-                                        <Setter Property="FrameworkElement.HorizontalAlignment" Value="Stretch"/>
-                                        <Setter Property="HorizontalContentAlignment" Value="Left"/>
-                                    </Style>
-                                </DataGrid.ColumnHeaderStyle>
-                                <DataGrid.CellStyle>
-                                    <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
-                                        <Setter Property="BorderThickness" Value="0"/>
-                                        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-                                        <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
-                                        <Setter Property="Padding" Value="0"></Setter>
-                                        <Setter Property="Margin" Value="0 0 0 0"></Setter>
-                                    </Style>
-                                </DataGrid.CellStyle>
-                                <DataGrid.Columns>
-                                    <DataGridTextColumn Header="File Name" Binding="{Binding FileName}" Width="1*" FontSize="16"/>
-                                    <DataGridTextColumn Header="Progress"  Width="1*" />
-                                    <DataGridTemplateColumn Header="DownLoad" Width="140">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate>
-                                                <Button Style="{StaticResource emptyButton}" Cursor="Hand"  Command="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid},AncestorLevel=2},Path=DataContext.SelectedTab.DownLoadFileCommand}" CommandParameter="{Binding}">
-                                                    <StackPanel Orientation="Horizontal">
-                                                        <TextBlock FontSize="16" Text="Download" VerticalAlignment="Center"></TextBlock>
-                                                        <materialDesign:PackIcon VerticalAlignment="Center" Margin="5 0 0 0" Kind="Download" Width="18" />
-                                                    </StackPanel>
-                                                </Button>
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
-                                    <DataGridTemplateColumn Header="Delete" Width="140">
-                                        <DataGridTemplateColumn.CellTemplate>
-                                            <DataTemplate>
-                                                <Button Style="{StaticResource emptyButton}" Cursor="Hand"  Command="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Grid},AncestorLevel=2},Path=DataContext.SelectedTab.DeleteCommand}" CommandParameter="{Binding}">
-                                                <StackPanel Orientation="Horizontal">
-                                                    <TextBlock FontSize="16" Text="Delete" VerticalAlignment="Center"></TextBlock>
-                                                    <materialDesign:PackIcon VerticalAlignment="Center" Margin="5 0 0 0" Kind="Delete" Width="18"  />
-                                                </StackPanel>
-                                            </Button>
-                                            </DataTemplate>
-                                        </DataGridTemplateColumn.CellTemplate>
-                                    </DataGridTemplateColumn>
-                                </DataGrid.Columns>
-                            </DataGrid>
-                        </Grid>
-                    </DockPanel>
+                    
+                       
+                  
                 </Grid>
             </Grid>
         </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs
index a75dc5d09..20be37970 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/Views/TestResultsView.xaml.cs
@@ -52,5 +52,18 @@ namespace Tango.MachineStudio.ThreadExtensions.Views
                 }
             }
         }
+        private void Popup_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            e.Handled = true;
+        }
+        private void ColorCanvas_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color?> e)
+        {
+            if (e.NewValue.HasValue)
+            {
+                //_vm.OnSelectedBrushColorChanged((Color)e.NewValue);
+            }
+        }
+
     }
 }
+
-- 
cgit v1.3.1