Changeset 17420 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/RangeVM.cs

Timestamp:

02/03/20 17:32:50 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored ranged based VMs -> created new 'base' class for ranged based VMs RangedValueBaseVM
• renamed AddChilds to AddChildren
• implemented ArrayValueVM and JsonItemArrayValueControl
• added ranges for array and matrix values

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/RangeVM.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/RangeVM.cs

@@ -9 +9 @@
 
   public class IntRangeVM : RangeVM<int> {
-    public override Type JsonItemType => typeof(IntArrayJsonItem); 
-  }
+    public override Type JsonItemType => typeof(IntRangeJsonItem);
 
-  public class DoubleRangeVM : RangeVM<double> {
-    public override Type JsonItemType => typeof(DoubleArrayJsonItem);
+    protected override int MinTypeValue => int.MinValue;
+
+    protected override int MaxTypeValue => int.MaxValue;
+
     public override JsonItemBaseControl GetControl() =>
       new JsonItemRangeControl(this);
   }
 
-  public abstract class RangeVM<T> : JsonItemVMBase {
+  public class DoubleRangeVM : RangeVM<double> {
+    public override Type JsonItemType => typeof(DoubleRangeJsonItem);
+
+    protected override double MinTypeValue => double.MinValue;
+
+    protected override double MaxTypeValue => double.MaxValue;
+
+    public override JsonItemBaseControl GetControl() =>
+      new JsonItemRangeControl(this);
+  }
+
+  public abstract class RangeVM<T> : RangedValueBaseVM<T> {
 
     public T MinValue {
@@ -36 +48 @@
     }
 
-    public T MinRange {
-      get => Cast(Item.Range.First());
-      set {
-        SetRange(value, Item.Range.Last());
-        OnPropertyChange(this, nameof(MinRange));
-      }
-    }
-
-    public T MaxRange {
-      get => Cast(Item.Range.Last());
-      set {
-        SetRange(Item.Range.First(), value);
-        OnPropertyChange(this, nameof(MaxRange));
-      }
-    }
-
-    private T Cast(object obj) => (T)Convert.ChangeType(obj, typeof(T));
-
     private void SetValue(object min, object max) =>
       Item.Value = new object[] { min, max };
-
-    private void SetRange(object min, object max) =>
-      Item.Range = new object[] { min, max };
   }
 }