From e2bf9f578c3ed53d869744f94b020048ca806c6e Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 8 Jan 2019 14:27:21 +0200
Subject: Refactored catalogs to per RML. Dropped MEDIA_COLOR. Added RML White
 Point LAB. Added additional dispenser parameters in MS module. Attempt to
 optimize PPC color catalog view performance. Removed "Color Catalog Code"
 from brush stop. Implemented PPC color catalog selection per RML.

---
 .../Views/DispenserView.xaml                       | 14 +++++++-
 .../Views/DispensersView.xaml                      |  4 +++
 .../Tango.MachineStudio.DB.csproj                  | 17 +--------
 .../Tango.MachineStudio.DB/ViewModelLocator.cs     |  9 -----
 .../ViewModels/MediaColorsViewVM.cs                | 17 ---------
 .../Views/DBViews/MediaColorView.xaml              | 38 --------------------
 .../Views/DBViews/MediaColorView.xaml.cs           | 28 ---------------
 .../Views/DBViews/MediaColorsView.xaml             | 42 ----------------------
 .../Views/DBViews/MediaColorsView.xaml.cs          | 32 -----------------
 .../ViewModels/MainViewVM.cs                       |  9 -----
 .../Tango.MachineStudio.RML/Views/RmlView.xaml     | 20 ++++-------
 11 files changed, 24 insertions(+), 206 deletions(-)
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml
 delete mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
index d4b3b0655..0b295b620 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
@@ -54,7 +54,19 @@
                         <ComboBox ItemsSource="{Binding DispenserTypes}" SelectedItem="{Binding ActiveDispenser.DispenserType}" DisplayMemberPath="Name"></ComboBox>
 
                         <TextBlock FontWeight="SemiBold">Nanoliter / Pulse:</TextBlock>
-                        <mahapps:NumericUpDown HasDecimals="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="5" Value="{Binding ActiveDispenser.NlPerPulse}"></mahapps:NumericUpDown>
+                        <mahapps:NumericUpDown HorizontalContentAlignment="Left" HasDecimals="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="5" Value="{Binding ActiveDispenser.NlPerPulse}"></mahapps:NumericUpDown>
+
+                        <TextBlock FontWeight="SemiBold">Part Number:</TextBlock>
+                        <TextBox Text="{Binding ActiveDispenser.PartNumber}"></TextBox>
+
+                        <TextBlock FontWeight="SemiBold">PCB Serial:</TextBlock>
+                        <TextBox Text="{Binding ActiveDispenser.PcbSerial}"></TextBox>
+
+                        <TextBlock FontWeight="SemiBold">PCB Version:</TextBlock>
+                        <TextBox Text="{Binding ActiveDispenser.PcbVersion}"></TextBox>
+
+                        <TextBlock FontWeight="SemiBold">Production Date:</TextBlock>
+                        <DatePicker SelectedDate="{Binding ActiveDispenser.ProductionDate}"></DatePicker>
 
                         <TextBlock FontWeight="SemiBold">Installed On Machine:</TextBlock>
                         <TextBox IsEnabled="False" Text="{Binding ActiveDispenser.Machine.SerialNumber,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}" IsReadOnly="True"></TextBox>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
index a7a57d801..a1d080380 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
@@ -66,6 +66,10 @@
                         <DataGridTextColumn Header="SERIAL NUMBER" Binding="{Binding SerialNumber}" Width="Auto" />
                         <DataGridTextColumn Header="TYPE" Binding="{Binding DispenserType.Name}" Width="Auto" />
                         <DataGridTextColumn Header="NANOLITER / PULSE" Binding="{Binding NlPerPulse}" Width="Auto" />
+                        <DataGridTextColumn Header="PART NUMBER" Binding="{Binding PartNumber}" Width="Auto" />
+                        <DataGridTextColumn Header="PCB SERIAL" Binding="{Binding PcbSerial}" Width="Auto" />
+                        <DataGridTextColumn Header="PCB VERSION" Binding="{Binding PcbVersion}" Width="Auto" />
+                        <DataGridTextColumn Header="PRODUCTION DATE" Binding="{Binding ProductionDate,StringFormat='d'}" Width="Auto" />
                         <DataGridTextColumn Header="INSTALLED" Binding="{Binding IsInstalled}" Width="Auto" />
                         <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
                     </DataGrid.Columns>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index da427f4d8..b0749e196 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -109,7 +109,6 @@
     <Compile Include="ViewModels\LiquidTypesViewVM.cs" />
     <Compile Include="ViewModels\MachinesViewVM.cs" />
     <Compile Include="ViewModels\MachineVersionsViewVM.cs" />
-    <Compile Include="ViewModels\MediaColorsViewVM.cs" />
     <Compile Include="ViewModels\MediaConditionsViewVM.cs" />
     <Compile Include="ViewModels\MediaMaterialsViewVM.cs" />
     <Compile Include="ViewModels\MediaPurposesViewVM.cs" />
@@ -230,18 +229,12 @@
     <Compile Include="Views\DBViews\MediaMaterialsView.xaml.cs">
       <DependentUpon>MediaMaterialsView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\MediaColorView.xaml.cs">
-      <DependentUpon>MediaColorView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\MediaPurposView.xaml.cs">
       <DependentUpon>MediaPurposView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\DBViews\MediaMaterialView.xaml.cs">
       <DependentUpon>MediaMaterialView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\DBViews\MediaColorsView.xaml.cs">
-      <DependentUpon>MediaColorsView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DBViews\IdsPacksView.xaml.cs">
       <DependentUpon>IdsPacksView.xaml</DependentUpon>
     </Compile>
@@ -501,10 +494,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\MediaColorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\MediaPurposView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -513,10 +502,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\DBViews\MediaColorsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DBViews\IdsPacksView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -734,7 +719,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index 736682e07..05c3ba0c7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -41,7 +41,6 @@ namespace Tango.MachineStudio.DB
             TangoIOC.Default.Register<ContactsViewVM>();
 
             TangoIOC.Default.Register<MediaMaterialsViewVM>();
-            TangoIOC.Default.Register<MediaColorsViewVM>();
             TangoIOC.Default.Register<MediaPurposesViewVM>();
             TangoIOC.Default.Register<MediaConditionsViewVM>();
             TangoIOC.Default.Register<LinearMassDensityUnitsViewVM>();
@@ -223,14 +222,6 @@ namespace Tango.MachineStudio.DB
             }
         }
 
-        public static MediaColorsViewVM MediaColorsViewVM
-        {
-            get
-            {
-                return TangoIOC.Default.GetInstance<MediaColorsViewVM>();
-            }
-        }
-
         public static MediaPurposesViewVM MediaPurposesViewVM
         {
             get
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
deleted file mode 100644
index fd815e5df..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/MediaColorsViewVM.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Tango.BL.Entities;
-using Tango.MachineStudio.Common.Notifications;
-
-namespace Tango.MachineStudio.DB.ViewModels
-{
-    public class MediaColorsViewVM : DbTableViewModel<MediaColor>
-    {
-        public MediaColorsViewVM(INotificationProvider notification) : base(notification)
-        {
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml
deleted file mode 100644
index 9fcfc5a89..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.MediaColorView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             mc:Ignorable="d" 
-             d:DesignHeight="400" d:DesignWidth="300">
-
-    <UserControl.Resources>
-        <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
-
-        <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
-            <Setter Property="mahapps:ControlsHelper.HeaderFontSize" Value="14" />
-            <Setter Property="Margin" Value="2" />
-        </Style>
-    </UserControl.Resources>
-
-    <Grid>
-        <controls:TableGrid>
-            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
-            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
-            <TextBlock Text="L:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="0" Maximum="100" Value="{Binding EditEntity.L,Mode=TwoWay}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
-            <TextBlock Text="A:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="-128" Maximum="128" Value="{Binding EditEntity.A,Mode=TwoWay}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
-            <TextBlock Text="B:" FontWeight="Bold"></TextBlock>
-            <mahapps:NumericUpDown Minimum="-128" Maximum="128" Value="{Binding EditEntity.B,Mode=TwoWay}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
-        </controls:TableGrid>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs
deleted file mode 100644
index de09b9aaf..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachineView.xaml
-    /// </summary>
-    public partial class MediaColorView : UserControl
-    {
-        public MediaColorView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml
deleted file mode 100644
index 57adda44d..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml
+++ /dev/null
@@ -1,42 +0,0 @@
-<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.MediaColorsView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:global="clr-namespace:Tango.MachineStudio.DB"
-             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
-             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.MediaColorsViewVM}">
-
-    <UserControl.Resources>
-        <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
-    </UserControl.Resources>
-
-    <Grid>
-        <controls:DbTableView>
-            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.MediaColorsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="L" Binding="{Binding L}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="A" Binding="{Binding A}"></DataGridTextColumn>
-                    <DataGridTextColumn Header="B" Binding="{Binding B}"></DataGridTextColumn>
-                    <DataGridTemplateColumn Header="Color">
-                        <DataGridTemplateColumn.CellTemplate>
-                            <DataTemplate>
-                                <Rectangle Width="50">
-                                    <Rectangle.Fill>
-                                        <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
-                                    </Rectangle.Fill>
-                                </Rectangle>
-                            </DataTemplate>
-                        </DataGridTemplateColumn.CellTemplate>
-                    </DataGridTemplateColumn>
-                </DataGrid.Columns>
-            </DataGrid>
-        </controls:DbTableView>
-    </Grid>
-</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs
deleted file mode 100644
index ceae18ec8..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Tango.MachineStudio.DB.CustomAttributes;
-using Tango.MachineStudio.DB.Managers;
-using Tango.SharedUI.Controls;
-
-namespace Tango.MachineStudio.DB.Views.DBViews
-{
-    /// <summary>
-    /// Interaction logic for MachinesView.xaml
-    /// </summary>
-    [DBView]
-    public partial class MediaColorsView : UserControl
-    {
-        public MediaColorsView() : base()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index f8966b729..57c1aa724 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -42,13 +42,6 @@ namespace Tango.MachineStudio.RML.ViewModels
             set { _materials = value; RaisePropertyChangedAuto(); }
         }
 
-        private ObservableCollection<MediaColor> _colors;
-        public ObservableCollection<MediaColor> Colors
-        {
-            get { return _colors; }
-            set { _colors = value; RaisePropertyChangedAuto(); }
-        }
-
         private ObservableCollection<MediaPurpos> _purposes;
         public ObservableCollection<MediaPurpos> Purposes
         {
@@ -265,7 +258,6 @@ namespace Tango.MachineStudio.RML.ViewModels
         private void LoadRmlProperties()
         {
             Materials = _active_context.MediaMaterials.ToObservableCollection();
-            Colors = _active_context.MediaColors.ToObservableCollection();
             Purposes = _active_context.MediaPurposes.ToObservableCollection();
             Conditions = _active_context.MediaConditions.ToObservableCollection();
             LinearMassDensityUnits = _active_context.LinearMassDensityUnits.ToObservableCollection();
@@ -303,7 +295,6 @@ namespace Tango.MachineStudio.RML.ViewModels
                     rml.Manufacturer = "Twine";
                     rml.Code = Rmls.Max(x => x.Code) + 1;
                     rml.MediaMaterial = Materials.FirstOrDefault();
-                    rml.MediaColor = Colors.FirstOrDefault();
                     rml.MediaPurpose = Purposes.FirstOrDefault();
                     rml.MediaCondition = Conditions.FirstOrDefault();
                     rml.LinearMassDensityUnit = LinearMassDensityUnits.FirstOrDefault();
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
index d72b6c7d3..8f2c5d187 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml
@@ -65,20 +65,12 @@
                                     <TextBlock Text="Material:" ></TextBlock>
                                     <ComboBox ItemsSource="{Binding Materials}" SelectedItem="{Binding ActiveRML.MediaMaterial,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
 
-                                    <TextBlock Text="Color:" ></TextBlock>
-                                    <ComboBox ItemsSource="{Binding Colors}" SelectedItem="{Binding ActiveRML.MediaColor,Mode=TwoWay}">
-                                        <ComboBox.ItemTemplate>
-                                            <DataTemplate>
-                                                <StackPanel Orientation="Horizontal">
-                                                    <Rectangle Width="16" Height="16" VerticalAlignment="Center">
-                                                        <Rectangle.Fill>
-                                                            <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
-                                                        </Rectangle.Fill>
-                                                    </Rectangle>
-                                                </StackPanel>
-                                            </DataTemplate>
-                                        </ComboBox.ItemTemplate>
-                                    </ComboBox>
+                                    <TextBlock Text="White Point:" ></TextBlock>
+                                    <UniformGrid Columns="3">
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointL}" HorizontalContentAlignment="Left" />
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointA}" HorizontalContentAlignment="Left" />
+                                        <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointB}" HorizontalContentAlignment="Left" />
+                                    </UniformGrid>
 
                                     <TextBlock Text="Purpose:" ></TextBlock>
                                     <ComboBox ItemsSource="{Binding Purposes}" SelectedItem="{Binding ActiveRML.MediaPurpose,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
-- 
cgit v1.3.1