diff options
| author | Roy Ben Shabat <roy.mail.net@gmail.com> | 2025-09-12 13:47:16 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <roy.mail.net@gmail.com> | 2025-09-12 13:47:16 +0300 |
| commit | 8e15f292e2950cac71282923adc357f2abf8b306 (patch) | |
| tree | 536364e18b4ddba95ebbbed9e83449a733e65527 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs | |
| parent | ae42b51d0488b8d329c3379e6c345e4fe7421cf9 (diff) | |
| download | Tango-8e15f292e2950cac71282923adc357f2abf8b306.tar.gz Tango-8e15f292e2950cac71282923adc357f2abf8b306.zip | |
Extra Inks Catalogs.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs')
4 files changed, 29 insertions, 5 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs index 9d5011325..81d309bcc 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Excel/ColorItem.cs @@ -24,6 +24,12 @@ namespace Tango.MachineStudio.Catalogs.Excel public double Magenta { get; set; } public double Yellow { get; set; } public double Black { get; set; } + public double BlueExtra { get; set; } + public double NavyExtra { get; set; } + public double OrangeExtra { get; set; } + public double RedExtra { get; set; } + public double RubineExtra { get; set; } + public double VioletExtra { get; set; } public int Region { get; set; } } } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx Binary files differindex e57422725..27e5f84cf 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Templates/ExportTemplate.xlsx diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs index ac00af5b0..88f14fa09 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs @@ -454,6 +454,12 @@ namespace Tango.MachineStudio.Catalogs.ViewModels Magenta = x.Magenta, Yellow = x.Yellow, Black = x.Black, + BlueExtra = x.BlueExtra, + NavyExtra = x.NavyExtra, + OrangeExtra = x.OrangeExtra, + RedExtra = x.RedExtra, + RubineExtra = x.RubineExtra, + VioletExtra = x.VioletExtra, Region = x.ProcessParametersTableIndex, }).ToList(); @@ -581,6 +587,12 @@ namespace Tango.MachineStudio.Catalogs.ViewModels existinItem.Magenta = item.Magenta; existinItem.Yellow = item.Yellow; existinItem.Black = item.Black; + existinItem.BlueExtra = item.BlueExtra; + existinItem.NavyExtra = item.NavyExtra; + existinItem.OrangeExtra = item.OrangeExtra; + existinItem.RedExtra = item.RedExtra; + existinItem.RubineExtra = item.RubineExtra; + existinItem.VioletExtra = item.VioletExtra; existinItem.ProcessParametersTableIndex = item.Region; if (inserting) diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml index 5a49c93d3..1cc8c391b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/Views/CatalogView.xaml @@ -164,7 +164,7 @@ </DockPanel> - <DockPanel Margin="10" Grid.Column="1"> + <DockPanel Margin="10" Grid.Column="1" Grid.ColumnSpan="2"> <TextBlock DockPanel.Dock="Top" FontSize="16"> <Run>GROUP COLORS</Run> <Run>(</Run><Run Text="{Binding SelectedGroup.ColorCatalogsItems.Count,Mode=OneWay}"></Run><Run>)</Run> @@ -195,10 +195,16 @@ <DataGridTextColumn Header="A" Binding="{Binding A}" Width="60" /> <DataGridTextColumn Header="B" Binding="{Binding B}" Width="60" /> - <DataGridTextColumn Header="CYAN" Binding="{Binding Cyan}" Width="65" /> + <DataGridTextColumn Header="CYAN" Binding="{Binding Cyan}" Width="80" /> <DataGridTextColumn Header="MAGENTA" Binding="{Binding Magenta}" Width="80" /> - <DataGridTextColumn Header="YELLOW" Binding="{Binding Yellow}" Width="70" /> - <DataGridTextColumn Header="BLACK" Binding="{Binding Black}" Width="65" /> + <DataGridTextColumn Header="YELLOW" Binding="{Binding Yellow}" Width="80" /> + <DataGridTextColumn Header="BLACK" Binding="{Binding Black}" Width="80" /> + <DataGridTextColumn Header="BLUE" Binding="{Binding BlueExtra}" Width="80" /> + <DataGridTextColumn Header="NAVY" Binding="{Binding NavyExtra}" Width="80" /> + <DataGridTextColumn Header="ORANGE" Binding="{Binding OrangeExtra}" Width="80" /> + <DataGridTextColumn Header="RED" Binding="{Binding RedExtra}" Width="80" /> + <DataGridTextColumn Header="RUBINE" Binding="{Binding RubineExtra}" Width="80" /> + <DataGridTextColumn Header="VIOLET" Binding="{Binding VioletExtra}" Width="80" /> <DataGridTextColumn Header="REGION" Binding="{Binding ProcessParametersTableIndex}" Width="69" /> </DataGrid.Columns> @@ -206,7 +212,7 @@ </materialDesign:Card> </DockPanel> - <DockPanel Margin="10" Grid.Column="2"> + <DockPanel Margin="10" Grid.Column="2" Visibility="Collapsed"> <TextBlock DockPanel.Dock="Top" FontSize="16"> <Run>COLOR MEDIA RECIPES</Run> <Run>(</Run><Run Text="{Binding SelectedItem.ColorCatalogsItemsRecipes.Count,Mode=OneWay}"></Run><Run>)</Run> |