From 3b3967d9d1106c1df0d975eb1c2e47170746528c Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Mon, 2 Sep 2019 14:46:14 +0300
Subject: Implemented hardware versions comparison tool.

---
 .../ViewModels/ComparisonWizardViewVM.cs           | 401 +++++++++++++++++++++
 1 file changed, 401 insertions(+)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs
new file mode 100644
index 000000000..801aa0a72
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs
@@ -0,0 +1,401 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL;
+using Tango.BL.Builders;
+using Tango.BL.Entities;
+using Tango.BL.Enumerations;
+using Tango.Core.Commands;
+using Tango.CSV;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.HardwareDesigner.Comparison;
+using Tango.MachineStudio.HardwareDesigner.Report;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.HardwareDesigner.ViewModels
+{
+    public class ComparisonWizardViewVM : DialogViewVM
+    {
+        private INotificationProvider _notification;
+        #region Properties
+
+        private ObservableCollection<HardwareVersion> _hardwareVersions;
+        public ObservableCollection<HardwareVersion> HardwareVersions
+        {
+            get { return _hardwareVersions; }
+            set { _hardwareVersions = value; RaisePropertyChangedAuto(); }
+        }
+
+        private HardwareVersion _selectedVersion1;
+        public HardwareVersion SelectedVersion1
+        {
+            get { return _selectedVersion1; }
+            set
+            {
+                if (value != null && (_selectedVersion1 == null || _selectedVersion1.Guid != value.Guid))
+                {
+                    _selectedVersion1 = value;
+                    RaisePropertyChangedAuto();
+                    OnSelectedVersionChanged();
+                }
+            }
+        }
+
+        private HardwareVersion _selectedVersion2;
+        public HardwareVersion SelectedVersion2
+        {
+            get { return _selectedVersion2; }
+            set
+            {
+                if (value != null && (_selectedVersion2 == null || _selectedVersion2.Guid != value.Guid))
+                {
+                    _selectedVersion2 = value;
+                    RaisePropertyChangedAuto();
+                    OnSelectedVersionChanged();
+                }
+
+            }
+        }
+
+        private bool _isShowDifference;
+        public bool IsShowDifference
+        {
+            get { return _isShowDifference; }
+            set
+            {
+                _isShowDifference = value;
+                RaisePropertyChangedAuto();
+            }
+        }
+
+        private HardwareCompareResult _result;
+        public HardwareCompareResult Result
+        {
+            get
+            {
+                return _result;
+            }
+            set
+            {
+                _result = value;
+                RaisePropertyChangedAuto();
+                InvalidateRelayCommands();
+            }
+        }
+
+        private bool _isRunning;
+        public bool IsRunning
+        {
+            get { return _isRunning; }
+            set { _isRunning = value; RaisePropertyChangedAuto(); }
+        }
+
+        #endregion properties
+
+        #region Command
+
+        public RelayCommand GenerateReportCommand { get; set; }
+
+        #endregion
+
+
+        #region Constructors
+
+        public ComparisonWizardViewVM(IEnumerable<HardwareVersion> availableVersions, HardwareVersion selectedVersion, INotificationProvider notification)
+        {
+            HardwareVersions = new ObservableCollection<HardwareVersion>(availableVersions);
+            _selectedVersion1 = selectedVersion;
+
+            _isShowDifference = false;
+            IsRunning = false;
+            IsShowDifference = true;
+            _notification = notification;
+
+            GenerateReportCommand = new RelayCommand(GenerateReport, () => Result != null);
+        }
+
+        #endregion
+
+        #region Report
+
+        private void GenerateReport()
+        {
+            SaveFileDialog dlg = new SaveFileDialog();
+            dlg.Title = "Save Report";
+            dlg.Filter = "CSV Files|*.csv";
+            dlg.FileName = $"hw_compare_report__{SelectedVersion1.Name}__vs__{SelectedVersion2.Name}";
+            dlg.DefaultExt = ".csv";
+            if (dlg.ShowDialog().Value)
+            {
+                try
+                {
+                    CsvFile<ReportModel> csvFile = new CsvFile<ReportModel>(new CsvDestination(dlg.FileName), new CsvDefinition()
+                    {
+                        Columns = new List<String>()
+                         {
+                             "Collection",
+                             "Component",
+                             "Property",
+                             SelectedVersion1.Name,
+                             SelectedVersion2.Name,
+                         },
+                    });
+
+                    foreach (var collection in Result.Collections.Where(x => x.HasDifferences || !IsShowDifference))
+                    {
+                        ReportModel model_collection = new ReportModel();
+                        model_collection.Collection = collection.CollectionName;
+                        csvFile.Append(model_collection);
+                        foreach (var component in collection.Components.Where(x => x.HasDifferences || !IsShowDifference))
+                        {
+                            ReportModel model_component = new ReportModel();
+
+                            model_component.Component = component.ComponentName;
+                            csvFile.Append(model_component);
+                            foreach (var prop in component.Properties.Where(x => x.IsDifferent || !IsShowDifference))
+                            {
+                                ReportModel model = new ReportModel();
+                                model.Property = prop.PropertyName;
+                                model.HW_1 = prop.Value1;
+                                model.HW_2 = prop.Value2;
+                                csvFile.Append(model);
+                            }
+                        }
+                    }
+
+                    csvFile.Dispose();
+                    _notification.ShowInfo("Report generated successfully.");
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error generating HW version comparison report.");
+                    _notification.ShowError($"Error generating HW version comparison report.\n{ex.Message}");
+                }
+            }
+        }
+
+        #endregion
+
+        private async void OnSelectedVersionChanged()
+        {
+            if (SelectedVersion1 != null && SelectedVersion2 != null)
+            {
+                IsRunning = true;
+                using (ObservablesContext db = ObservablesContext.CreateDefault())
+                {
+                    var h1 = await new HardwareVersionBuilder(db).Set(SelectedVersion1.Guid).WithHardwareComponents().BuildAsync();
+                    var h2 = await new HardwareVersionBuilder(db).Set(SelectedVersion2.Guid).WithHardwareComponents().BuildAsync();
+
+                    await Task.Factory.StartNew(() =>
+                    {
+                        Result = CompareHardwareVersions(h1, h2);
+                        IsRunning = false;
+                    });
+                }
+            }
+        }
+
+        #region Compare Versions
+
+        private HardwareCompareResult CompareHardwareVersions(HardwareVersion h1, HardwareVersion h2)
+        {
+            _result = new HardwareCompareResult();
+            _result.Collections.Add(CompareMotorsCollection(h1, h2));
+            _result.Collections.Add(CompareDancerCollection(h1, h2));
+            _result.Collections.Add(ComparePidControlsCollection(h1, h2));
+            _result.Collections.Add(CompareWindersCollection(h1, h2));
+            _result.Collections.Add(CompareSpeedSensorsCollection(h1, h2));
+            _result.Collections.Add(CompareBlowersCollection(h1, h2));
+            _result.Collections.Add(CompareBreakSensorCollection(h1, h2));
+            
+
+            return _result;
+        }
+        private HardwareComponentCollectionCompareResult CompareMotorsCollection(HardwareVersion h1, HardwareVersion h2)
+        {
+            HardwareComponentCollectionCompareResult collection = new HardwareComponentCollectionCompareResult()
+            {
+                CollectionName = "MOTORS"
+            };
+            foreach (var motorTypeCode in Enum.GetValues(typeof(HardwareMotorTypes)).Cast<HardwareMotorTypes>())
+            {
+                var motor1 = h1.HardwareMotors.SingleOrDefault(x => x.HardwareMotorType.Code == motorTypeCode.ToInt32());
+                var motor2 = h2.HardwareMotors.SingleOrDefault(x => x.HardwareMotorType.Code == motorTypeCode.ToInt32());
+
+                var componentResult = CompareComponents(
+                    motorTypeCode.ToDescription(),
+                    GetComponentProperties(typeof(HardwareMotorBase)),
+                    motor1,
+                    motor2);
+
+                collection.Components.Add(componentResult);
+            }
+            return collection;
+        }
+        private HardwareComponentCollectionCompareResult CompareDancerCollection(HardwareVersion h1, HardwareVersion h2)
+        {
+            HardwareComponentCollectionCompareResult collection = new HardwareComponentCollectionCompareResult()
+            {
+                CollectionName = "DANCERS"
+            };
+            foreach (var dancerTypeCode in Enum.GetValues(typeof(HardwareDancerTypes)).Cast<HardwareDancerTypes>())
+            {
+                var motor1 = h1.HardwareDancers.SingleOrDefault(x => x.HardwareDancerType.Code == dancerTypeCode.ToInt32());
+                var motor2 = h2.HardwareDancers.SingleOrDefault(x => x.HardwareDancerType.Code == dancerTypeCode.ToInt32());
+
+                var componentResult = CompareComponents(
+                    dancerTypeCode.ToDescription(),
+                    GetComponentProperties(typeof(HardwareDancerBase)),
+                    motor1,
+                    motor2);
+
+                collection.Components.Add(componentResult);
+            }
+            return collection;
+        }
+        private HardwareComponentCollectionCompareResult ComparePidControlsCollection(HardwareVersion h1, HardwareVersion h2)
+        {
+            HardwareComponentCollectionCompareResult collection = new HardwareComponentCollectionCompareResult()
+            {
+                CollectionName = "PID CONTROLS"
+            };
+            foreach (var pidControlsTypeCode in Enum.GetValues(typeof(HardwarePidControlTypes)).Cast<HardwarePidControlTypes>())
+            {
+                var motor1 = h1.HardwarePidControls.SingleOrDefault(x => x.HardwarePidControlType.Code == pidControlsTypeCode.ToInt32());
+                var motor2 = h2.HardwarePidControls.SingleOrDefault(x => x.HardwarePidControlType.Code == pidControlsTypeCode.ToInt32());
+
+                var componentResult = CompareComponents(
+                    pidControlsTypeCode.ToDescription(),
+                    GetComponentProperties(typeof(HardwarePidControlBase)),
+                    motor1,
+                    motor2);
+
+                collection.Components.Add(componentResult);
+            }
+            return collection;
+        }
+        private HardwareComponentCollectionCompareResult CompareWindersCollection(HardwareVersion h1, HardwareVersion h2)
+        {
+            HardwareComponentCollectionCompareResult collection = new HardwareComponentCollectionCompareResult()
+            {
+                CollectionName = "WINDERS"
+            };
+            foreach (var WinderTypeCode in Enum.GetValues(typeof(HardwareWinderTypes)).Cast<HardwareWinderTypes>())
+            {
+                var motor1 = h1.HardwareWinders.SingleOrDefault(x => x.HardwareWinderType.Code == WinderTypeCode.ToInt32());
+                var motor2 = h2.HardwareWinders.SingleOrDefault(x => x.HardwareWinderType.Code == WinderTypeCode.ToInt32());
+
+                var componentResult = CompareComponents(
+                    WinderTypeCode.ToDescription(),
+                    GetComponentProperties(typeof(HardwareWinderBase)),
+                    motor1,
+                    motor2);
+
+                collection.Components.Add(componentResult);
+            }
+            return collection;
+        }
+        private HardwareComponentCollectionCompareResult CompareSpeedSensorsCollection(HardwareVersion h1, HardwareVersion h2)
+        {
+            HardwareComponentCollectionCompareResult collection = new HardwareComponentCollectionCompareResult()
+            {
+                CollectionName = "SPEED SENSORS"
+            };
+            foreach (var speedSewnsorsTypeCode in Enum.GetValues(typeof(HardwareSpeedSensorTypes)).Cast<HardwareSpeedSensorTypes>())
+            {
+                var motor1 = h1.HardwareSpeedSensors.SingleOrDefault(x => x.HardwareSpeedSensorType.Code == speedSewnsorsTypeCode.ToInt32());
+                var motor2 = h2.HardwareSpeedSensors.SingleOrDefault(x => x.HardwareSpeedSensorType.Code == speedSewnsorsTypeCode.ToInt32());
+
+                var componentResult = CompareComponents(
+                    speedSewnsorsTypeCode.ToDescription(),
+                    GetComponentProperties(typeof(HardwareSpeedSensorBase)),
+                    motor1,
+                    motor2);
+
+                collection.Components.Add(componentResult);
+            }
+            return collection;
+        }
+        private HardwareComponentCollectionCompareResult CompareBlowersCollection(HardwareVersion h1, HardwareVersion h2)
+        {
+            HardwareComponentCollectionCompareResult collection = new HardwareComponentCollectionCompareResult()
+            {
+                CollectionName = "BLOWERS"
+            };
+            foreach (var blowersTypeCode in Enum.GetValues(typeof(HardwareBlowerTypes)).Cast<HardwareBlowerTypes>())
+            {
+                var motor1 = h1.HardwareBlowers.SingleOrDefault(x => x.HardwareBlowerType.Code == blowersTypeCode.ToInt32());
+                var motor2 = h2.HardwareBlowers.SingleOrDefault(x => x.HardwareBlowerType.Code == blowersTypeCode.ToInt32());
+
+                var componentResult = CompareComponents(
+                    blowersTypeCode.ToDescription(),
+                    GetComponentProperties(typeof(HardwareBlowerBase)),
+                    motor1,
+                    motor2);
+
+                collection.Components.Add(componentResult);
+            }
+            return collection;
+        }
+        private HardwareComponentCollectionCompareResult CompareBreakSensorCollection(HardwareVersion h1, HardwareVersion h2)
+        {
+            HardwareComponentCollectionCompareResult collection = new HardwareComponentCollectionCompareResult()
+            {
+                CollectionName = "BREAK SENSOR"
+            };
+            foreach (var breakSewnsorsTypeCode in Enum.GetValues(typeof(HardwareBreakSensorTypes)).Cast<HardwareBreakSensorTypes>())
+            {
+                var motor1 = h1.HardwareBreakSensors.SingleOrDefault(x => x.HardwareBreakSensorType.Code == breakSewnsorsTypeCode.ToInt32());
+                var motor2 = h2.HardwareBreakSensors.SingleOrDefault(x => x.HardwareBreakSensorType.Code == breakSewnsorsTypeCode.ToInt32());
+
+                var componentResult = CompareComponents(
+                    breakSewnsorsTypeCode.ToDescription(),
+                    GetComponentProperties(typeof(HardwareBreakSensorBase)),
+                    motor1,
+                    motor2);
+
+                collection.Components.Add(componentResult);
+            }
+            return collection;
+        }
+        
+        private HardwareComponentCompareResult CompareComponents(String name, List<PropertyInfo> properties, Object component1, Object component2)
+        {
+            HardwareComponentCompareResult result = new HardwareComponentCompareResult();
+            result.ComponentName = name;
+            result.HasComponent1 = component1 != null;
+            result.HasComponent2 = component2 != null;
+
+            foreach (var prop in properties)
+            {
+                var hProp = new HardwareComponentPropertyResult();
+                hProp.PropertyName = prop.Name;
+                hProp.Value1 = component1 != null ? (prop.GetValue(component1) == null ? "" : prop.GetValue(component1).ToString()) : null;
+                hProp.Value2 = component2 != null ? (prop.GetValue(component2) == null ? "" : prop.GetValue(component2).ToString()) : null;
+
+                result.Properties.Add(hProp);
+            }
+
+            return result;
+        }
+        private List<PropertyInfo> GetComponentProperties(Type componentType)
+        {
+            List<String> exclude = new List<string>()
+            {
+                 "Guid",
+                 "ID",
+                 "LastUpdated",
+                 "Parameters",
+            };
+
+            return componentType.GetProperties(BindingFlags.Instance | BindingFlags.DeclaredOnly | BindingFlags.Public).Where(x => !x.PropertyType.IsClass && !exclude.Contains(x.Name)).ToList();
+        }
+
+        #endregion
+    }
+}
-- 
cgit v1.3.1


From 50b4615b65c7c4566637993868d24c9de939c8bb Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Tue, 3 Sep 2019 09:51:32 +0300
Subject: Hardware version comparison, change colors according to themes

---
 .../ViewModels/ComparisonWizardViewVM.cs           |  2 ++
 .../Views/ComparisonWizardView.xaml                | 28 ++++++++++------------
 .../Notifications/DefaultNotificationProvider.cs   | 12 +++++-----
 .../Notifications/MessageBoxWindow.xaml            |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs
index 801aa0a72..628613fea 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/ViewModels/ComparisonWizardViewVM.cs
@@ -125,6 +125,8 @@ namespace Tango.MachineStudio.HardwareDesigner.ViewModels
 
         private void GenerateReport()
         {
+            _notification.ShowError($"Error generating HW version comparison report.\n");
+
             SaveFileDialog dlg = new SaveFileDialog();
             dlg.Title = "Save Report";
             dlg.Filter = "CSV Files|*.csv";
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/ComparisonWizardView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/ComparisonWizardView.xaml
index af18d0003..d8a125e02 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/ComparisonWizardView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Views/ComparisonWizardView.xaml
@@ -8,21 +8,21 @@
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.HardwareDesigner.ViewModels"
              mc:Ignorable="d" 
-             d:DesignHeight="800" d:DesignWidth="800" Height="700" Width="1100">
+             d:DesignHeight="800" d:DesignWidth="800" Height="700" Width="1100" Foreground="{StaticResource Dialog.Foreground}" Background="{StaticResource Dialog.Background}">
     <UserControl.Resources>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <converters:BooleanToVisibilityInverseConverter x:Key="BooleanToVisibilityInverseConverter" />
         <Style TargetType="TextBlock" x:Key="DifferenceTextBoxStyle">
             <Style.Triggers>
                 <DataTrigger Binding="{Binding IsDifferent}" Value="True" >
-                    <Setter Property="Foreground" Value="red"/>
+                    <Setter Property="Foreground" Value="{StaticResource RedBrush100}"/>
                 </DataTrigger>
             </Style.Triggers>
         </Style>
         <Style TargetType="TextBlock" x:Key="CollectionHasDifferenceTextBox">
             <Style.Triggers>
                 <DataTrigger Binding="{Binding HasDifferences}" Value="True" >
-                    <Setter Property="Foreground" Value="red"/>
+                    <Setter Property="Foreground" Value="{StaticResource RedBrush100}"/>
                 </DataTrigger>
             </Style.Triggers>
         </Style>
@@ -40,25 +40,23 @@
                 <RowDefinition Height="Auto"></RowDefinition>
             </Grid.RowDefinitions>
             <UniformGrid Columns="3" Grid.Row="0" >
-                <!--<materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" Foreground="Silver" VerticalAlignment="Center" Margin="5,5,0,0"/>-->
                 <ComboBox Margin="10 0 0 0" HorizontalAlignment="Left" IsEnabled="{Binding IsFree}" ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion1}" Width="300" FontSize="16" FontWeight="Bold" materialDesign:HintAssist.Hint="Hardware Version 1">
                     <ComboBox.ItemTemplate>
                         <DataTemplate>
-                            <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14">v</Run><Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
+                            <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="{StaticResource Dialog.Foreground}" FontSize="14">v</Run><Run Foreground="{StaticResource Dialog.Foreground}" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
 
-                <TextBlock Text="Comparison Wizard" Foreground="Silver" FontStyle="Italic" FontWeight="Bold" FontSize="28" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
+                <TextBlock Text="Comparison Wizard" Foreground="{StaticResource LightGrayBrush}" FontStyle="Italic" FontWeight="Bold" FontSize="28" HorizontalAlignment="Center" VerticalAlignment="Center" ></TextBlock>
 
                 <ComboBox IsEnabled="{Binding IsFree}" ItemsSource="{Binding HardwareVersions}" SelectedItem="{Binding SelectedVersion2}" Width="300" FontSize="16" FontWeight="Bold" materialDesign:HintAssist.Hint="Hardware Version 2">
                     <ComboBox.ItemTemplate>
                         <DataTemplate>
-                            <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14">v</Run><Run Foreground="{StaticResource MainWindow.Foreground}" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
+                            <TextBlock><Run Text="{Binding Name}"></Run> <Run></Run> <Run Foreground="{StaticResource Dialog.Foreground}" FontSize="14">v</Run><Run Foreground="{StaticResource Dialog.Foreground}" FontSize="14" Text="{Binding Version}"></Run></TextBlock>
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
-                <!--<Button    Command="{Binding CompareCommand}" FontSize="16" Width="100" HorizontalAlignment="Right">Comp</Button>-->
             </UniformGrid>
             <StackPanel Orientation="Horizontal" Grid.Row="1" VerticalAlignment="Center" Margin="10 0 0 0" HorizontalAlignment="Left">
                 <CheckBox Name="cbShowOnlyDifference" IsChecked="{Binding IsShowDifference}" VerticalAlignment="Center"></CheckBox>
@@ -79,7 +77,7 @@
                                                 <ColumnDefinition Width="500*"/>
                                             </Grid.ColumnDefinitions>
                                             <Border Name="LeftB" Grid.Column="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource WhiteBackgroundBrush}" Padding="20 10">
+                                                <materialDesign:Card Margin="5,10,5,0" Padding="20 10">
                                                     <StackPanel Orientation="Vertical">
                                                         <ItemsControl  Margin="10,0,0,0" Name="ComponentListLeft" ItemsSource="{Binding Components}"  HorizontalContentAlignment="Stretch">
                                                             <ItemsControl.ItemTemplate>
@@ -145,7 +143,7 @@
                                                                                         </Style.Triggers>
                                                                                     </Style>
                                                                                 </Border.Style>
-                                                                                <TextBlock Text="None" Foreground="Red" FontWeight="SemiBold" HorizontalAlignment="Center" FontSize="16" VerticalAlignment="Center"/>
+                                                                                <TextBlock Text="None" Foreground="{StaticResource RedBrush100}" FontWeight="SemiBold" HorizontalAlignment="Center" FontSize="16" VerticalAlignment="Center"/>
                                                                             </Border>
                                                                         </Grid>
                                                                     </StackPanel>
@@ -176,7 +174,7 @@
                                                 </materialDesign:Card>
                                             </Border>
                                             <Border Name="RightB" Grid.Column="1" Margin="10,0,0,0">
-                                                <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource WhiteBackgroundBrush}" Padding="20 10">
+                                                <materialDesign:Card Margin="5,10,5,0"  Padding="20 10">
                                                     <StackPanel Orientation="Vertical">
                                                         <ItemsControl  Margin="10,0,0,0" Name="ComponentListRight" ItemsSource="{Binding Components}"  HorizontalContentAlignment="Stretch">
                                                             <ItemsControl.ItemTemplate>
@@ -242,7 +240,7 @@
                                                                                         </Style.Triggers>
                                                                                     </Style>
                                                                                 </Border.Style>
-                                                                                <TextBlock Text="None" FontWeight="SemiBold" HorizontalAlignment="Center" FontSize="16" VerticalAlignment="Center" Foreground="Red"/>
+                                                                                <TextBlock Text="None" FontWeight="SemiBold" HorizontalAlignment="Center" FontSize="16" VerticalAlignment="Center" Foreground="{StaticResource RedBrush100}"/>
                                                                             </Border>
                                                                         </Grid>
                                                                     </StackPanel>
@@ -307,7 +305,7 @@
             </Grid>
             
         </Grid>
-        <Border CornerRadius="5" HorizontalAlignment="Center" VerticalAlignment="Center" Background="#F6F6F6" Width="700" Height="350">
+        <Border CornerRadius="5" HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource Transparent200}" Width="700" Height="350">
             <Border.Style>
                 <Style TargetType="Border">
                     <Setter Property="Visibility" Value="Hidden"></Setter>
@@ -322,10 +320,10 @@
             <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="16" Foreground="Gray">Select two hardware versions to display a comparison report</TextBlock>
         </Border>
         <Grid HorizontalAlignment="Stretch" Margin="10" VerticalAlignment="Stretch" Visibility="{Binding IsRunning,Converter={StaticResource BooleanToVisibilityConverter}}" 
-              Background="#93FFFFFF">
+              Background="{StaticResource TransparentBackgroundBrush500}">
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
                     <mahapps:ProgressRing Foreground="#007ACC" Width="80" Height="80"></mahapps:ProgressRing>
-                    <TextBlock Text="Loading..." FontStyle="Italic" Margin="10 0 0 0" FontSize="30" VerticalAlignment="Center" Foreground="Silver"></TextBlock>
+                <TextBlock Text="Loading..." FontStyle="Italic" Margin="10 0 0 0" FontSize="30" VerticalAlignment="Center" Foreground="{StaticResource HomePageForeground}"></TextBlock>
                 </StackPanel>
         </Grid>
     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
index 7c56115e3..52a861930 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs
@@ -430,7 +430,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <param name="message">The message.</param>
         public void ShowError(string message)
         {
-            ShowMessageBox(PackIconKind.AlertOctagon, Brushes.Red, message, false);
+            ShowMessageBox(PackIconKind.AlertOctagon, (SolidColorBrush)Application.Current.Resources["RedBrush100"], message, false);
         }
 
         /// <summary>
@@ -439,7 +439,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <param name="message">The message.</param>
         public void ShowInfo(string message)
         {
-            ShowMessageBox(PackIconKind.CommentAlertOutline, Brushes.Black, message, false);
+            ShowMessageBox(PackIconKind.CommentAlertOutline, (SolidColorBrush)Application.Current.Resources["Dialog.Foreground"], message, false);
         }
 
         /// <summary>
@@ -449,7 +449,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <returns></returns>
         public bool ShowQuestion(string message)
         {
-            return ShowMessageBox(PackIconKind.CommentQuestionOutline, Brushes.Black, message, true).Value;
+            return ShowMessageBox(PackIconKind.CommentQuestionOutline, (SolidColorBrush)Application.Current.Resources["Dialog.Foreground"], message, true).Value;
         }
 
         /// <summary>
@@ -458,7 +458,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <param name="message">The message.</param>
         public void ShowWarning(string message)
         {
-            ShowMessageBox(PackIconKind.AlertOutline, Brushes.DarkOrange, message, false);
+            ShowMessageBox(PackIconKind.AlertOutline, (SolidColorBrush)Application.Current.Resources["OrangeUploadBrush"], message, false);
         }
 
         /// <summary>
@@ -468,7 +468,7 @@ namespace Tango.MachineStudio.UI.Notifications
         /// <returns></returns>
         public bool ShowErrorQuestion(string message)
         {
-            return ShowMessageBox(PackIconKind.CommentAlertOutline, Brushes.DarkOrange, message, true).Value;
+            return ShowMessageBox(PackIconKind.CommentAlertOutline, (SolidColorBrush)Application.Current.Resources["OrangeUploadBrush"], message, true).Value;
         }
 
         /// <summary>
@@ -568,7 +568,7 @@ namespace Tango.MachineStudio.UI.Notifications
                 Owner = Application.Current.MainWindow,
                 Message = message,
                 IconKind = PackIconKind.Pencil,
-                IconColor = Brushes.DimGray,
+                IconColor = (SolidColorBrush)Application.Current.Resources["DimGrayBrush"],
                 Hint = hint,
                 Response = defaultResponse
             };
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml
index e037e3630..988e3c21f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/MessageBoxWindow.xaml
@@ -30,7 +30,7 @@
                 </StackPanel>
                 <Grid>
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Margin="0 30 0 0">
-                        <materialDesign:PackIcon Kind="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=IconKind}" VerticalAlignment="Top" Width="50" Height="50" Foreground="{StaticResource Dialog.Foreground}" />
+                        <materialDesign:PackIcon Kind="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=IconKind}" VerticalAlignment="Top" Width="50" Height="50" Foreground="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=IconColor}" />
                         <TextBlock Padding="0 10 0 0" TextWrapping="Wrap" Margin="10 0 0 0" VerticalAlignment="Top" FontSize="14" Text="{Binding RelativeSource={RelativeSource AncestorType=Window},Path=Message}" Width="400" Foreground="{StaticResource Dialog.Foreground}"></TextBlock>
                     </StackPanel>
                 </Grid>
-- 
cgit v1.3.1