Changeset 17431 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models

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

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/GenericJsonItem.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/GenericJsonItem.cs

@@ -13 +13 @@
   public class JsonItem<V,R> : JsonItem {
     public new V Value {
-      get {
-        if(base.Value is IConvertible)
-          return (V)Convert.ChangeType(base.Value, typeof(V));
-
-        if(base.Value is JToken token)
-          return token.ToObject<V>();
-
-        return (V)base.Value;
-      }
+      get => ConvertObject(base.Value);
       set => base.Value = value;
     }
-
+    
     public new IEnumerable<R> Range {
       get => base.Range?.Cast<R>();
       set => base.Range = value.Cast<object>();
     }
+
+    private V ConvertObject(object obj) {
+      if (obj is IConvertible)
+        return (V)Convert.ChangeType(obj, typeof(V));
+
+      if (obj is JToken token)
+        return token.ToObject<V>();
+
+      return (V)obj;
+    }
   }
 }