Changeset 17446 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/ArrayValueVM.cs

Timestamp:

02/20/20 16:58:03 (4 years ago)

Author:

dpiringe

Message:

#3026:

• made interfaces for array/matrix JsonItems and for their VMs aswell (IArrayJsonItem, IArrayJsonItemVM, IMatrixJsonItem, IMatrixJsonItemVM), incl. base classes (ArrayJsonItemBase, ArrayValueVM, MatrixJsonItemBase, MatrixValueVM)
• changed inheritance structure for already existing array/matrix JsonItems -> they inherit now from new base array/matrix base classes
• added input elements to configure the size of an matrix or array in JsonItemMultiValueControl (incl. VM binding and validation)
• splitted file JsonItems.cs into separate files for their corresponding types (IntJsonItems.cs, DoubleJsonItems.cs, BoolJsonItems.cs, StringJsonItem.cs, DateTimeJsonItem.cs)
• changed location of deserialization of json values from JsonTemplateInstantiator into IJsonItem (implemented in JsonItem and set to virtual, overridden in MatrixJsonItemBase and ArrayJsonItemBase)
• added new CLI argument StringArgument
• some little UI improvements (location fixes, anchor fixes, ...)

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/ArrayValueVM.cs (modified) (6 diffs)

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

@@ -8 +8 @@
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
 
-  public class DoubleArrayValueVM : ArrayValueVM<double> {
+  public class DoubleArrayValueVM : ArrayValueVM<double, DoubleArrayJsonItem> {
     public override Type JsonItemType => typeof(DoubleArrayJsonItem);
 
@@ -15 +15 @@
     protected override double MaxTypeValue => double.MaxValue;
 
-    public override JsonItemBaseControl GetControl() => 
+    public override JsonItemBaseControl Control =>
       new JsonItemDoubleArrayValueControl(this);
     
@@ -27 +27 @@
   }
 
-  public class IntArrayValueVM : ArrayValueVM<int> {
+  public class IntArrayValueVM : ArrayValueVM<int, IntArrayJsonItem> {
     public override Type JsonItemType => typeof(IntArrayJsonItem);
 
@@ -34 +34 @@
     protected override int MaxTypeValue => int.MaxValue;
 
-    public override JsonItemBaseControl GetControl() => 
+    public override JsonItemBaseControl Control =>
       new JsonItemIntArrayValueControl(this);
     
@@ -46 +46 @@
   }
 
-  public abstract class ArrayValueVM<T> : RangedValueBaseVM<T> {
+  public abstract class ArrayValueVM<T, JsonItemType> : RangedValueBaseVM<T>, IArrayJsonItemVM
+    where JsonItemType : IArrayJsonItem {
     
     public ArrayValueVM() { }
 
-    public void SetIndexValue(object obj, int index) {
+    public void SetIndexValue(T data, int index) {
       T[] tmp = Value;
       if(index >= tmp.Length) { // increasing array
@@ -57 +58 @@
         tmp = newArr;
       }
-      tmp[index] = (T)Convert.ChangeType(obj, typeof(T));
+      tmp[index] = data;
       Value = tmp;
     }
 
     public abstract T[] Value { get; set; }
+    public bool Resizable { 
+      get => ((IArrayJsonItem)Item).Resizable; 
+      set {
+        ((IArrayJsonItem)Item).Resizable = value;
+        OnPropertyChange(this, nameof(IArrayJsonItemVM.Resizable));
+      }
+    }
   }
 }