GUI changes according to item.

Related Work Items: #3128

4 files changed, 53 insertions, 23 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 c7e828148..c33efdca6 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
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -19,24 +20,45 @@ namespace Tango.PPC.Maintenance.Converters
             if (value is LiquidType)
             {
                 LiquidType type = value as LiquidType;
-                if (type.Type == BL.Enumerations.LiquidTypes.Lubricant)
+                switch (type.Type)
                 {
-                    ImageBrush lubricantBrush = new ImageBrush() { Stretch = Stretch.None, TileMode = TileMode.Tile, ViewportUnits = BrushMappingMode.Absolute };
-                    lubricantBrush.ImageSource = ResourceHelper.GetImageFromResources(@"Images/lubricant2.png");
-                    lubricantBrush.Viewport = new System.Windows.Rect(lubricantBrush.ImageSource.Width/3, lubricantBrush.ImageSource.Height/3, lubricantBrush.ImageSource.Width, lubricantBrush.ImageSource.Height);
-                    return lubricantBrush;
-                }
-                if (type.Type == BL.Enumerations.LiquidTypes.Cleaner)
-                {
-                    ImageBrush cleanerBrush = new ImageBrush(){ Stretch = Stretch.None, TileMode = TileMode.Tile, ViewportUnits = BrushMappingMode.Absolute };
-                    cleanerBrush.ImageSource = ResourceHelper.GetImageFromResources(@"Images/cl-full.png");
-                    cleanerBrush.Viewport = new System.Windows.Rect(5, 5, cleanerBrush.ImageSource.Width, cleanerBrush.ImageSource.Height);
-                    return cleanerBrush;
-                }
-                else
-                {
-                    return new SolidColorBrush(type.LiquidTypeColor); ;
+                    case BL.Enumerations.LiquidTypes.Lubricant:
+                        {
+
+                            ImageBrush lubricantBrush = new ImageBrush() { Stretch = Stretch.None, TileMode = TileMode.Tile, ViewportUnits = BrushMappingMode.Absolute };
+
+                            BitmapSource bit_source = ResourceHelper.GetImageFromResources(@"Images/lubricant2.png");
+                            var targetBitmap = new WriteableBitmap(new TransformedBitmap(bit_source, new ScaleTransform(0.2, 0.2)));
+                            lubricantBrush.ImageSource = targetBitmap;
+                            lubricantBrush.Viewport = new System.Windows.Rect(2, 2, targetBitmap.Width, targetBitmap.Height);
+                            return lubricantBrush;
+                        }
+                    case BL.Enumerations.LiquidTypes.Cleaner:
+                        {
+                            ImageBrush cleanerBrush = new ImageBrush() { Stretch = Stretch.None, TileMode = TileMode.Tile, ViewportUnits = BrushMappingMode.Absolute };
+                            BitmapSource bit_source = ResourceHelper.GetImageFromResources(@"Images/cl-full.png");
+                            var targetBitmap = new WriteableBitmap(new TransformedBitmap(bit_source, new ScaleTransform(0.3, 0.3)));
+
+                            cleanerBrush.ImageSource = targetBitmap;
+                            cleanerBrush.Viewport = new System.Windows.Rect(0, 0, targetBitmap.Width, targetBitmap.Height);
+                            return cleanerBrush;
+                        }
+                    case BL.Enumerations.LiquidTypes.Yellow:
+                        {
+                            return new SolidColorBrush(Color.FromRgb(232, 225, 12));
+                        }
+                    case BL.Enumerations.LiquidTypes.Cyan:
+                        {
+                            return new SolidColorBrush(Color.FromRgb(22, 98, 235));
+                        }
+                    case BL.Enumerations.LiquidTypes.Magenta:
+                        {
+                            return new SolidColorBrush(Color.FromRgb(237, 0, 140));
+                        }
                 }
+
+                        
+                return new SolidColorBrush(type.LiquidTypeColor);
             }
             return null;
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/StringToFirstLetterConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/StringToFirstLetterConverter.cs
index 0922af78d..5418b5cf5 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/StringToFirstLetterConverter.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Converters/StringToFirstLetterConverter.cs
@@ -14,6 +14,14 @@ namespace Tango.PPC.Maintenance.Converters
         {
             if (value != null && value.ToString().Length > 1)
             {
+                if (value.ToString() == "Cleaner")
+                    return "CL";
+                else if (value.ToString() == "Transparent Ink")
+                    return "TI";
+                else if(value.ToString() == "Black")
+                {
+                    return "K";
+                }
                 return value.ToString().First().ToString();
             }
             else
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
index f613d6f43..252c8aa2e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
@@ -111,8 +111,8 @@ namespace Tango.PPC.Maintenance.ViewModels
             {
                 Max = MachineOperator.MAX_MIDTANK_LITERS,
                 IDSPack = x,
-            }).ToList();
-
+            }).OrderBy(y=>y.IDSPack.LiquidType.Code).ToList();
+            
             MachineProvider.MachineOperator.MachineStatusChanged += MachineOperator_MachineStatusChanged;
         }
 
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 54515ae11..2216c47d8 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
@@ -32,7 +32,7 @@
         <DataTemplate x:Key="LiquidBox">
             <DockPanel>
                 <TextBlock DockPanel.Dock="Top" Text="{Binding IDSPack.LiquidType.Name,Converter={StaticResource StringToFirstLetterConverter}}" HorizontalAlignment="Center"></TextBlock>
-                <Grid MaxWidth="30" Margin="5 0">
+                <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>
                             <Style TargetType="touch:TouchIcon">
@@ -114,13 +114,13 @@
                                 <Grid>
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="150*" />
-                                        <ColumnDefinition Width="250*" />
-                                        <ColumnDefinition Width="100*" />
+                                        <ColumnDefinition Width="200*" />
+                                        <ColumnDefinition Width="150*" />
                                         <ColumnDefinition Width="100*" />
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="100" />
-                                        <RowDefinition Height="25" />
+                                        <RowDefinition Height="28" />
                                     </Grid.RowDefinitions>
 
                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -170,7 +170,7 @@
 
                                     <TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Temperature</TextBlock>
                                     <TextBlock Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Inks</TextBlock>
-                                    <TextBlock Grid.Column="2" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Cone</TextBlock>
+                                    <TextBlock Grid.Column="2" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Collecting Cone</TextBlock>
                                 </Grid>
                             </StackPanel>
                         </StackPanel>