Delete IValueConverterNS. Fix GridLine bug

zenjia · Jan 1, 2021 · e77861d · e77861d
1 parent 44673c3
commit e77861d
Show file tree

Hide file tree

Showing 33 changed files with 925 additions and 492 deletions.
diff --git a/CommonLib/Axis/AxisItem/AxisItemDrawingParam.cs b/CommonLib/Axis/AxisItem/AxisItemDrawingParam.cs
diff --git a/CommonLib/Axis/AxisItem/IAxisItem.cs b/CommonLib/Axis/AxisItem/IAxisItem.cs
@@ -5,16 +5,7 @@ namespace MvvmCharting.Axis
 {
     public interface IAxisItem: IPlottable_1D
     {
-        /// <summary>
-        /// Accept change of Axis placement
-        /// </summary>
-        /// <param name="newValue"></param>
-        void SetAxisPlacement(AxisPlacement newValue);
+        object DataContext { get; }
 
-        /// <summary>
-        /// Accept change of Axis <see cref="LabelTextConverter"/>
-        /// </summary>
-        /// <param name="newValue"></param>
-        void SetLabelTextConverter(IValueConverterNS newValue);
     }
 }
diff --git a/CommonLib/Axis/CategoryAxisDrawingSettings.cs b/CommonLib/Axis/CategoryAxisDrawingSettings.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using MvvmCharting.Common;
+
+namespace MvvmCharting.Axis
+{
+    public class CategoryAxisDrawingSettings : ICategoryAxisDrawingSettings
+    {
+
+
+        #region input values 
+
+        public IList<object> PlottingItemValues { get;  }
+
+        public double PlottingLength { get; }
+        #endregion
+
+        #region generated values
+
+        public double ActualTickInterval { get; }
+
+        public int ActualTickCount { get; }
+
+        #endregion
+
+        public CategoryAxisDrawingSettings(int tickInterval, IList<object> plottingItemValues, double plottingLength)
+        {
+            if (plottingItemValues == null)
+            {
+                return;
+            }
+
+            this.PlottingItemValues = plottingItemValues;
+
+
+            this.PlottingLength = plottingLength;
+
+            //calculated state:
+            this.ActualTickInterval = tickInterval;
+
+            this.ActualTickCount = (int)Math.Floor(plottingItemValues.Count / this.ActualTickInterval) + 1;
+        }
+
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as CategoryAxisDrawingSettings;
+            if (other == null)
+            {
+                return false;
+            }
+
+            return this.PlottingLength.NearlyEqual(other.PlottingLength, 0.0001) &&
+                   this.PlottingItemValues?.Count == other.PlottingItemValues?.Count &&
+                   (this.PlottingItemValues != null && this.PlottingItemValues.SequenceEqual(other.PlottingItemValues)) &&
+                   this.ActualTickCount == other.ActualTickCount &&
+                   this.ActualTickInterval == other.ActualTickInterval;
+        }
+
+        public bool CanUpdateAxisItems()
+        {
+
+            return !this.PlottingLength.IsNaNOrZero() && !this.ActualTickInterval.IsNaNOrZero();
+        }
+
+        public bool CanUpdateAxisItemsCoordinate()
+        {
+            return !this.PlottingLength.IsNaNOrZero() && this.PlottingItemValues?.Count > 0;
+        }
+
+    }
+}
diff --git a/CommonLib/Axis/DefaultDoubleToAxisLabelTextConverter.cs b/CommonLib/Axis/DefaultDoubleToAxisLabelTextConverter.cs
diff --git a/CommonLib/Axis/DefaultObjectToAxisLabelTextConverter.cs b/CommonLib/Axis/DefaultObjectToAxisLabelTextConverter.cs
diff --git a/CommonLib/Axis/IAxisNS.cs b/CommonLib/Axis/IAxisNS.cs
@@ -21,9 +21,6 @@ public interface IAxisNS
         int TickCount { get; set; }
 
 
-        /// <summary>
-        /// User provided converters for convert value to the LabelText of an <see cref="IAxisItem"/>.
-        /// </summary>
-        IValueConverterNS LabelTextConverter { get; set; }
+
     }
 }
diff --git a/CommonLib/Axis/IXAxisOwner.cs b/CommonLib/Axis/IXAxisOwner.cs
@@ -6,7 +6,7 @@ public interface IXAxisOwner : IAxisOwner
     {
 
 
-        event Action<PlottingSettings> HorizontalSettingChanged;
+        event Action<PlottingSettingsBase> HorizontalSettingChanged;
 
 
     }

diff --git a/CommonLib/Axis/IYAxisOwner.cs b/CommonLib/Axis/IYAxisOwner.cs
@@ -6,6 +6,6 @@ public interface IYAxisOwner : IAxisOwner
     {
 
 
-        event Action<PlottingSettings> VerticalSettingChanged;
+        event Action<PlottingSettingsBase> VerticalSettingChanged;
     }
 }
diff --git a/CommonLib/Axis/AxisDrawingSettings.cs → CommonLib/Axis/NumericAxisDrawingSettings.cs b/CommonLib/Axis/AxisDrawingSettings.cs → CommonLib/Axis/NumericAxisDrawingSettings.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using MvvmCharting.Common;
 
 namespace MvvmCharting.Axis
@@ -7,26 +8,27 @@ public interface IAxisDrawingSettingsBase
     {
         double PlottingLength { get; }
 
-         double ActualTickInterval { get; }
+        double ActualTickInterval { get; }
 
-         int ActualTickCount { get; }
+        int ActualTickCount { get; }
 
-         bool CanUpdateAxisItems();
+        bool CanUpdateAxisItems();
 
-         bool CanUpdateAxisItemsCoordinate();
+        bool CanUpdateAxisItemsCoordinate();
     }
 
-    public interface ILinearAxisDrawingSettings: IAxisDrawingSettingsBase
+    public interface INumericAxisDrawingSettings : IAxisDrawingSettingsBase
     {
         Range PlottingDataRange { get; }
     }
 
     public interface ICategoryAxisDrawingSettings : IAxisDrawingSettingsBase
     {
-
+        IList<object> PlottingItemValues { get; }
     }
 
-    public class AxisDrawingSettings: ILinearAxisDrawingSettings
+
+    public class NumericAxisDrawingSettings : INumericAxisDrawingSettings
     {
         public override string ToString()
         {
@@ -42,25 +44,25 @@ public override string ToString()
 
         #region generated values
 
-        public double ActualTickInterval { get; } 
+        public double ActualTickInterval { get; }
 
         public int ActualTickCount { get; }
 
         #endregion
 
-        public AxisDrawingSettings(int tickCount, double tickInterval, Range range, double plottingLength)
+        public NumericAxisDrawingSettings(int tickCount, double tickInterval, Range range, double plottingLength)
         {
 
-            if (tickCount<0 || tickCount>ushort.MaxValue)
+            if (tickCount < 0 || tickCount > ushort.MaxValue)
             {
                 throw new NotSupportedException();
             }
 
- 
+
 
             this.PlottingDataRange = range;
 
- 
+
             this.PlottingLength = plottingLength;
 
             //calculated state:
@@ -71,28 +73,28 @@ public AxisDrawingSettings(int tickCount, double tickInterval, Range range, doub
 
         public override bool Equals(object obj)
         {
-            var other = obj as AxisDrawingSettings;
+            var other = obj as NumericAxisDrawingSettings;
             if (other == null)
             {
                 return false;
             }
 
-            return this.PlottingLength.NearlyEqual(other.PlottingLength, 0.0001) && 
-                   this.PlottingDataRange==other.PlottingDataRange &&
+            return this.PlottingLength.NearlyEqual(other.PlottingLength, 0.0001) &&
+                   this.PlottingDataRange == other.PlottingDataRange &&
                    this.ActualTickCount == other.ActualTickCount &&
                    this.ActualTickInterval == other.ActualTickInterval;
         }
 
         public bool CanUpdateAxisItems()
         {
- 
+
             return !this.PlottingLength.IsNaNOrZero() && !this.ActualTickInterval.IsNaNOrZero();
         }
 
         public bool CanUpdateAxisItemsCoordinate()
         {
             return !this.PlottingLength.IsNaNOrZero() && !this.PlottingDataRange.Span.IsNaNOrZero();
         }
- 
+
     }
 }