From 12e1d8aa9466d6777d7591ebc59e7f968804c78e Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Mon, 25 May 2020 14:42:26 +0300
Subject: Implemented spool presence.

---
 .../Tango.PPC.Maintenance/Images/cone-empty.png       | Bin 2174 -> 4125 bytes
 .../Tango.PPC.Maintenance/Images/cone-full.png        | Bin 1752 -> 3018 bytes
 .../Tango.PPC.Maintenance.csproj                      |   8 +++++---
 .../ViewModels/MaintenanceViewVM.cs                   |  16 ++++++++++++++++
 .../Tango.PPC.Maintenance/Views/MaintenanceView.xaml  |  14 +++++++++++++-
 5 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-empty.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-empty.png
index d65b8f793..17c3225ed 100644
Binary files a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-empty.png and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-empty.png differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-full.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-full.png
index c42abf56e..b4ed45d1e 100644
Binary files a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-full.png and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-full.png differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj
index 94dcf8247..7e5c52725 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj
@@ -281,17 +281,19 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\cl-full.png" />
-    <Resource Include="Images\cone-empty.png" />
-    <Resource Include="Images\cone-full.png" />
     <Resource Include="Images\l-full.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\head_cleaning.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\cone-empty.png" />
+    <Resource Include="Images\cone-full.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
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 4bd63e9a6..f613d6f43 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
@@ -56,6 +56,21 @@ namespace Tango.PPC.Maintenance.ViewModels
             set { _totalDyeMeters = value; RaisePropertyChangedAuto(); }
         }
 
+        private SpoolState _spoolState;
+        public SpoolState SpoolState
+        {
+            get { return _spoolState; }
+            set
+            {
+                if (_spoolState != value)
+                {
+                    _spoolState = value;
+                    RaisePropertyChangedAuto();
+                }
+            }
+        }
+
+
         public RelayCommand ExportLogsCommand { get; set; }
 
         public OpenCloseDyeingHeadCommand OpenCloseDyeingHeadCommand { get; set; }
@@ -105,6 +120,7 @@ namespace Tango.PPC.Maintenance.ViewModels
         {
             UpdateMidTankLevels(status);
             OverallTemperature.Temperature = status.OverallTemperature;
+            SpoolState = status.SpoolState;
             InvalidateRelayCommands();
         }
 
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 f49bdebe4..acbda9daa 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
@@ -155,10 +155,22 @@
                                         </ItemsControl>
                                     </Grid>
 
-                                    <!--<Image Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Source="../Images/cone-full.png" Margin="30"></Image>-->
+                                    <Image Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15" RenderOptions.BitmapScalingMode="Fant">
+                                        <Image.Style>
+                                            <Style TargetType="Image">
+                                                <Setter Property="Source" Value="../Images/cone-empty.png"></Setter>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding SpoolState}" Value="Present">
+                                                        <Setter Property="Source" Value="../Images/cone-full.png"></Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </Image.Style>
+                                    </Image>
 
                                     <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>
                                 </Grid>
                             </StackPanel>
                         </StackPanel>
-- 
cgit v1.3.1