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

Timestamp:

02/10/20 16:46:09 (5 years ago)

Author:

dpiringe

Message:

#3026:

• renamed JsonItemArrayValueControl to JsonItemMultiValueControl
• extracted converter logic from property Value in JsonItem<V,R> into new private method ConvertObject
• added references to TreeNode and TreeView in JsonItemVMBase -> for additional user feedback when enabling/disabling an item (changes the fore color of referenced node)
• changed implementation and interplay between ArrayValueVM and JsonItemMultiValueControl -> removed the direct access of property DataSource of DataGridView -> now: dynamically adds new columns/rows and accesses grid cells manually (better handling with matrices)
• added new VM MatrixValueVM

Location:

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

Files:

• ArrayValueVM.cs (modified) (2 diffs)
• JsonItemVMBase.cs (modified) (3 diffs)
• MatrixValueVM.cs (added)

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

@@ -16 +16 @@
 
     public override JsonItemBaseControl GetControl() => new JsonItemDoubleArrayValueControl(this);
-
-    protected override void OnItemChanged() {
-      IList<IndexedArrayValueVM> list = new List<IndexedArrayValueVM>();
-      var arr = ((DoubleArrayJsonItem)Item).Value;
-      for(int i = 0; i < arr.Length; ++i) {
-        list.Add(new IndexedArrayValueVM(arr, i));
+    
+    public override double[] Value {
+      get => ((DoubleArrayJsonItem)Item).Value;
+      set {
+        ((DoubleArrayJsonItem)Item).Value = value;
+        OnPropertyChange(this, nameof(Value));
       }
-      Value = list.ToArray();
     }
   }
@@ -35 +34 @@
 
     public override JsonItemBaseControl GetControl() => new JsonItemIntArrayValueControl(this);
-
-    protected override void OnItemChanged() {
-      IList<IndexedArrayValueVM> list = new List<IndexedArrayValueVM>();
-      var arr = ((IntArrayJsonItem)Item).Value;
-      for (int i = 0; i < arr.Length; ++i) {
-        list.Add(new IndexedArrayValueVM(arr, i));
+    
+    public override int[] Value {
+      get => ((IntArrayJsonItem)Item).Value;
+      set {
+        ((IntArrayJsonItem)Item).Value = value;
+        OnPropertyChange(this, nameof(Value));
       }
-      Value = list.ToArray();
     }
   }
 
   public abstract class ArrayValueVM<T> : RangedValueBaseVM<T> {
-
-    public class IndexedArrayValueVM : INotifyPropertyChanged {
-      private T[] arr;
-      private int index;
-
-      public IndexedArrayValueVM(T[] arr, int index) {
-        this.arr = arr;
-        this.index = index;
-      }
-
-      public T Value {
-        get => arr[index];
-        set {
-          arr[index] = value;
-          PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
-        }
-      }
-
-      public event PropertyChangedEventHandler PropertyChanged;
+    
+    public ArrayValueVM() {
+      //base.ItemChanged += OnItemChanged;
     }
 
-    public ArrayValueVM() {
-      base.ItemChanged += OnItemChanged;
+    public void SetIndexValue(object obj, int index) {
+      T[] tmp = Value;
+      if(index >= tmp.Length) { // increasing array
+        T[] newArr = new T[index+1];
+        Array.Copy(tmp, 0, newArr, 0, tmp.Length);
+        tmp = newArr;
+      }
+      tmp[index] = (T)Convert.ChangeType(obj, typeof(T));
+      Value = tmp;
     }
 
-    protected abstract void OnItemChanged();
-
-    IndexedArrayValueVM[] vms;
-    public IndexedArrayValueVM[] Value {
-      get => vms; 
-      set {
-        vms = value;
-        OnPropertyChange(this, nameof(Value));
-      } 
-    }
+    public abstract T[] Value { get; set; }
   }
 }

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
@@ -19 +21 @@
       }
     }
+
+    public TreeNode TreeNode { get; set; }
+    public TreeView TreeView { get; set; }
 
     protected void OnPropertyChange(object sender, string propertyName) {
@@ -37 +42 @@
       set {
         selected = value;
+        if(TreeNode != null)
+          TreeNode.ForeColor = (selected ? Color.Black : Color.Red);
+        if (TreeView != null)
+          TreeView.Refresh();
         OnPropertyChange(this, nameof(Selected));
       }