Changeset 17417 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/GenericJsonItem.cs

Timestamp:

02/03/20 15:13:35 (4 years ago)

Author:

dpiringe

Message:

#3026:

• added initial VM (ArrayValueVM) and control for array values (JsonItemArrayValueControl)
• new types of JsonItems for better type safety:
  • for arrays: DoubleArrayJsonItem, IntArrayJsonItem, BoolArrayJsonItem
  • for matrix: DoubleMatrixJsonItem, IntMatrixJsonItem, BoolMatrixJsonItem
• refactored ValueTypeArrayConverter and ValueTypeMatrixConverter -> better type safety with new JsonItems
• enhanced StringValueVM and implemented JsonItemValidValuesControl with MVVM architecture
• the VM of JsonItemBaseControl is now protected (was private)
• improved JsonItem<V,R> -> now handles JTokens correctly

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/GenericJsonItem.cs (modified) (2 diffs)

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

@@ -1 +1 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
@@ -11 +13 @@
   public class JsonItem<V,R> : JsonItem {
     public new V Value {
-      get => (V)Convert.ChangeType(base.Value, typeof(V));
+      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;
+      }
       set => base.Value = value;
     }
 
     public new IEnumerable<R> Range {
-      get => base.Range.Cast<R>();
+      get => base.Range?.Cast<R>();
       set => base.Range = value.Cast<object>();
     }