Changeset 17446 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/MatrixValueVM.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/MatrixValueVM.cs (modified) (4 diffs)

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

@@ -8 +8 @@
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
 
-  public class DoubleMatrixValueVM : MatrixValueVM<double> {
+  public class DoubleMatrixValueVM : MatrixValueVM<double, DoubleMatrixJsonItem> {
     public override Type JsonItemType => typeof(DoubleMatrixJsonItem);
-    public override JsonItemBaseControl GetControl() => 
+    public override JsonItemBaseControl Control =>
       new JsonItemDoubleMatrixValueControl(this);
 
@@ -26 +26 @@
   }
 
-  public abstract class MatrixValueVM<T> : RangedValueBaseVM<T> {
+  public abstract class MatrixValueVM<T, JsonItemType> : RangedValueBaseVM<T>, IMatrixJsonItemVM
+    where JsonItemType : IMatrixJsonItem {
+    public abstract T[][] Value { get; set; }
+    public bool RowsResizable {
+      get => ((IMatrixJsonItem)Item).RowsResizable; 
+      set {
+        ((IMatrixJsonItem)Item).RowsResizable = value;
+        OnPropertyChange(this, nameof(RowsResizable));
+      }
+    }
 
-    public MatrixValueVM() {}
-    public void SetCellValue(object obj, int col, int row) {
+    public bool ColumnsResizable {
+      get => ((IMatrixJsonItem)Item).ColumnsResizable;
+      set {
+        ((IMatrixJsonItem)Item).ColumnsResizable = value;
+        OnPropertyChange(this, nameof(ColumnsResizable));
+      }
+    }
+
+    public void SetCellValue(T data, int row, int col) {
+      
       T[][] tmp = Value;
       
+      // increase y
       if (row >= tmp.Length) { // increasing array
         T[][] newArr = new T[row + 1][];
@@ -38 +56 @@
         tmp = newArr;
       }
+
+      // increase x
       for(int i = 0; i < tmp.Length; ++i) {
         if(col >= tmp[i].Length) {
@@ -45 +65 @@
         }
       }
-      tmp[row][col] = (T)Convert.ChangeType(obj.ToString().Replace(",","."), 
-                                            typeof(T), 
-                                            System.Globalization.CultureInfo.InvariantCulture);
+
+      tmp[row][col] = data;
       Value = tmp;
     }
-
-    public abstract T[][] Value { get; set; }
-
   }
 }