Changeset 17411 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels

Timestamp:

01/28/20 16:21:53 (5 years ago)

Author:

dpiringe

Message:

#3026:

• deleted JsonItemVM
• reduced code duplicates in JsonItemValueControl
• implemented logic for entering ranges -> automatically sets to min/max value of datatype when checkbox is not checked

Location:

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

Files:

• JsonItemVM.cs (deleted)
• JsonItemVMBase.cs (modified) (1 diff)
• RangeVM.cs (modified) (1 diff)
• SingleValueVM.cs (modified) (5 diffs)
• StringValueVM.cs (modified) (1 diff)

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

@@ -7 +7 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-  public abstract class JsonItemVMBase : INotifyPropertyChanged {
+  public class JsonItemVMBase : INotifyPropertyChanged {
     public event PropertyChangedEventHandler PropertyChanged;
     public IJsonItem Item { get; set; }

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

@@ -18 +18 @@
   }
 
-  public abstract class RangeVM<T> : JsonItemVM {
+  public abstract class RangeVM<T> : JsonItemVMBase {
 
     public T MinValue {

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

@@ -10 +10 @@
   public class IntValueVM : SingleValueVM<int> {
     public override Type JsonItemType => typeof(IntJsonItem);
+
+    protected override int MinTypeValue => int.MinValue;
+    protected override int MaxTypeValue => int.MaxValue;
+
     public override JsonItemBaseControl GetControl() =>
       new JsonItemIntValueControl(this);
@@ -15 +19 @@
 
   public class DoubleValueVM : SingleValueVM<double> {
-    public override Type JsonItemType => typeof(DoubleJsonItem); 
+    public override Type JsonItemType => typeof(DoubleJsonItem);
+
+    protected override double MinTypeValue => double.MinValue;
+    protected override double MaxTypeValue => double.MaxValue;
+
     public override JsonItemBaseControl GetControl() =>
        new JsonItemDoubleValueControl(this);
@@ -22 +30 @@
   public class BoolValueVM : SingleValueVM<bool> {
     public override Type JsonItemType => typeof(BoolJsonItem);
+
+    protected override bool MinTypeValue => false;
+    protected override bool MaxTypeValue => true;
+
     public override JsonItemBaseControl GetControl() =>
        new JsonItemBoolControl(this);
   }
 
-  public abstract class SingleValueVM<T> : JsonItemVM {
+  public abstract class SingleValueVM<T> : JsonItemVMBase {
     
     public T Value { 
@@ -52 +64 @@
     }
 
+    private bool enableMinRange = false;
+    public bool EnableMinRange {
+      get => enableMinRange;
+      set {
+        enableMinRange = value;
+        if (!enableMinRange)
+          MinRange = MinTypeValue;
+        OnPropertyChange(this, nameof(EnableMinRange));
+      }
+    }
+
+    private bool enableMaxRange = false;
+    public bool EnableMaxRange {
+      get => enableMaxRange;
+      set {
+        enableMaxRange = value;
+        if (!enableMaxRange)
+          MaxRange = MaxTypeValue;
+        OnPropertyChange(this, nameof(EnableMaxRange));
+      }
+    }
+
     private T Cast(object obj) => (T)Convert.ChangeType(obj, typeof(T));
 
@@ -59 +93 @@
     }
 
+    protected abstract T MinTypeValue { get; }
+    protected abstract T MaxTypeValue { get; }
   }
 }

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

@@ -6 +6 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-  public class StringValueVM : JsonItemVM {
+  public class StringValueVM : JsonItemVMBase {
     public override Type JsonItemType => typeof(StringJsonItem);
     public override JsonItemBaseControl GetControl() =>