diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-19 22:19:03 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-01-19 22:19:03 +0200 |
| commit | 6571e92dd34dedb02611a6e9a7714f8185bb4488 (patch) | |
| tree | bc4390744d7cbc9681300dd3d5ebddebbcce2ed3 | |
| parent | 62baeff056ab56c376becd665b1bd5691573e8d5 (diff) | |
| download | Tango-6571e92dd34dedb02611a6e9a7714f8185bb4488.tar.gz Tango-6571e92dd34dedb02611a6e9a7714f8185bb4488.zip | |
Light Inks Basics.
25 files changed, 455 insertions, 86 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex 4a0d25eed..df97ec88f 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex cf3557ccb..f13d3cc6f 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/PMR/Messages/ColorLab/ConversionInput.proto b/Software/PMR/Messages/ColorLab/ConversionInput.proto index 5ced6ebb0..edf1c368f 100644 --- a/Software/PMR/Messages/ColorLab/ConversionInput.proto +++ b/Software/PMR/Messages/ColorLab/ConversionInput.proto @@ -21,4 +21,5 @@ message ConversionInput double DeltaL = 10; repeated ProcessRange ProcessRanges = 11; bool GenerateHive = 12; + bool UseLightInks = 13; }
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index e3547c568..ea9470bb1 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -263,7 +263,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels _machines_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200)); _dispensers_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200)); - AddIdsCommand = new RelayCommand(AddIds, (x) => ActiveMachine != null && ActiveMachine.Configuration != null && ActiveMachine.Configuration.IdsPacks.Count < 8); + AddIdsCommand = new RelayCommand(AddIds, (x) => ActiveMachine != null && ActiveMachine.Configuration != null && ActiveMachine.Configuration.IdsPacks.Count < 9); RemoveIdsCommand = new RelayCommand(RemoveIds, (x) => SelectedIds != null); EditMachineCommand = new RelayCommand(() => LoadSelectedMachine(), () => SelectedMachine != null); BackToMachinesCommand = new RelayCommand(() => View.NavigateTo(MachineDesignerNavigationView.MachinesView)); @@ -546,7 +546,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels if ((newMachine || clone) && machineCreationDialogVM.GenerateDispensers) { - for (int i = 0; i < 8; i++) + for (int i = 0; i < 9; i++) { var serial = machineCreationDialogVM.SerialNumber + "-" + (i + 1); diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs index 95de19f42..fb9a246ce 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/ColorConversionViewVM.cs @@ -217,6 +217,8 @@ namespace Tango.MachineStudio.RML.ViewModels input.ThreadA = RML.WhitePointA; input.ThreadB = RML.WhitePointB; + input.UseLightInks = RML.UseLightInks; + //Validate calibration data foreach (var vm in LiquidsCalibrationData.Where(x => x.LiquidType.HasPigment)) { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml index 912ec3b0a..73f5208db 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/ColorConversionView.xaml @@ -128,7 +128,7 @@ <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="0 0 0 0">SUGGESTIONS</TextBlock> <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="4" Margin="-80 0 0 0">LIQUID VOLUMES</TextBlock> - <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image> + <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="100" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image> <hive:HexList Width="220" Height="270" UseHexItemHasContainer="True" Grid.Column="2" Grid.Row="1" RowCount="6" ColumnCount="5" ItemsSource="{Binding HiveSuggestions}" SelectedItem="{Binding SelectedSuggestion,Mode=TwoWay}"> <hive:HexList.ItemContainerStyle> @@ -175,7 +175,7 @@ </TextBlock.Style> </TextBlock> - <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="120" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image> + <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="100" Stretch="Fill" Height="30" Opacity="0.8" Margin="20 0 20 0"></Image> <Grid Grid.Column="4" Grid.Row="1" IsHitTestVisible="False"> <StackPanel HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -20 0 0"> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml index b6c91f066..788c78b9c 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/Views/RmlView.xaml @@ -168,7 +168,7 @@ <Grid> <Grid.ColumnDefinitions> <ColumnDefinition Width="*"></ColumnDefinition> - <ColumnDefinition Width="260"></ColumnDefinition> + <ColumnDefinition Width="250"></ColumnDefinition> </Grid.ColumnDefinitions> <DockPanel> <Border DockPanel.Dock="Top" Background="{StaticResource TransparentBackgroundBrush200}" Margin="20 0" Padding="7" CornerRadius="5"> @@ -198,7 +198,7 @@ <StackPanel VerticalAlignment="Center" Width="200" Margin="5 20 5 10"> <ComboBox materialDesign:HintAssist.Hint="No CCT Defined" Margin="0 5 0 0" HorizontalContentAlignment="Center" ItemsSource="{Binding CCTS}" SelectedItem="{Binding SelectedCCT}" DisplayMemberPath="FileName" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox> - <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Right"> + <UniformGrid Columns="2" Margin="0 5 0 0" HorizontalAlignment="Center"> <Button Style="{StaticResource MaterialDesignFlatButton}" Padding="0" Command="{Binding ImportForwardDataCommand}"> <StackPanel Orientation="Horizontal" Margin="0 0 20 0"> <materialDesign:PackIcon Kind="Upload" VerticalAlignment="Center" /> @@ -216,7 +216,8 @@ <TextBlock Margin="0 40 0 0" Text="Color Conversion Version:" HorizontalAlignment="Center"></TextBlock> <mahapps:NumericUpDown Minimum="1" Maximum="4" Value="{Binding ActiveRML.ColorConversionVersion}" HorizontalContentAlignment="Center" Background="Transparent" BorderBrush="{StaticResource DimGrayBrush}" HasDecimals="False" Margin="0 5 0 0" /> - <CheckBox ToolTip="Use the color conversion engine to generate gradients" IsChecked="{Binding ActiveRML.UseColorLibGradients}" HorizontalAlignment="Center" Margin="0 40 0 0">Enable Gradient Generation</CheckBox> + <CheckBox ToolTip="Use the color conversion engine to generate gradients" IsChecked="{Binding ActiveRML.UseColorLibGradients}" HorizontalAlignment="Left" Margin="0 20 0 0">Enable Gradient Generation</CheckBox> + <CheckBox ToolTip="Use light inks when converting colors to liquid volumes" IsChecked="{Binding ActiveRML.UseLightInks}" HorizontalAlignment="Left" Margin="0 5 0 0">Use Light Inks</CheckBox> </StackPanel> </StackPanel> </Grid> 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 b007dd561..d964653a9 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Colors.xaml @@ -13,6 +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" /> </ResourceDictionary>
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs index 7a60f2cdc..13ad6ed89 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs @@ -113,6 +113,12 @@ namespace Tango.PPC.UI.ViewModels return Application.Current.Resources["TangoCleanerBrush"] as Brush; case BL.Enumerations.LiquidTypes.TransparentInk: return Application.Current.Resources["TangoTransparentInkBrush"] 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; } } } diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs index 5f37c1c67..82d387c21 100644 --- a/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs +++ b/Software/Visual_Studio/Tango.BL/Builders/RmlBuilder.cs @@ -132,10 +132,9 @@ namespace Tango.BL.Builders { var cacheCCT = _cctCache.SingleOrDefault(x => x.Guid == rml.CctGuid); - cacheCCT.Rmls.Clear(); - if (cacheCCT != null) { + cacheCCT.Rmls.Clear(); var entry = Context.Entry(cacheCCT); entry.State = EntityState.Added; Context.Ccts.Attach(cacheCCT); diff --git a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs index e561871d7..a26f54847 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/BrushStopDTOBase.cs @@ -262,6 +262,22 @@ namespace Tango.BL.DTO } /// <summary> + /// v8 + /// </summary> + public Double V8 + { + get; set; + } + + /// <summary> + /// v8 div + /// </summary> + public Int32 V8Div + { + get; set; + } + + /// <summary> /// corrected /// </summary> public Boolean Corrected diff --git a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs index 789aacbb2..7c5ba4626 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/JobRunDTOBase.cs @@ -222,6 +222,30 @@ namespace Tango.BL.DTO } /// <summary> + /// light cyan quantity + /// </summary> + public Int32 LightCyanQuantity + { + get; set; + } + + /// <summary> + /// light magenta quantity + /// </summary> + public Int32 LightMagentaQuantity + { + get; set; + } + + /// <summary> + /// light yellow quantity + /// </summary> + public Int32 LightYellowQuantity + { + get; set; + } + + /// <summary> /// end position /// </summary> public Double EndPosition diff --git a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs index 6bb8e951d..f9717002d 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/RmlDTOBase.cs @@ -246,6 +246,14 @@ namespace Tango.BL.DTO } /// <summary> + /// use light inks + /// </summary> + public Boolean UseLightInks + { + get; set; + } + + /// <summary> /// head type /// </summary> public Int32 HeadType diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs index 89114f2c3..a752651e2 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStopBase.cs @@ -83,6 +83,10 @@ namespace Tango.BL.Entities public event EventHandler<Int32> V7DivChanged; + public event EventHandler<Double> V8Changed; + + public event EventHandler<Int32> V8DivChanged; + public event EventHandler<Boolean> CorrectedChanged; public event EventHandler<Boolean> IsTransparentChanged; @@ -903,6 +907,60 @@ namespace Tango.BL.Entities } } + protected Double _v8; + + /// <summary> + /// Gets or sets the brushstopbase v8. + /// </summary> + + [Column("V8")] + + public Double V8 + { + get + { + return _v8; + } + + set + { + if (_v8 != value) + { + _v8 = value; + + OnV8Changed(value); + + } + } + } + + protected Int32 _v8div; + + /// <summary> + /// Gets or sets the brushstopbase v8 div. + /// </summary> + + [Column("V8_DIV")] + + public Int32 V8Div + { + get + { + return _v8div; + } + + set + { + if (_v8div != value) + { + _v8div = value; + + OnV8DivChanged(value); + + } + } + } + protected Boolean _corrected; /// <summary> @@ -1390,6 +1448,24 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the V8 has changed. + /// </summary> + protected virtual void OnV8Changed(Double v8) + { + V8Changed?.Invoke(this, v8); + RaisePropertyChanged(nameof(V8)); + } + + /// <summary> + /// Called when the V8Div has changed. + /// </summary> + protected virtual void OnV8DivChanged(Int32 v8div) + { + V8DivChanged?.Invoke(this, v8div); + RaisePropertyChanged(nameof(V8Div)); + } + + /// <summary> /// Called when the Corrected has changed. /// </summary> protected virtual void OnCorrectedChanged(Boolean corrected) diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs index 468af8043..8bce5d019 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobRun.cs @@ -102,6 +102,9 @@ namespace Tango.BL.Entities _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.TransparentInk, Quantity = TransparentQuantity }); _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Lubricant, Quantity = LubricantQuantity }); _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.Cleaner, Quantity = CleanerQuantity }); + _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.LightCyan, Quantity = LightCyanQuantity }); + _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.LightMagenta, Quantity = LightMagentaQuantity }); + _liquidQuantitiesFast.Add(new JobRunLiquidQuantity() { LiquidType = LiquidTypes.LightYellow, Quantity = LightYellowQuantity }); } return _liquidQuantitiesFast; diff --git a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs index 58f429448..dbdea9ac6 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/JobRunBase.cs @@ -69,6 +69,12 @@ namespace Tango.BL.Entities public event EventHandler<Int32> CleanerQuantityChanged; + public event EventHandler<Int32> LightCyanQuantityChanged; + + public event EventHandler<Int32> LightMagentaQuantityChanged; + + public event EventHandler<Int32> LightYellowQuantityChanged; + public event EventHandler<Double> EndPositionChanged; public event EventHandler<String> FailedMessageChanged; @@ -746,6 +752,87 @@ namespace Tango.BL.Entities } } + protected Int32 _lightcyanquantity; + + /// <summary> + /// Gets or sets the jobrunbase light cyan quantity. + /// </summary> + + [Column("LIGHT_CYAN_QUANTITY")] + + public Int32 LightCyanQuantity + { + get + { + return _lightcyanquantity; + } + + set + { + if (_lightcyanquantity != value) + { + _lightcyanquantity = value; + + OnLightCyanQuantityChanged(value); + + } + } + } + + protected Int32 _lightmagentaquantity; + + /// <summary> + /// Gets or sets the jobrunbase light magenta quantity. + /// </summary> + + [Column("LIGHT_MAGENTA_QUANTITY")] + + public Int32 LightMagentaQuantity + { + get + { + return _lightmagentaquantity; + } + + set + { + if (_lightmagentaquantity != value) + { + _lightmagentaquantity = value; + + OnLightMagentaQuantityChanged(value); + + } + } + } + + protected Int32 _lightyellowquantity; + + /// <summary> + /// Gets or sets the jobrunbase light yellow quantity. + /// </summary> + + [Column("LIGHT_YELLOW_QUANTITY")] + + public Int32 LightYellowQuantity + { + get + { + return _lightyellowquantity; + } + + set + { + if (_lightyellowquantity != value) + { + _lightyellowquantity = value; + + OnLightYellowQuantityChanged(value); + + } + } + } + protected Double _endposition; /// <summary> @@ -1044,6 +1131,33 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the LightCyanQuantity has changed. + /// </summary> + protected virtual void OnLightCyanQuantityChanged(Int32 lightcyanquantity) + { + LightCyanQuantityChanged?.Invoke(this, lightcyanquantity); + RaisePropertyChanged(nameof(LightCyanQuantity)); + } + + /// <summary> + /// Called when the LightMagentaQuantity has changed. + /// </summary> + protected virtual void OnLightMagentaQuantityChanged(Int32 lightmagentaquantity) + { + LightMagentaQuantityChanged?.Invoke(this, lightmagentaquantity); + RaisePropertyChanged(nameof(LightMagentaQuantity)); + } + + /// <summary> + /// Called when the LightYellowQuantity has changed. + /// </summary> + protected virtual void OnLightYellowQuantityChanged(Int32 lightyellowquantity) + { + LightYellowQuantityChanged?.Invoke(this, lightyellowquantity); + RaisePropertyChanged(nameof(LightYellowQuantity)); + } + + /// <summary> /// Called when the EndPosition has changed. /// </summary> protected virtual void OnEndPositionChanged(Double endposition) diff --git a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs index 8958884a2..cc360ca64 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/RmlBase.cs @@ -69,6 +69,8 @@ namespace Tango.BL.Entities public event EventHandler<Boolean> UseColorLibGradientsChanged; + public event EventHandler<Boolean> UseLightInksChanged; + public event EventHandler<Int32> HeadTypeChanged; public event EventHandler<Int32> QualificationLevelChanged; @@ -878,6 +880,33 @@ namespace Tango.BL.Entities } } + protected Boolean _uselightinks; + + /// <summary> + /// Gets or sets the rmlbase use light inks. + /// </summary> + + [Column("USE_LIGHT_INKS")] + + public Boolean UseLightInks + { + get + { + return _uselightinks; + } + + set + { + if (_uselightinks != value) + { + _uselightinks = value; + + OnUseLightInksChanged(value); + + } + } + } + protected Int32 _headtype; /// <summary> @@ -1899,6 +1928,15 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the UseLightInks has changed. + /// </summary> + protected virtual void OnUseLightInksChanged(Boolean uselightinks) + { + UseLightInksChanged?.Invoke(this, uselightinks); + RaisePropertyChanged(nameof(UseLightInks)); + } + + /// <summary> /// Called when the HeadType has changed. /// </summary> protected virtual void OnHeadTypeChanged(Int32 headtype) diff --git a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs index fa60fbd69..b0dc2e80f 100644 --- a/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs +++ b/Software/Visual_Studio/Tango.ColorConversion/DefaultColorConverter.cs @@ -128,6 +128,8 @@ namespace Tango.ColorConversion conversionInput.ThreadA = rml.WhitePointA; conversionInput.ThreadB = rml.WhitePointB; + conversionInput.UseLightInks = rml.UseLightInks; + conversionInput.ForwardData = ByteString.CopyFrom(rml.Cct.Data); foreach (var processTable in rml.GetActiveProcessGroup().ProcessParametersTables) diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs index 6ba539edb..d8f7776c6 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/BRUSH_STOPS.cs @@ -47,6 +47,8 @@ namespace Tango.DAL.Remote.DB public int V6_DIV { get; set; } public double V7 { get; set; } public int V7_DIV { get; set; } + public double V8 { get; set; } + public int V8_DIV { get; set; } public bool CORRECTED { get; set; } public string COLOR_CATALOG_GUID { get; set; } public string COLOR_CATALOGS_ITEM_GUID { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs index 15c819d3a..1f810a73b 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/JOB_RUNS.cs @@ -42,6 +42,9 @@ namespace Tango.DAL.Remote.DB public int TRANSPARENT_QUANTITY { get; set; } public int LUBRICANT_QUANTITY { get; set; } public int CLEANER_QUANTITY { get; set; } + public int LIGHT_CYAN_QUANTITY { get; set; } + public int LIGHT_MAGENTA_QUANTITY { get; set; } + public int LIGHT_YELLOW_QUANTITY { get; set; } public double END_POSITION { get; set; } public string FAILED_MESSAGE { get; set; } public bool IS_HEAD_CLEANING { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs index af0077df7..c140fa362 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs @@ -57,6 +57,7 @@ namespace Tango.DAL.Remote.DB public string CCT_GUID { get; set; } public int COLOR_CONVERSION_VERSION { get; set; } public bool USE_COLOR_LIB_GRADIENTS { get; set; } + public bool USE_LIGHT_INKS { get; set; } public int HEAD_TYPE { get; set; } public int QUALIFICATION_LEVEL { get; set; } public Nullable<System.DateTime> QUALIFICATION_DATE { get; set; } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index af3179379..d7e06d7d2 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -101,6 +101,8 @@ <Property Name="V6_DIV" Type="int" Nullable="false" /> <Property Name="V7" Type="float" Nullable="false" /> <Property Name="V7_DIV" Type="int" Nullable="false" /> + <Property Name="V8" Type="float" Nullable="false" /> + <Property Name="V8_DIV" Type="int" Nullable="false" /> <Property Name="CORRECTED" Type="bit" Nullable="false" /> <Property Name="COLOR_CATALOG_GUID" Type="varchar" MaxLength="36" /> <Property Name="COLOR_CATALOGS_ITEM_GUID" Type="varchar" MaxLength="36" /> @@ -668,6 +670,9 @@ <Property Name="TRANSPARENT_QUANTITY" Type="int" Nullable="false" /> <Property Name="LUBRICANT_QUANTITY" Type="int" Nullable="false" /> <Property Name="CLEANER_QUANTITY" Type="int" Nullable="false" /> + <Property Name="LIGHT_CYAN_QUANTITY" Type="int" Nullable="false" /> + <Property Name="LIGHT_MAGENTA_QUANTITY" Type="int" Nullable="false" /> + <Property Name="LIGHT_YELLOW_QUANTITY" Type="int" Nullable="false" /> <Property Name="END_POSITION" Type="float" Nullable="false" /> <Property Name="FAILED_MESSAGE" Type="nvarchar" MaxLength="300" /> <Property Name="IS_HEAD_CLEANING" Type="bit" Nullable="false" /> @@ -1009,6 +1014,7 @@ <Property Name="CCT_GUID" Type="varchar" MaxLength="36" /> <Property Name="COLOR_CONVERSION_VERSION" Type="int" Nullable="false" /> <Property Name="USE_COLOR_LIB_GRADIENTS" Type="bit" Nullable="false" /> + <Property Name="USE_LIGHT_INKS" Type="bit" Nullable="false" /> <Property Name="HEAD_TYPE" Type="int" Nullable="false" /> <Property Name="QUALIFICATION_LEVEL" Type="int" Nullable="false" /> <Property Name="QUALIFICATION_DATE" Type="datetime2" Precision="3" /> @@ -3476,6 +3482,8 @@ <Property Name="V6_DIV" Type="Int32" Nullable="false" /> <Property Name="V7" Type="Double" Nullable="false" /> <Property Name="V7_DIV" Type="Int32" Nullable="false" /> + <Property Name="V8" Type="Double" Nullable="false" /> + <Property Name="V8_DIV" Type="Int32" Nullable="false" /> <Property Name="CORRECTED" Type="Boolean" Nullable="false" /> <Property Name="COLOR_CATALOG_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="COLOR_CATALOGS_ITEM_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> @@ -4121,6 +4129,9 @@ <Property Name="TRANSPARENT_QUANTITY" Type="Int32" Nullable="false" /> <Property Name="LUBRICANT_QUANTITY" Type="Int32" Nullable="false" /> <Property Name="CLEANER_QUANTITY" Type="Int32" Nullable="false" /> + <Property Name="LIGHT_CYAN_QUANTITY" Type="Int32" Nullable="false" /> + <Property Name="LIGHT_MAGENTA_QUANTITY" Type="Int32" Nullable="false" /> + <Property Name="LIGHT_YELLOW_QUANTITY" Type="Int32" Nullable="false" /> <Property Name="END_POSITION" Type="Double" Nullable="false" /> <Property Name="FAILED_MESSAGE" Type="String" MaxLength="300" FixedLength="false" Unicode="true" /> <Property Name="IS_HEAD_CLEANING" Type="Boolean" Nullable="false" /> @@ -4507,6 +4518,7 @@ <Property Name="CCT_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" /> <Property Name="COLOR_CONVERSION_VERSION" Type="Int32" Nullable="false" /> <Property Name="USE_COLOR_LIB_GRADIENTS" Type="Boolean" Nullable="false" /> + <Property Name="USE_LIGHT_INKS" Type="Boolean" Nullable="false" /> <Property Name="HEAD_TYPE" Type="Int32" Nullable="false" /> <Property Name="QUALIFICATION_LEVEL" Type="Int32" Nullable="false" /> <Property Name="QUALIFICATION_DATE" Type="DateTime" Precision="3" /> @@ -6101,6 +6113,8 @@ <ScalarProperty Name="COLOR_CATALOGS_ITEM_GUID" ColumnName="COLOR_CATALOGS_ITEM_GUID" /> <ScalarProperty Name="COLOR_CATALOG_GUID" ColumnName="COLOR_CATALOG_GUID" /> <ScalarProperty Name="CORRECTED" ColumnName="CORRECTED" /> + <ScalarProperty Name="V8_DIV" ColumnName="V8_DIV" /> + <ScalarProperty Name="V8" ColumnName="V8" /> <ScalarProperty Name="V7_DIV" ColumnName="V7_DIV" /> <ScalarProperty Name="V7" ColumnName="V7" /> <ScalarProperty Name="V6_DIV" ColumnName="V6_DIV" /> @@ -6711,6 +6725,9 @@ <ScalarProperty Name="IS_HEAD_CLEANING" ColumnName="IS_HEAD_CLEANING" /> <ScalarProperty Name="FAILED_MESSAGE" ColumnName="FAILED_MESSAGE" /> <ScalarProperty Name="END_POSITION" ColumnName="END_POSITION" /> + <ScalarProperty Name="LIGHT_YELLOW_QUANTITY" ColumnName="LIGHT_YELLOW_QUANTITY" /> + <ScalarProperty Name="LIGHT_MAGENTA_QUANTITY" ColumnName="LIGHT_MAGENTA_QUANTITY" /> + <ScalarProperty Name="LIGHT_CYAN_QUANTITY" ColumnName="LIGHT_CYAN_QUANTITY" /> <ScalarProperty Name="CLEANER_QUANTITY" ColumnName="CLEANER_QUANTITY" /> <ScalarProperty Name="LUBRICANT_QUANTITY" ColumnName="LUBRICANT_QUANTITY" /> <ScalarProperty Name="TRANSPARENT_QUANTITY" ColumnName="TRANSPARENT_QUANTITY" /> @@ -7080,6 +7097,7 @@ <ScalarProperty Name="QUALIFICATION_DATE" ColumnName="QUALIFICATION_DATE" /> <ScalarProperty Name="QUALIFICATION_LEVEL" ColumnName="QUALIFICATION_LEVEL" /> <ScalarProperty Name="HEAD_TYPE" ColumnName="HEAD_TYPE" /> + <ScalarProperty Name="USE_LIGHT_INKS" ColumnName="USE_LIGHT_INKS" /> <ScalarProperty Name="USE_COLOR_LIB_GRADIENTS" ColumnName="USE_COLOR_LIB_GRADIENTS" /> <ScalarProperty Name="COLOR_CONVERSION_VERSION" ColumnName="COLOR_CONVERSION_VERSION" /> <ScalarProperty Name="CCT_GUID" ColumnName="CCT_GUID" /> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 476e859b4..b239ccb99 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,90 +5,90 @@ <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87"> - <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="38.25" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="59" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="63.125" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="84.125" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="74" /> - <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="17" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="39.75" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="19.875" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="20.125" /> + <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="33.25" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="59.125" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="77.125" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="63.25" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="84.25" /> + <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="15.75" PointY="16.75" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="41.75" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="15.875" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="23.625" /> <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="7.625" /> <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="8.125" /> <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="6.875" /> <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="15.75" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="24.5" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="68.625" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="55.125" /> - <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="28" /> - <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="56.125" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="90.25" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="89.625" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="77" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="41" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="29.75" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="32.625" /> - <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="47.125" /> - <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="8.75" PointY="4.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="102.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="85.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="98.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="84.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="98.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="79.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="1.5" PointY="94.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="3.75" PointY="69.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="7.5" PointY="72.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9.75" PointY="78.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="65.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="76.125" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="79.875" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="94.5" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="80.25" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="36.375" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="35.5" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="10.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="7.625" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="68.75" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="55.25" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="29.125" /> + <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="56.25" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="89" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="88.5" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="74.125" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="41.125" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="32.75" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="27" /> + <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="47" /> + <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="10.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="97.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="80.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="93.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="6.75" PointY="86.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="4.5" PointY="72.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="6.75" PointY="72.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="90.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="77.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="68.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="78.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="101.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="84.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="80" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="1.5" PointY="93.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="3.75" PointY="76.375" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="31" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="35.375" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="12.75" PointY="0.75" /> <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="16.375" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="23.875" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="2.625" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="16" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="34.75" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="51.125" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="44.75" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="42.375" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="15.875" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="26.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="13" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="33.25" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="38.125" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="55.625" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="29.875" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="2" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="20" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="29.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="51.25" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="44.875" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="42.5" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="12.75" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="15.75" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="20.25" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="34.375" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="38.25" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="54.625" /> <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="46.625" /> <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="49.25" /> <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="1" /> <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="1.125" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="15" /> - <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="19.875" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="51.5" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="51.625" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="14.875" /> + <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="23.875" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="50.5" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="50.625" /> <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="13.5" PointY="20" /> - <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="29" /> - <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="11.25" PointY="12.5" /> - <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="24.25" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="10.5" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="30.625" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="11.75" PointY="8.75" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="12.75" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="42.125" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="13.75" PointY="5.75" /> + <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="6" PointY="28" /> + <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="11.25" PointY="13" /> + <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="8.25" PointY="20.25" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="24.125" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="37.5" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="8.75" PointY="4.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="13.75" PointY="9.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="41.25" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="14.75" PointY="0.75" /> <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="5.75" PointY="12.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="13.75" PointY="9.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="14.75" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="13.75" PointY="12.75" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="5.75" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="34.25" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="35.625" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="31.125" /> + <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="14.75" PointY="4.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="15.75" PointY="7.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="16.75" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="15.75" PointY="12.75" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="32.25" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="33.625" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="11.5" /> <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> diff --git a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs index 64ad60db5..7ba38c9ca 100644 --- a/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs +++ b/Software/Visual_Studio/Tango.Integration/JobRuns/BasicJobRunsLogger.cs @@ -148,6 +148,18 @@ namespace Tango.Integration.JobRuns var cleaner = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.Cleaner); run.CleanerQuantity = cleaner != null ? cleaner.Quantity : 0; + //Light Cyan + var lightCyan = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.LightCyan); + run.LightCyanQuantity = lightCyan != null ? lightCyan.Quantity : 0; + + //Light Magenta + var lightMagenta = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.LightMagenta); + run.LightMagentaQuantity = lightMagenta != null ? lightMagenta.Quantity : 0; + + //Light Yellow + var lightYellow = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.LightYellow); + run.LightYellowQuantity = lightYellow != null ? lightYellow.Quantity : 0; + if (exception != null) { run.FailedMessage = exception.FlattenMessage(); @@ -233,6 +245,18 @@ namespace Tango.Integration.JobRuns var cleaner = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.Cleaner); run.CleanerQuantity = cleaner != null ? cleaner.Quantity : 0; + //Light Cyan + var lightCyan = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.LightCyan); + run.LightCyanQuantity = lightCyan != null ? lightCyan.Quantity : 0; + + //Light Magenta + var lightMagenta = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.LightMagenta); + run.LightMagentaQuantity = lightMagenta != null ? lightMagenta.Quantity : 0; + + //Light Yellow + var lightYellow = run.LiquidQuantities.SingleOrDefault(x => x.LiquidType == LiquidTypes.LightYellow); + run.LightYellowQuantity = lightYellow != null ? lightYellow.Quantity : 0; + //if (exception != null) //{ // run.FailedMessage = exception.FlattenMessage(); diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs index c458fa08f..87a63fe27 100644 --- a/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs +++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ConversionInput.cs @@ -24,7 +24,7 @@ namespace Tango.PMR.ColorLab { string.Concat( "ChVDb252ZXJzaW9uSW5wdXQucHJvdG8SElRhbmdvLlBNUi5Db2xvckxhYhoW", "SW5wdXRDb29yZGluYXRlcy5wcm90bxoQQ29sb3JTcGFjZS5wcm90bxoSUHJv", - "Y2Vzc1JhbmdlLnByb3RvIu0CCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk", + "Y2Vzc1JhbmdlLnByb3RvIoMDCg9Db252ZXJzaW9uSW5wdXQSDwoHVGhyZWFk", "TBgBIAEoARIPCgdUaHJlYWRBGAIgASgBEg8KB1RocmVhZEIYAyABKAESMgoK", "Q29sb3JTcGFjZRgEIAEoDjIeLlRhbmdvLlBNUi5Db2xvckxhYi5Db2xvclNw", "YWNlEj4KEElucHV0Q29vcmRpbmF0ZXMYBSABKAsyJC5UYW5nby5QTVIuQ29s", @@ -32,12 +32,12 @@ namespace Tango.PMR.ColorLab { "CgtJbnZlcnNlRGF0YRgHIAEoDBIVCg1TZWdtZW50TGVuZ3RoGAggASgBEhMK", "C0RlbHRhQ2hyb21hGAkgASgBEg4KBkRlbHRhTBgKIAEoARI3Cg1Qcm9jZXNz", "UmFuZ2VzGAsgAygLMiAuVGFuZ28uUE1SLkNvbG9yTGFiLlByb2Nlc3NSYW5n", - "ZRIUCgxHZW5lcmF0ZUhpdmUYDCABKAhCHgocY29tLnR3aW5lLnRhbmdvLnBt", - "ci5jb2xvcmxhYmIGcHJvdG8z")); + "ZRIUCgxHZW5lcmF0ZUhpdmUYDCABKAgSFAoMVXNlTGlnaHRJbmtzGA0gASgI", + "Qh4KHGNvbS50d2luZS50YW5nby5wbXIuY29sb3JsYWJiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.ColorLab.InputCoordinatesReflection.Descriptor, global::Tango.PMR.ColorLab.ColorSpaceReflection.Descriptor, global::Tango.PMR.ColorLab.ProcessRangeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.ColorLab.ConversionInput), global::Tango.PMR.ColorLab.ConversionInput.Parser, new[]{ "ThreadL", "ThreadA", "ThreadB", "ColorSpace", "InputCoordinates", "ForwardData", "InverseData", "SegmentLength", "DeltaChroma", "DeltaL", "ProcessRanges", "GenerateHive", "UseLightInks" }, null, null, null) })); } #endregion @@ -80,6 +80,7 @@ namespace Tango.PMR.ColorLab { deltaL_ = other.deltaL_; processRanges_ = other.processRanges_.Clone(); generateHive_ = other.generateHive_; + useLightInks_ = other.useLightInks_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -218,6 +219,17 @@ namespace Tango.PMR.ColorLab { } } + /// <summary>Field number for the "UseLightInks" field.</summary> + public const int UseLightInksFieldNumber = 13; + private bool useLightInks_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool UseLightInks { + get { return useLightInks_; } + set { + useLightInks_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ConversionInput); @@ -243,6 +255,7 @@ namespace Tango.PMR.ColorLab { if (DeltaL != other.DeltaL) return false; if(!processRanges_.Equals(other.processRanges_)) return false; if (GenerateHive != other.GenerateHive) return false; + if (UseLightInks != other.UseLightInks) return false; return true; } @@ -261,6 +274,7 @@ namespace Tango.PMR.ColorLab { if (DeltaL != 0D) hash ^= DeltaL.GetHashCode(); hash ^= processRanges_.GetHashCode(); if (GenerateHive != false) hash ^= GenerateHive.GetHashCode(); + if (UseLightInks != false) hash ^= UseLightInks.GetHashCode(); return hash; } @@ -316,6 +330,10 @@ namespace Tango.PMR.ColorLab { output.WriteRawTag(96); output.WriteBool(GenerateHive); } + if (UseLightInks != false) { + output.WriteRawTag(104); + output.WriteBool(UseLightInks); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -355,6 +373,9 @@ namespace Tango.PMR.ColorLab { if (GenerateHive != false) { size += 1 + 1; } + if (UseLightInks != false) { + size += 1 + 1; + } return size; } @@ -400,6 +421,9 @@ namespace Tango.PMR.ColorLab { if (other.GenerateHive != false) { GenerateHive = other.GenerateHive; } + if (other.UseLightInks != false) { + UseLightInks = other.UseLightInks; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -461,6 +485,10 @@ namespace Tango.PMR.ColorLab { GenerateHive = input.ReadBool(); break; } + case 104: { + UseLightInks = input.ReadBool(); + break; + } } } } |