diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-01-09 13:45:40 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-01-09 13:45:40 +0200 |
| commit | c2019e2a94afc7f25258ae38478ae74434414a1f (patch) | |
| tree | ee9cf870d5738004ebd92cf841c1bdbd26793984 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML | |
| parent | c84c8852f2889235a181ec74f0d2fdf8584f2a7d (diff) | |
| parent | d50d729a2b7d45ca4b22df7ff0d8823825c479b6 (diff) | |
| download | Tango-c2019e2a94afc7f25258ae38478ae74434414a1f.tar.gz Tango-c2019e2a94afc7f25258ae38478ae74434414a1f.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
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> |