From 065e754c221e69b7c12b72c92a0d6168623449d4 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Thu, 5 Dec 2024 06:04:18 +0200 Subject: Fixed issues with missing c/m/y/k. --- .../PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs | 2 +- .../PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs | 4 ++++ .../PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/PPC/Modules') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs index 7f8c7d6b5..0ad143685 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Models/BrushStopModel.cs @@ -579,7 +579,7 @@ namespace Tango.PPC.Jobs.Models if (liquidVolume.Volume > 0 && liquidVolume.Volume < min) { LiquidVolumeBelowMinLimit = true; - LiquidVolumeBelowMinLimitmessage = $"{liquidVolume.IdsPack.LiquidType.Name} Cyan should be > {min.ToString("N3")}"; + LiquidVolumeBelowMinLimitmessage = $"{liquidVolume.IdsPack.LiquidType.Name} should be > {min.ToString("N3")}"; return LiquidVolumeBelowMinLimit; } } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs index ed855d7b0..7f145c1e3 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs @@ -313,6 +313,8 @@ namespace Tango.PPC.MachineSettings.ViewModels get { return SelectedIdleTime.Minutes != Common.PowerSavingModes.Never; } } + public ColorConversionSettings ColorConversionSettings { get; set; } + #endregion #region Commands @@ -348,6 +350,8 @@ namespace Tango.PPC.MachineSettings.ViewModels new PowerDownTime() { Minutes = Common.PowerSavingModes.Maximum }, new PowerDownTime() { Minutes = Common.PowerSavingModes.Never }, }; + + ColorConversionSettings = SettingsManager.Default.GetOrCreate(); } private void Discard() diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml index 5a08c5cd1..537d354fd 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml @@ -513,6 +513,11 @@ + + Force Process Parameters Index + + + -- cgit v1.3.1