From 6c6327c554fe1842b6f7b9f22b46854fe4166598 Mon Sep 17 00:00:00 2001
From: Evgeny Redikultsev <effect-project@yandex.ru>
Date: Tue, 13 Sep 2022 22:23:27 +0500
Subject: [PATCH] Partially fix work with user color

---
 .../FieldViewerViewModel.cs                   | 12 +++++++
 FieldVisualizer/ViewModels/ViewModelBase.cs   | 24 ++++++++++++++
 .../Windows/UserControls/FieldViewer.xaml     |  5 +--
 .../Windows/UserControls/FieldViewer.xaml.cs  | 33 +++++++++++++++----
 4 files changed, 65 insertions(+), 9 deletions(-)
 create mode 100644 FieldVisualizer/ViewModels/FieldViewerViewModels/FieldViewerViewModel.cs
 create mode 100644 FieldVisualizer/ViewModels/ViewModelBase.cs

diff --git a/FieldVisualizer/ViewModels/FieldViewerViewModels/FieldViewerViewModel.cs b/FieldVisualizer/ViewModels/FieldViewerViewModels/FieldViewerViewModel.cs
new file mode 100644
index 0000000..32e5dd3
--- /dev/null
+++ b/FieldVisualizer/ViewModels/FieldViewerViewModels/FieldViewerViewModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FieldVisualizer.ViewModels.FieldViewerViewModels
+{
+    public class FieldViewerViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/FieldVisualizer/ViewModels/ViewModelBase.cs b/FieldVisualizer/ViewModels/ViewModelBase.cs
new file mode 100644
index 0000000..15bfbe7
--- /dev/null
+++ b/FieldVisualizer/ViewModels/ViewModelBase.cs
@@ -0,0 +1,24 @@
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace FieldVisualizer.ViewModels
+{
+    public class ViewModelBase : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged<T>(T value, T prop, [CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        protected virtual void OnPropertyChanged<T>(T value, ref T prop, [CallerMemberName] string propertyName = null)
+        {
+            prop = value;
+            OnPropertyChanged(propertyName);
+        }
+
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+            => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+}
diff --git a/FieldVisualizer/Windows/UserControls/FieldViewer.xaml b/FieldVisualizer/Windows/UserControls/FieldViewer.xaml
index bb9b474..3f3d6cd 100644
--- a/FieldVisualizer/Windows/UserControls/FieldViewer.xaml
+++ b/FieldVisualizer/Windows/UserControls/FieldViewer.xaml
@@ -36,10 +36,11 @@
             </ScrollViewer>
         </Grid>
         <StackPanel Grid.Column="2">
-            <CheckBox x:Name="cbMinValueEnabled" Margin="3" Content="Minimum Value"/>
+            <CheckBox x:Name="cbMinValueEnabled" Margin="3" Content="Minimum Value" IsChecked="{Binding Path=SetMinValue}"/>
             <TextBox x:Name="tbMinValue" Margin="20,3,3,3" IsEnabled="{Binding IsChecked, ElementName=cbMinValueEnabled}" Text="{Binding Path=UserValueRange.BottomValue}"/>
-            <CheckBox x:Name="cbMaxValueEnabled" Margin="3" Content="Maximum Value"/>
+            <CheckBox x:Name="cbMaxValueEnabled" Margin="3" Content="Maximum Value" IsChecked="{Binding Path=SetMaxValue}"/>
             <TextBox x:Name="tbMaxValue" Margin="20,3,3,3" IsEnabled="{Binding IsChecked, ElementName=cbMaxValueEnabled}" Text="{Binding Path=UserValueRange.TopValue}"/>
+            <Button Margin="3" Content="Set custom colors" Command="{Binding SetUserColorsCommand}"/>
             <local:VerticalLegend x:Name="LegendViewer" Margin="3" Grid.Column="2"/>
         </StackPanel>
     </Grid>
diff --git a/FieldVisualizer/Windows/UserControls/FieldViewer.xaml.cs b/FieldVisualizer/Windows/UserControls/FieldViewer.xaml.cs
index 2ce5a97..406b7f6 100644
--- a/FieldVisualizer/Windows/UserControls/FieldViewer.xaml.cs
+++ b/FieldVisualizer/Windows/UserControls/FieldViewer.xaml.cs
@@ -29,9 +29,12 @@ namespace FieldVisualizer.Windows.UserControls
         public ICommand ZoomInCommand { get; }
         public ICommand ZoomOutCommand { get; }
         public ICommand ChangeColorMapCommand { get; }
+        public ICommand SetUserColorsCommand { get; }
 
         public IPrimitiveSet PrimitiveSet { get; set; }
         public IValueRange UserValueRange { get; set; }
+        public bool SetMinValue { get; set; }
+        public bool SetMaxValue { get; set; }
 
         private double dX, dY;
         private ColorMapsTypes _ColorMapType;
@@ -50,9 +53,12 @@ namespace FieldVisualizer.Windows.UserControls
             ZoomInCommand = new RelayCommand(o => Zoom(1.2), o => PrimitiveValidation());
             ZoomOutCommand = new RelayCommand(o => Zoom(0.8), o => PrimitiveValidation());
             ChangeColorMapCommand = new RelayCommand(o => ChangeColorMap(), o => PrimitiveValidation());
+            SetUserColorsCommand = new RelayCommand(o => ColorRefresh(), o => (SetMinValue || SetMaxValue));
             UserValueRange = new ValueRange() { BottomValue = 0, TopValue = 0 };
+            SetMinValue = false;
+            SetMaxValue = false;
         }
-        public void Refresh()
+        public void ColorRefresh()
         {
             if (PrimitiveValidation() == false) { return; }
             _ColorMap = ColorMapFactory.GetColorMap(_ColorMapType);
@@ -66,7 +72,6 @@ namespace FieldVisualizer.Windows.UserControls
         }
         private void ProcessPrimitives()
         {
-
             WorkPlaneCanvas.Children.Clear();
             double sizeX = PrimitiveOperations.GetSizeX(PrimitiveSet.ValuePrimitives);
             double sizeY = PrimitiveOperations.GetSizeY(PrimitiveSet.ValuePrimitives);
@@ -90,7 +95,7 @@ namespace FieldVisualizer.Windows.UserControls
                     Ellipse ellipse = ProcessCirclePrimitive(circlePrimitive);
                     WorkPlaneCanvas.Children.Add(ellipse);
                 }
-                else { throw new FieldVisulizerException(ErrorStrings.PrimitiveTypeIsUnknown);}
+                else { throw new FieldVisulizerException(ErrorStrings.PrimitiveTypeIsUnknown); }
             }
         }
         private Rectangle ProcessRectanglePrimitive(IRectanglePrimitive rectanglePrimitive)
@@ -133,7 +138,7 @@ namespace FieldVisualizer.Windows.UserControls
             shape.Tag = valuePrimitive;
             shape.Fill = brush;
             Canvas.SetLeft(shape, valuePrimitive.CenterX - addX - dX);
-            Canvas.SetTop(shape, - valuePrimitive.CenterY - addY - dY);
+            Canvas.SetTop(shape, -valuePrimitive.CenterY - addY - dY);
         }
         private void Zoom(double coefficient)
         {
@@ -149,7 +154,7 @@ namespace FieldVisualizer.Windows.UserControls
                 IColorMap colorMap = ColorMapFactory.GetColorMap(_ColorMapType);
             }
             catch (Exception ex) { _ColorMapType = 0; }
-            Refresh();
+            ColorRefresh();
         }
         private bool PrimitiveValidation()
         {
@@ -159,10 +164,24 @@ namespace FieldVisualizer.Windows.UserControls
         private void SetColor()
         {
             valueRange = PrimitiveOperations.GetValueRange(PrimitiveSet.ValuePrimitives);
-            if (cbMinValueEnabled.IsChecked == true) { valueRange.BottomValue = UserValueRange.BottomValue; } else { UserValueRange.BottomValue = valueRange.BottomValue; }
-            if (cbMaxValueEnabled.IsChecked == true) { valueRange.TopValue = UserValueRange.TopValue; } else { UserValueRange.TopValue = valueRange.TopValue; }
+            //if bottom value is greater than top value
+            if (SetMinValue
+                & SetMaxValue
+                & (UserValueRange.BottomValue > UserValueRange.TopValue))
+            {
+                UserValueRange.TopValue = UserValueRange.BottomValue;
+            }
+            if (SetMinValue) { valueRange.BottomValue = UserValueRange.BottomValue; } else { UserValueRange.BottomValue = valueRange.BottomValue; }
+            if (SetMaxValue) { valueRange.TopValue = UserValueRange.TopValue; } else { UserValueRange.TopValue = valueRange.TopValue; }
             _ValueRanges = ValueRangeOperations.DivideValueRange(valueRange, RangeNumber);
             _ValueColorRanges = ColorOperations.GetValueColorRanges(valueRange, _ValueRanges, _ColorMap);
         }
+
+        public void Refresh()
+        {
+            SetMinValue = false;
+            SetMaxValue = false;
+            ColorRefresh();
+        }
     }
 }