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/PPC/Tango.PPC.Common/Controls | |
| 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/PPC/Tango.PPC.Common/Controls')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs | 56 |
2 files changed, 29 insertions, 29 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml index c1a7b29a2..fe483420a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml @@ -13,7 +13,7 @@ <Grid> <Grid.ColumnDefinitions> <ColumnDefinition Width="1*"/> - <ColumnDefinition Width="100"/> + <ColumnDefinition Width="0"/> </Grid.ColumnDefinitions> <touch:TouchListBox ItemsSource="{Binding Groups}" x:Name="list" x:FieldModifier="public" DisableRipple="True" ScrollBarVisibility="Collapsed" SelectionMode="None"> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs index f786009f0..d4b924f17 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Controls/TwineCatalogControl.xaml.cs @@ -70,22 +70,22 @@ namespace Tango.PPC.Common.Controls /// <param name="e">The <see cref="Touch.Controls.DoubleValueChangedEventArgs"/> instance containing the event data.</param> private void ScrollViewer_Scrolling(object sender, Touch.Controls.DoubleValueChangedEventArgs e) { - if (!_preventChange) - { - if (e.Value > _lastScrollPosition + 60 || e.Value < _lastScrollPosition - 60) - { - var group = list.ScrollViewer.GetMostVisibleElementDataContext<CatalogGroup>(); + //if (!_preventChange) + //{ + // if (e.Value > _lastScrollPosition + 60 || e.Value < _lastScrollPosition - 60) + // { + // var group = list.ScrollViewer.GetMostVisibleElementDataContext<CatalogGroup>(); - if (group != null) - { - _preventChange = true; - slider.Value = slider.Maximum - _catalog.Groups.IndexOf(group); - _preventChange = false; - } + // if (group != null) + // { + // _preventChange = true; + // slider.Value = slider.Maximum - _catalog.Groups.IndexOf(group); + // _preventChange = false; + // } - _lastScrollPosition = e.Value; - } - } + // _lastScrollPosition = e.Value; + // } + //} } /// <summary> @@ -113,22 +113,22 @@ namespace Tango.PPC.Common.Controls /// <param name="e">The <see cref="RoutedPropertyChangedEventArgs{System.Double}"/> instance containing the event data.</param> private void TouchSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e) { - if (_catalog == null || _catalog.Groups.Count == 0) return; + //if (_catalog == null || _catalog.Groups.Count == 0) return; - if (!_preventChange) - { - if (_catalog != null) - { - _preventChange = true; - list.ScrollToItem(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue)); - _preventChange = false; - } - } + //if (!_preventChange) + //{ + // if (_catalog != null) + // { + // _preventChange = true; + // list.ScrollToItem(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue)); + // _preventChange = false; + // } + //} - if (_catalog != null && _catalog.Groups.Count > _catalog.Groups.Count - 1 - (int)e.NewValue && _catalog.Groups.Count - 1 - (int)e.NewValue > -1) - { - slider.Foreground = new SolidColorBrush(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue).Color); - } + //if (_catalog != null && _catalog.Groups.Count > _catalog.Groups.Count - 1 - (int)e.NewValue && _catalog.Groups.Count - 1 - (int)e.NewValue > -1) + //{ + // slider.Foreground = new SolidColorBrush(_catalog.Groups.ElementAt(_catalog.Groups.Count - 1 - (int)e.NewValue).Color); + //} } /// <summary> |