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

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, ...)

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models

Files:

• ArrayJsonItemBase.cs (added)
• BoolJsonItems.cs (added)
• DateTimeJsonItem.cs (added)
• DoubleJsonItems.cs (added)
• IntJsonItems.cs (added)
• JsonItem.cs (modified) (2 diffs)
• JsonItems.cs (deleted)
• MatrixJsonItemBase.cs (added)
• StringJsonItem.cs (added)

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

@@ -5 +5 @@
 using System.Text;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
@@ -114 +115 @@
     public void FixatePath() => fixedPath = Path;
     public void LoosenPath() => fixedPath = "";
+
+    public virtual void SetFromJObject(JObject jObject) {
+      Value = jObject[nameof(IJsonItem.Value)]?.ToObject<object>();
+      Range = jObject[nameof(IJsonItem.Range)]?.ToObject<object[]>();
+      ActualName = jObject[nameof(IJsonItem.ActualName)]?.ToString();
+    }
     #endregion