PPC MidTank Levels & Emulator.

4 files changed, 15 insertions, 15 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/LiquidTypeToBrushConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/LiquidTypeToBrushConverter.cs
index c33efdca6..3b10b7bdf 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/LiquidTypeToBrushConverter.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/LiquidTypeToBrushConverter.cs
@@ -44,20 +44,20 @@ namespace Tango.PPC.Maintenance.Converters
                             return cleanerBrush;
                         }
                     case BL.Enumerations.LiquidTypes.Yellow:
-                        {
-                            return new SolidColorBrush(Color.FromRgb(232, 225, 12));
-                        }
+                        return Application.Current.Resources["TangoYellowInkBrush"] as Brush;
                     case BL.Enumerations.LiquidTypes.Cyan:
-                        {
-                            return new SolidColorBrush(Color.FromRgb(22, 98, 235));
-                        }
+                        return Application.Current.Resources["TangoCyanInkBrush"] as Brush;
                     case BL.Enumerations.LiquidTypes.Magenta:
-                        {
-                            return new SolidColorBrush(Color.FromRgb(237, 0, 140));
-                        }
+                        return Application.Current.Resources["TangoMagentaInkBrush"] as Brush;
+                    case BL.Enumerations.LiquidTypes.LightCyan:
+                        return Application.Current.Resources["TangoLightCyanInkBrush"] as Brush;
+                    case BL.Enumerations.LiquidTypes.LightMagenta:
+                        return Application.Current.Resources["TangoLightMagentaInkBrush"] as Brush;
+                    case BL.Enumerations.LiquidTypes.LightYellow:
+                        return Application.Current.Resources["TangoLightYellowInkBrush"] as Brush;
                 }
 
-                        
+
                 return new SolidColorBrush(type.LiquidTypeColor);
             }
             return null;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
index 887a2e86f..9d88f59ca 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml
@@ -34,7 +34,7 @@
 
         <DataTemplate x:Key="LiquidBox">
             <DockPanel>
-                <TextBlock DockPanel.Dock="Top" Text="{Binding IDSPack.LiquidType,Converter={StaticResource LiquidTypeToShortNameConverter}}" HorizontalAlignment="Center"></TextBlock>
+                <TextBlock DockPanel.Dock="Top" Text="{Binding IDSPack.LiquidType.ShortName}" HorizontalAlignment="Center"></TextBlock>
                 <Grid MaxWidth="20" Margin="1 0">
                     <touch:TouchIcon Icon="MapMarkerSolid" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 0 0 10" Foreground ="{Binding Path=IDSPack.LiquidType, Converter={StaticResource LiquidTypeToBrushConverter}}">
                         <touch:TouchIcon.Style>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml
index d964653a9..816d72de3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml
@@ -13,9 +13,9 @@
     <SolidColorBrush x:Key="TangoTransparentInkBrush" Color="#A0A0A0" />
     <SolidColorBrush x:Key="TangoLubricantBrush" Color="#B6AD7C" />
     <SolidColorBrush x:Key="TangoCleanerBrush" Color="#8BEC83" />
-    <SolidColorBrush x:Key="TangoLightCyanInkBrush" Color="#6FA2FF" />
-    <SolidColorBrush x:Key="TangoLightMagentaInkBrush" Color="#F169BA" />
-    <SolidColorBrush x:Key="TangoLightYellowInkBrush" Color="#E4E185" />
+    <SolidColorBrush x:Key="TangoLightCyanInkBrush" Color="#ccecff" />
+    <SolidColorBrush x:Key="TangoLightMagentaInkBrush" Color="#fdcff5" />
+    <SolidColorBrush x:Key="TangoLightYellowInkBrush" Color="#fcfcd0" />
     
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
index 6360b7bbc..5e56191da 100644
--- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs
@@ -158,7 +158,7 @@ namespace Tango.Emulations.Emulators
             MachineStatus = new MachineStatus();
             MachineStatus.State = MachineState.Ready;
 
-            for (int i = 0; i < 8; i++)
+            for (int i = 0; i < 9; i++)
             {
                 MachineStatus.IDSPacksLevels.Add(new IDSPackLevel()
                 {