diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 14:27:21 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-08 14:27:21 +0200 |
| commit | e2bf9f578c3ed53d869744f94b020048ca806c6e (patch) | |
| tree | 11b99612235ca541c029f45bac612706108de2df /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML | |
| parent | e111c33bc87acf40202f9e5423e21b087a366f07 (diff) | |
| download | Tango-e2bf9f578c3ed53d869744f94b020048ca806c6e.tar.gz Tango-e2bf9f578c3ed53d869744f94b020048ca806c6e.zip | |
Refactored catalogs to per RML.
Dropped MEDIA_COLOR.
Added RML White Point LAB.
Added additional dispenser parameters in MS module.
Attempt to optimize PPC color catalog view performance.
Removed "Color Catalog Code" from brush stop.
Implemented PPC color catalog selection per RML.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML')
2 files changed, 6 insertions, 23 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs index f8966b729..57c1aa724 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs @@ -42,13 +42,6 @@ namespace Tango.MachineStudio.RML.ViewModels set { _materials = value; RaisePropertyChangedAuto(); } } - private ObservableCollection<MediaColor> _colors; - public ObservableCollection<MediaColor> Colors - { - get { return _colors; } - set { _colors = value; RaisePropertyChangedAuto(); } - } - private ObservableCollection<MediaPurpos> _purposes; public ObservableCollection<MediaPurpos> Purposes { @@ -265,7 +258,6 @@ namespace Tango.MachineStudio.RML.ViewModels private void LoadRmlProperties() { Materials = _active_context.MediaMaterials.ToObservableCollection(); - Colors = _active_context.MediaColors.ToObservableCollection(); Purposes = _active_context.MediaPurposes.ToObservableCollection(); Conditions = _active_context.MediaConditions.ToObservableCollection(); LinearMassDensityUnits = _active_context.LinearMassDensityUnits.ToObservableCollection(); @@ -303,7 +295,6 @@ namespace Tango.MachineStudio.RML.ViewModels rml.Manufacturer = "Twine"; rml.Code = Rmls.Max(x => x.Code) + 1; rml.MediaMaterial = Materials.FirstOrDefault(); - rml.MediaColor = Colors.FirstOrDefault(); rml.MediaPurpose = Purposes.FirstOrDefault(); rml.MediaCondition = Conditions.FirstOrDefault(); rml.LinearMassDensityUnit = LinearMassDensityUnits.FirstOrDefault(); 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 d72b6c7d3..8f2c5d187 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 @@ -65,20 +65,12 @@ <TextBlock Text="Material:" ></TextBlock> <ComboBox ItemsSource="{Binding Materials}" SelectedItem="{Binding ActiveRML.MediaMaterial,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox> - <TextBlock Text="Color:" ></TextBlock> - <ComboBox ItemsSource="{Binding Colors}" SelectedItem="{Binding ActiveRML.MediaColor,Mode=TwoWay}"> - <ComboBox.ItemTemplate> - <DataTemplate> - <StackPanel Orientation="Horizontal"> - <Rectangle Width="16" Height="16" VerticalAlignment="Center"> - <Rectangle.Fill> - <SolidColorBrush Color="{Binding Color}"></SolidColorBrush> - </Rectangle.Fill> - </Rectangle> - </StackPanel> - </DataTemplate> - </ComboBox.ItemTemplate> - </ComboBox> + <TextBlock Text="White Point:" ></TextBlock> + <UniformGrid Columns="3"> + <mahapps:NumericUpDown HasDecimals="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointL}" HorizontalContentAlignment="Left" /> + <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointA}" HorizontalContentAlignment="Left" /> + <mahapps:NumericUpDown HasDecimals="True" Minimum="-128" Maximum="128" InterceptArrowKeys="True" HideUpDownButtons="True" Value="{Binding ActiveRML.WhitePointB}" HorizontalContentAlignment="Left" /> + </UniformGrid> <TextBlock Text="Purpose:" ></TextBlock> <ComboBox ItemsSource="{Binding Purposes}" SelectedItem="{Binding ActiveRML.MediaPurpose,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox> |