aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-09-23 18:22:32 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-09-23 18:22:32 +0300
commitb5c5758e431077d84fb53a3ff62f8e751fca2731 (patch)
treeb866fcbb29e2346f121455f503bde63071c2af5e /Software/Visual_Studio
parentd6974df76b1401f101ca3c7fc3182f73e493ca51 (diff)
downloadTango-b5c5758e431077d84fb53a3ff62f8e751fca2731.tar.gz
Tango-b5c5758e431077d84fb53a3ff62f8e751fca2731.zip
Implemented Insufficient liquid levels !!!
Diffstat (limited to 'Software/Visual_Studio')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj10
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/InsufficientLiquidQuantityViewVM.cs20
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs10
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryDisplayView.xaml2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml2
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml81
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs54
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs5
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs5
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs11
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs8
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml78
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml.cs54
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs20
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs17
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj10
-rw-r--r--Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs11
-rw-r--r--Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs6
-rw-r--r--Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs31
-rw-r--r--Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs89
-rw-r--r--Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj3
-rw-r--r--Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml8
22 files changed, 505 insertions, 30 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index 10fce1b20..f57f83d7e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -121,6 +121,7 @@
<Compile Include="ViewModelLocator.cs" />
<Compile Include="ViewModels\EmbroideryDisplayViewVM.cs" />
<Compile Include="ViewModels\EmbroideryImportViewVM.cs" />
+ <Compile Include="ViewModels\InsufficientLiquidQuantityViewVM.cs" />
<Compile Include="ViewModels\MainViewVM.cs" />
<Compile Include="Views\EmbroideryDisplayView.xaml.cs">
<DependentUpon>EmbroideryDisplayView.xaml</DependentUpon>
@@ -128,6 +129,9 @@
<Compile Include="Views\EmbroideryImportView.xaml.cs">
<DependentUpon>EmbroideryImportView.xaml</DependentUpon>
</Compile>
+ <Compile Include="Views\InsufficientLiquidQuantityView.xaml.cs">
+ <DependentUpon>InsufficientLiquidQuantityView.xaml</DependentUpon>
+ </Compile>
<Compile Include="Views\MainView.xaml.cs">
<DependentUpon>MainView.xaml</DependentUpon>
</Compile>
@@ -153,6 +157,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="Views\InsufficientLiquidQuantityView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Views\MainView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -365,7 +373,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.Developer/ViewModels/InsufficientLiquidQuantityViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/InsufficientLiquidQuantityViewVM.cs
new file mode 100644
index 000000000..e18fc842f
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/InsufficientLiquidQuantityViewVM.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.Operation;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.Developer.ViewModels
+{
+ public class InsufficientLiquidQuantityViewVM : DialogViewVM
+ {
+ public InsufficientLiquidQuantityException Exception { get; set; }
+
+ public InsufficientLiquidQuantityViewVM(InsufficientLiquidQuantityException ex)
+ {
+ Exception = ex;
+ }
+ }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 3f551c866..c2fad9d87 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1446,6 +1446,16 @@ namespace Tango.MachineStudio.Developer.ViewModels
//Finally Canceled..
};
}
+ catch (InsufficientLiquidQuantityException ex)
+ {
+ _notification.ShowModalDialog<InsufficientLiquidQuantityViewVM, InsufficientLiquidQuantityView>(new InsufficientLiquidQuantityViewVM(ex), (x) =>
+ {
+
+ MachineOperator.EnableJobLiquidQuantityValidation = false;
+ StartJob();
+
+ }, () => { });
+ }
catch (Exception ex)
{
LogManager.Log(ex);
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryDisplayView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryDisplayView.xaml
index 22414b4b2..2e1eaf6a1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryDisplayView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryDisplayView.xaml
@@ -9,7 +9,7 @@
xmlns:converters="clr-namespace:Tango.MachineStudio.Developer.Converters"
xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
mc:Ignorable="d"
- Width="1280" Height="720" Background="White" d:DataContext="{d:DesignInstance Type=vm:EmbroideryDisplayViewVM, IsDesignTimeCreatable=False}">
+ Width="1280" Height="720" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:EmbroideryDisplayViewVM, IsDesignTimeCreatable=False}">
<UserControl.Resources>
<converters:ByteArrayToBitmapSourceConverter x:Key="ByteArrayToBitmapSourceConverter" />
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
index 8d25719e8..d9ff176d9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
@@ -10,7 +10,7 @@
xmlns:brushPicker="clr-namespace:Tango.BrushPicker;assembly=Tango.BrushPicker"
xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
mc:Ignorable="d"
- Height="720" Width="1280" Background="White" d:DataContext="{d:DesignInstance Type=vm:EmbroideryImportViewVM, IsDesignTimeCreatable=False}">
+ Height="720" Width="1280" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:EmbroideryImportViewVM, IsDesignTimeCreatable=False}">
<Grid>
<Grid>
<Grid.ColumnDefinitions>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
new file mode 100644
index 000000000..f0e9dc29c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
@@ -0,0 +1,81 @@
+<UserControl x:Class="Tango.MachineStudio.Developer.Views.InsufficientLiquidQuantityView"
+ 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:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
+ xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
+ mc:Ignorable="d"
+ Height="450" Width="800" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}">
+ <Grid Margin="10">
+ <DockPanel>
+ <StackPanel DockPanel.Dock="Top">
+ <TextBlock FontSize="24" Foreground="{StaticResource RedBrush100}">Insufficient Liquid Level</TextBlock>
+ <TextBlock Margin="0 5 0 0" TextWrapping="Wrap" Foreground="{StaticResource GrayBrush}">
+ <Run>There seems to be an insufficient ink levels in one or more of the following dispensers.</Run>
+ <LineBreak/>
+ <Run>The job cannot be completed.</Run>
+ </TextBlock>
+ </StackPanel>
+
+ <Grid DockPanel.Dock="Bottom" Height="60">
+ <Button HorizontalAlignment="Left" DockPanel.Dock="Bottom" Height="40" Width="170" Style="{StaticResource MaterialDesignFlatButton}" BorderBrush="{StaticResource RedBrush300}" Foreground="{StaticResource RedBrush300}" Command="{Binding OKCommand}" ToolTip="Ignore this warning now and in the future">Ignore This Error</Button>
+ <Button HorizontalAlignment="Right" DockPanel.Dock="Bottom" Height="40" Width="140" Command="{Binding CloseCommand}" Margin="10 0 0 0">CLOSE</Button>
+ </Grid>
+
+ <Border Margin="0 40 0 0" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" CornerRadius="3">
+ <ItemsControl ItemsSource="{Binding Exception.IdsPackLevels}">
+ <ItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+ </ItemsPanelTemplate>
+ </ItemsControl.ItemsPanel>
+ <ItemsControl.ItemTemplate>
+ <DataTemplate>
+ <StackPanel Margin="15 0">
+ <TextBlock HorizontalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
+ <Border Margin="0 5 0 0" Height="150" Width="50" CornerRadius="3" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
+ <Grid>
+ <Border CornerRadius="3" VerticalAlignment="Bottom" Loaded="IdsPackLoaded" MinHeight="5">
+ <Border.Background>
+ <LinearGradientBrush>
+ <GradientStop Offset="0" Color="#4DFFFFFF" />
+ <GradientStop Offset="0.5" Color="{Binding IdsPack.LiquidType.LiquidTypeColor}" />
+ </LinearGradientBrush>
+ </Border.Background>
+ </Border>
+ <Rectangle Loaded="Limit_Loaded" Stroke="Red" StrokeThickness="2" VerticalAlignment="Bottom">
+ <Rectangle.Style>
+ <Style TargetType="Rectangle">
+ <Style.Triggers>
+ <EventTrigger RoutedEvent="Loaded">
+ <EventTrigger.Actions>
+ <BeginStoryboard Name="str">
+ <Storyboard>
+ <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Duration="00:00:01" RepeatBehavior="Forever">
+ <DiscreteDoubleKeyFrame KeyTime="00:00:00" Value="1" />
+ <DiscreteDoubleKeyFrame KeyTime="00:00:0.5" Value="0" />
+ </DoubleAnimationUsingKeyFrames>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger.Actions>
+ </EventTrigger>
+ <EventTrigger RoutedEvent="Unloaded">
+ <EventTrigger.Actions>
+ <RemoveStoryboard BeginStoryboardName="str" />
+ </EventTrigger.Actions>
+ </EventTrigger>
+ </Style.Triggers>
+ </Style>
+ </Rectangle.Style>
+ </Rectangle>
+ </Grid>
+ </Border>
+ </StackPanel>
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
+ </Border>
+ </DockPanel>
+ </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs
new file mode 100644
index 000000000..171cb754e
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs
@@ -0,0 +1,54 @@
+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.Integration.Operation;
+using static Tango.Integration.Operation.InsufficientLiquidQuantityException;
+
+namespace Tango.MachineStudio.Developer.Views
+{
+ /// <summary>
+ /// Interaction logic for InsufficientLiquidQuantityView.xaml
+ /// </summary>
+ public partial class InsufficientLiquidQuantityView : UserControl
+ {
+ public InsufficientLiquidQuantityView()
+ {
+ InitializeComponent();
+ }
+
+ private void IdsPackLoaded(object sender, RoutedEventArgs e)
+ {
+ Border border = sender as Border;
+ Grid parent = border.Parent as Grid;
+ IDSPackLevel packLevel = border.DataContext as IDSPackLevel;
+
+ border.Height = ((double)packLevel.Current / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
+ }
+
+ private void Limit_Loaded(object sender, RoutedEventArgs e)
+ {
+ Rectangle rect = sender as Rectangle;
+ Grid parent = rect.Parent as Grid;
+ IDSPackLevel packLevel = rect.DataContext as IDSPackLevel;
+
+ var top = ((double)packLevel.Required / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
+ rect.Margin = new Thickness(0, 0, 0, top);
+
+ if (packLevel.IsValid)
+ {
+ rect.Visibility = Visibility.Hidden;
+ }
+ }
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs
index 14065ccba..49d11a8fd 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobSummeryViewVM.cs
@@ -8,6 +8,7 @@ using Tango.BL.Builders;
using Tango.BL.Entities;
using Tango.ColorConversion;
using Tango.Core.Commands;
+using Tango.Integration.Operation;
using Tango.PPC.Common;
using Tango.PPC.Common.Messages;
using Tango.PPC.Common.Navigation;
@@ -91,6 +92,10 @@ namespace Tango.PPC.Jobs.ViewModels
await PrintingManager.Print(Job, _context);
await NavigationManager.NavigateTo<JobsModule>(false, nameof(JobProgressView));
}
+ catch (InsufficientLiquidQuantityException)
+ {
+ //Ignore..
+ }
catch (Exception ex)
{
LogManager.Log(ex, "Could not start the current job.");
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 85eb87824..a99e45eb3 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -36,6 +36,7 @@ using Tango.Explorer;
using Tango.PPC.Storage;
using System.IO;
using Tango.ColorConversion;
+using Tango.Integration.Operation;
namespace Tango.PPC.Jobs.ViewModels
{
@@ -644,6 +645,10 @@ namespace Tango.PPC.Jobs.ViewModels
await PrintingManager.Print(Job, _db);
await NavigationManager.NavigateTo<JobsModule>(nameof(JobProgressView));
}
+ catch (InsufficientLiquidQuantityException)
+ {
+ //Ignore..
+ }
catch (Exception ex)
{
LogManager.Log(ex, "Could not start the current job.");
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index cd432538c..a16e2f649 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -89,6 +89,11 @@ namespace Tango.PPC.Common.Connection
MachineOperator.GradientGenerationConfiguration.IsEnabled = settings.EnableGradientGeneration;
MachineOperator.GradientGenerationConfiguration.ResolutionCM = settings.GradientGenerationResolution;
+
+ MachineOperator.EmergencyNotificationProvider.Address = settings.EmergencyComPort;
+ MachineOperator.EmergencyNotificationProvider.IsEnabled = settings.EnableEmergencyNotifications;
+
+ MachineOperator.EnableJobLiquidQuantityValidation = settings.EnableJobLiquidQuantityValidation;
}
private async void ConnectionThreadMethod()
@@ -159,9 +164,6 @@ namespace Tango.PPC.Common.Connection
await Task.Delay(1000);
await MachineOperator.UploadHardwareConfiguration(Machine.Configuration.HardwareVersion, Machine.Configuration);
MachineOperator.UseKeepAlive = true;
-
- MachineOperator.EmergencyNotificationProvider.Address = settings.EmergencyComPort;
- MachineOperator.EmergencyNotificationProvider.IsEnabled = settings.EnableEmergencyNotifications;
}
}
else
@@ -184,9 +186,6 @@ namespace Tango.PPC.Common.Connection
await Task.Delay(1000);
await MachineOperator.UploadHardwareConfiguration(Machine.Configuration.HardwareVersion, Machine.Configuration);
-
- MachineOperator.EmergencyNotificationProvider.Address = settings.EmergencyComPort;
- MachineOperator.EmergencyNotificationProvider.IsEnabled = settings.EnableEmergencyNotifications;
}
}
catch (Exception ex)
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index b495ec54d..b1bc3faad 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -133,6 +133,11 @@ namespace Tango.PPC.Common
public String EmergencyComPort { get; set; }
/// <summary>
+ /// Gets or sets a value indicating whether to enable the job liquid quantity validation.
+ /// </summary>
+ public bool EnableJobLiquidQuantityValidation { get; set; }
+
+ /// <summary>
/// Gets the machine service address.
/// </summary>
/// <returns></returns>
@@ -160,7 +165,8 @@ namespace Tango.PPC.Common
DeploymentSlot = DeploymentSlot.TEST;
EnableWatchDog = true;
EnableEmergencyNotifications = true;
- EmergencyComPort = "COM1";
+ EmergencyComPort = "COM2";
+ EnableJobLiquidQuantityValidation = true;
}
}
}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml
new file mode 100644
index 000000000..f3c471954
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml
@@ -0,0 +1,78 @@
+<UserControl x:Class="Tango.PPC.UI.Dialogs.InsufficientLiquidQuantityView"
+ 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:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+ xmlns:local="clr-namespace:Tango.PPC.UI.Dialogs"
+ mc:Ignorable="d"
+ Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="700" Height="800" d:DataContext="{d:DesignInstance Type=local:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}">
+ <Grid Margin="20">
+ <DockPanel>
+ <Grid DockPanel.Dock="Bottom">
+ <touch:TouchButton HorizontalAlignment="Right" CornerRadius="25" Command="{Binding OKCommand}" Style="{StaticResource TangoHollowButton}" Width="150" Height="50" VerticalAlignment="Bottom">CLOSE</touch:TouchButton>
+ </Grid>
+ <StackPanel DockPanel.Dock="Top">
+ <Image Source="/Images/cartridge_validation.png" RenderOptions.BitmapScalingMode="Fant" Stretch="Uniform" Height="120"></Image>
+ <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Insufficient Ink Level</TextBlock>
+ <TextBlock Margin="20 10" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center">
+ <Run>There seems to be an insufficient ink levels in one or more of the following dispensers.</Run>
+ <Run>The job cannot be completed.</Run>
+ </TextBlock>
+ </StackPanel>
+ <Grid>
+ <ItemsControl ItemsSource="{Binding Exception.IdsPackLevels}">
+ <ItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+ </ItemsPanelTemplate>
+ </ItemsControl.ItemsPanel>
+ <ItemsControl.ItemTemplate>
+ <DataTemplate>
+ <StackPanel Margin="15 0" Width="60">
+ <TextBlock HorizontalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}" Margin="-20 0 -20 0" TextTrimming="CharacterEllipsis"></TextBlock>
+ <Border Margin="0 5 0 0" Height="150" Width="50" CornerRadius="3" BorderThickness="1" BorderBrush="{StaticResource TangoLightBorderBrush}">
+ <Grid>
+ <Border CornerRadius="3" VerticalAlignment="Bottom" Loaded="IdsPackLoaded" MinHeight="5">
+ <Border.Background>
+ <LinearGradientBrush>
+ <GradientStop Offset="0" Color="#4DFFFFFF" />
+ <GradientStop Offset="0.5" Color="{Binding IdsPack.LiquidType.LiquidTypeColor}" />
+ </LinearGradientBrush>
+ </Border.Background>
+ </Border>
+ <Rectangle Loaded="Limit_Loaded" Stroke="Red" StrokeThickness="2" VerticalAlignment="Bottom">
+ <Rectangle.Style>
+ <Style TargetType="Rectangle">
+ <Style.Triggers>
+ <EventTrigger RoutedEvent="Loaded">
+ <EventTrigger.Actions>
+ <BeginStoryboard Name="str">
+ <Storyboard>
+ <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Duration="00:00:01" RepeatBehavior="Forever">
+ <DiscreteDoubleKeyFrame KeyTime="00:00:00" Value="1" />
+ <DiscreteDoubleKeyFrame KeyTime="00:00:0.5" Value="0" />
+ </DoubleAnimationUsingKeyFrames>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger.Actions>
+ </EventTrigger>
+ <EventTrigger RoutedEvent="Unloaded">
+ <EventTrigger.Actions>
+ <RemoveStoryboard BeginStoryboardName="str" />
+ </EventTrigger.Actions>
+ </EventTrigger>
+ </Style.Triggers>
+ </Style>
+ </Rectangle.Style>
+ </Rectangle>
+ </Grid>
+ </Border>
+ </StackPanel>
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
+ </Grid>
+ </DockPanel>
+ </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml.cs
new file mode 100644
index 000000000..9ec1eec0e
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml.cs
@@ -0,0 +1,54 @@
+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.Integration.Operation;
+using static Tango.Integration.Operation.InsufficientLiquidQuantityException;
+
+namespace Tango.PPC.UI.Dialogs
+{
+ /// <summary>
+ /// Interaction logic for InsufficientLiquidQuantityView.xaml
+ /// </summary>
+ public partial class InsufficientLiquidQuantityView : UserControl
+ {
+ public InsufficientLiquidQuantityView()
+ {
+ InitializeComponent();
+ }
+
+ private void IdsPackLoaded(object sender, RoutedEventArgs e)
+ {
+ Border border = sender as Border;
+ Grid parent = border.Parent as Grid;
+ IDSPackLevel packLevel = border.DataContext as IDSPackLevel;
+
+ border.Height = ((double)packLevel.Current / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
+ }
+
+ private void Limit_Loaded(object sender, RoutedEventArgs e)
+ {
+ Rectangle rect = sender as Rectangle;
+ Grid parent = rect.Parent as Grid;
+ IDSPackLevel packLevel = rect.DataContext as IDSPackLevel;
+
+ var top = ((double)packLevel.Required / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
+ rect.Margin = new Thickness(0, 0, 0, top);
+
+ if (packLevel.IsValid)
+ {
+ rect.Visibility = Visibility.Hidden;
+ }
+ }
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs
new file mode 100644
index 000000000..8b15d2e00
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Integration.Operation;
+using Tango.SharedUI;
+
+namespace Tango.PPC.UI.Dialogs
+{
+ public class InsufficientLiquidQuantityViewVM : DialogViewVM
+ {
+ public InsufficientLiquidQuantityException Exception { get; set; }
+
+ public InsufficientLiquidQuantityViewVM(InsufficientLiquidQuantityException ex)
+ {
+ Exception = ex;
+ }
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
index 41a231932..56ec2fa7e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs
@@ -13,8 +13,10 @@ using Tango.PPC.Common.Connection;
using Tango.PPC.Common.Messages;
using Tango.PPC.Common.Models;
using Tango.PPC.Common.Navigation;
+using Tango.PPC.Common.Notifications;
using Tango.PPC.Common.Printing;
using Tango.PPC.Jobs.Messages;
+using Tango.PPC.UI.Dialogs;
namespace Tango.PPC.UI.Printing
{
@@ -26,14 +28,16 @@ namespace Tango.PPC.UI.Printing
public class DefaultPrintingManager : ExtendedObject, IPrintingManager
{
private IMachineProvider _machineProvider;
+ private INotificationProvider _notificationProvider;
/// <summary>
/// Initializes a new instance of the <see cref="DefaultPrintingManager"/> class.
/// </summary>
/// <param name="machineProvider">The machine provider.</param>
- public DefaultPrintingManager(IMachineProvider machineProvider)
+ public DefaultPrintingManager(IMachineProvider machineProvider, INotificationProvider notificationProvider)
{
_machineProvider = machineProvider;
+ _notificationProvider = notificationProvider;
}
/// <summary>
@@ -52,7 +56,16 @@ namespace Tango.PPC.UI.Printing
#if STUBPRINT
handler = await _machineProvider.MachineOperator.PrintStub(job);
#else
- handler = await _machineProvider.MachineOperator.Print(job);
+ try
+ {
+ handler = await _machineProvider.MachineOperator.Print(job);
+ }
+ catch (InsufficientLiquidQuantityException ex)
+ {
+ LogManager.Log(ex);
+ await _notificationProvider.ShowDialog(new InsufficientLiquidQuantityViewVM(ex));
+ throw ex;
+ }
#endif
handler.Completed += async (x, e) =>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index b32ee0339..40afab3de 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -125,6 +125,10 @@
<Compile Include="Dialogs\CartridgeValidationView.xaml.cs">
<DependentUpon>CartridgeValidationView.xaml</DependentUpon>
</Compile>
+ <Compile Include="Dialogs\InsufficientLiquidQuantityView.xaml.cs">
+ <DependentUpon>InsufficientLiquidQuantityView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Dialogs\InsufficientLiquidQuantityViewVM.cs" />
<Compile Include="Dialogs\ScreenLockView.xaml.cs">
<DependentUpon>ScreenLockView.xaml</DependentUpon>
</Compile>
@@ -202,6 +206,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
+ <Page Include="Dialogs\InsufficientLiquidQuantityView.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
<Page Include="Dialogs\ScreenLockView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -569,7 +577,7 @@ if $(ConfigurationName) == Release del *.xml</PostBuildEvent>
</PropertyGroup>
<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/Tango.BL/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs
index 2dcb98a24..60fdc6707 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/LiquidType.cs
@@ -1,8 +1,11 @@
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using System.Windows.Media;
namespace Tango.BL.Entities
{
@@ -13,6 +16,14 @@ namespace Tango.BL.Entities
return (PMR.ColorLab.LiquidType)Code;
}
+
+ [NotMapped]
+ [JsonIgnore]
+ public Color LiquidTypeColor
+ {
+ get { return Core.Helpers.ColorHelper.IntegerToColor(Color); }
+ }
+
/// <summary>
/// Initializes a new instance of the <see cref="LiquidType" /> class.
/// </summary>
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
index c1d204bae..733f7a981 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
@@ -53,6 +53,12 @@ namespace Tango.Integration.Operation
MachineStatuses Status { get; }
/// <summary>
+ /// Gets or sets a value indicating whether to enable liquid quantity validation before starting the job.
+ /// The validation is done using the reported <see cref="MachineStatus"/>.
+ /// </summary>
+ bool EnableJobLiquidQuantityValidation { get; set; }
+
+ /// <summary>
/// Gets the machine embedded device status.
/// </summary>
MachineStatus MachineStatus { get; }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs b/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs
new file mode 100644
index 000000000..a1c18370b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Integration/Operation/InsufficientLiquidQuantityException.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.Integration.Operation
+{
+ public class InsufficientLiquidQuantityException : Exception
+ {
+ public class IDSPackLevel
+ {
+ public IdsPack IdsPack { get; set; }
+ public int Current { get; set; }
+ public int Required { get; set; }
+
+ public bool IsValid
+ {
+ get { return Current >= Required; }
+ }
+ }
+
+ public InsufficientLiquidQuantityException(String message) : base(message)
+ {
+ IdsPackLevels = new List<IDSPackLevel>();
+ }
+
+ public List<IDSPackLevel> IdsPackLevels { get; internal set; }
+ }
+}
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 943afa21a..867ac7ec1 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -38,6 +38,7 @@ using Tango.Core.ExtensionMethods;
using Tango.ColorConversion;
using Tango.Integration.Emergency;
using Tango.PMR.MachineStatus;
+using Newtonsoft.Json;
namespace Tango.Integration.Operation
{
@@ -51,6 +52,7 @@ namespace Tango.Integration.Operation
public const String FIRMWARE_UPGRADE_FOLDER_NAME = "UpgradePackage";
public const String FIRMWARE_UPGRADE_CONFIG_FILE_NAME = "package.cfg";
public const String JOB_DESCRIPTION_FILE_NAME = "job_segments.jdf";
+ public const int MAX_DISPENSER_NANOLITER = 130000000;
private bool _diagnosticsSent;
private bool _eventsSent;
@@ -97,6 +99,7 @@ namespace Tango.Integration.Operation
FirmwareUpgradeMode = FirmwareUpgradeModes.DFU | FirmwareUpgradeModes.TFP_PACKAGE;
GradientGenerationConfiguration = new DefaultGradientGenerationConfiguration();
EmergencyNotificationProvider = new UsbEmergencyNotificationProvider("COM1");
+ EnableJobLiquidQuantityValidation = true;
}
/// <summary>
@@ -248,6 +251,12 @@ namespace Tango.Integration.Operation
}
/// <summary>
+ /// Gets or sets a value indicating whether to enable liquid quantity validation before starting the job.
+ /// The validation is done using the reported <see cref="MachineStatus" />.
+ /// </summary>
+ public bool EnableJobLiquidQuantityValidation { get; set; }
+
+ /// <summary>
/// Gets or sets the firmware upgrade mode.
/// </summary>
public FirmwareUpgradeModes FirmwareUpgradeMode { get; set; }
@@ -1323,7 +1332,7 @@ namespace Tango.Integration.Operation
});
}
- private void ValidateJobLiquidQuantity(JobTicket ticket, ProcessParametersTable processParameters, Configuration configuration)
+ private void ValidateJobLiquidQuantity(Job job, ProcessParametersTable processParameters, Configuration configuration)
{
Dictionary<int, double> liquidQuantities = new Dictionary<int, double>();
@@ -1332,23 +1341,76 @@ namespace Tango.Integration.Operation
liquidQuantities.Add(pack.PackIndex, 0);
}
- for (int segmentIndex = 0; segmentIndex < ticket.Segments.Count; segmentIndex++)
+ for (int i = 0; i < Math.Max(job.NumberOfUnits, 1); i++)
+ {
+ for (int segmentIndex = 0; segmentIndex < job.Segments.Count; segmentIndex++)
+ {
+ var segment = job.Segments[segmentIndex];
+ var segment_length_cm = segment.Length * 100d;
+
+ var stop_count = segment.BrushStops.Count - (segment.BrushStops.Count == 1 ? 0 : 1);
+ var stop_length_centimeters = segment_length_cm / stop_count;
+
+ for (int stopIndex = 0; stopIndex < stop_count; stopIndex++)
+ {
+ var stop = segment.BrushStops[stopIndex];
+
+ foreach (var liquidVolumes in stop.LiquidVolumes)
+ {
+ liquidQuantities[liquidVolumes.IdsPack.PackIndex] += liquidVolumes.NanoliterPerCentimeter * stop_length_centimeters;
+ }
+ }
+ }
+ }
+
+ if (MachineStatus != null)
{
- var segment = ticket.Segments[segmentIndex];
- var segment_length_cm = segment.Length * 100d;
+ var exception = new InsufficientLiquidQuantityException($"Insufficient liquids level.");
- var stop_count = segment.BrushStops.Count - (segment.BrushStops.Count == 1 ? 0 : 1);
- var stop_length_centimeters = segment_length_cm / stop_count;
+ bool shouldThrow = false;
- for (int stopIndex = 0; stopIndex < stop_count; stopIndex++)
+ foreach (var liquidQuantity in liquidQuantities)
{
- var stop = segment.BrushStops[stopIndex];
+ int index = liquidQuantity.Key;
+ var packLevel = MachineStatus.IDSPacksLevels.SingleOrDefault(x => x.Index == index);
+ var idsPack = configuration.NoneEmptyIdsPacks.SingleOrDefault(x => x.PackIndex == index);
+
+ if (packLevel != null)
+ {
+ var idsLevel = new InsufficientLiquidQuantityException.IDSPackLevel()
+ {
+ IdsPack = idsPack,
+ Current = packLevel.DispenserLevel,
+ Required = (int)liquidQuantities[index]
+ };
- foreach (var dispenser in stop.Dispensers)
+ if (liquidQuantities[index] > packLevel.DispenserLevel)
+ {
+ shouldThrow = true;
+ }
+
+ exception.IdsPackLevels.Add(idsLevel);
+ }
+ else
{
- liquidQuantities[dispenser.Index] += dispenser.NanoliterPerCentimeter * stop_length_centimeters;
+ LogManager.Log($"Could not validate required liquid quantity for job. Missing IDS Pack level at index {index}.", LogCategory.Warning);
}
}
+
+
+ if (shouldThrow)
+ {
+ throw LogManager.Log(exception, JsonConvert.SerializeObject(exception.IdsPackLevels.Select(x => new
+ {
+ Liquid = x.IdsPack.LiquidType.Name,
+ x.Required,
+ x.Current
+ }).ToList()));
+ }
+ }
+ else
+ {
+ LogManager.Log("Could not validate required liquid quantity for job. No machine status received", LogCategory.Warning);
}
}
@@ -1525,6 +1587,11 @@ namespace Tango.Integration.Operation
job.NumberOfUnits = 1;
}
+ if (EnableJobLiquidQuantityValidation)
+ {
+ ValidateJobLiquidQuantity(job, processParameters, job.Machine.Configuration);
+ }
+
var originalJob = job;
var clonedJob = job.Clone();
clonedJob.Guid = job.Guid;
@@ -1697,8 +1764,6 @@ namespace Tango.Integration.Operation
ticket.Segments.AddRange(segs);
}
- ValidateJobLiquidQuantity(ticket, processParameters, job.Machine.Configuration);
-
request.JobTicket = ticket.Clone();
request.JobTicket.UploadStrategy = JobUploadStrategy;
diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
index 6bd13ae6d..6b8d4ee8d 100644
--- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
+++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
@@ -104,6 +104,7 @@
<Compile Include="Logging\EmbeddedLogItem.cs" />
<Compile Include="Operation\DefaultGradientGenerationConfiguration.cs" />
<Compile Include="Operation\IGradientGenerationConfiguration.cs" />
+ <Compile Include="Operation\InsufficientLiquidQuantityException.cs" />
<Compile Include="Operation\JobDescriptionFile.cs" />
<Compile Include="Operation\JobUnitsMethods.cs" />
<Compile Include="Operation\PreparingJobProgressEventArgs.cs" />
@@ -194,7 +195,7 @@
<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/Utilities/Tango.MachineEM.UI/Views/MainView.xaml b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
index 51cc1d3ec..02c1b4eba 100644
--- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml
@@ -205,10 +205,10 @@
<Run Text="{Binding Index}"></Run>
</TextBlock>
- <TextBlock>
- <Run Text="Dispenser Level (nl): "></Run>
- <Run Text="{Binding ElementName=sliderDispenser,Path=Value}"></Run>
- </TextBlock>
+ <StackPanel Orientation="Horizontal">
+ <TextBlock Text="Dispenser Level (nl): " />
+ <TextBox Text="{Binding ElementName=sliderDispenser,Path=Value,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"></TextBox>
+ </StackPanel>
<Slider x:Name="sliderDispenser" Orientation="Horizontal" Minimum="0" Maximum="130000000" Value="{Binding DispenserLevel}"></Slider>