Changeset 17471 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs

Timestamp:

03/09/20 10:36:09 (5 years ago)

Author:

dpiringe

Message:

#3026:

• deleted INamedMatrixJsonItem and all corresponding classes/views, because of bad design
• added ILookupJsonItem and IValueLookupJsonItem (incl. all corresponding implementations, VMs, Views)
• added IResultJsonItem
• changed type of property Control from JsonItemBaseControl to UserControl in IJsonItemVM (because the details control now builds up with linked user controls -> allows better construction of dynamic controls)
• added all properties of INamedMatrixJsonItem in IMatrixJsonItem
• refactored a lot of views for better usage (TableLayoutPanel is used a lot now -> for better item positioning)
• property ActualName is now located in ILookupJsonItem instead of IJsonItem

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs (modified) (5 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ExportJsonDialog.cs

@@ -51 +51 @@
     private void InitCache() {
       JI2VM = new Dictionary<Type, Type>();
-      foreach (var vmType in ApplicationManager.Manager.GetTypes(typeof(JsonItemVMBase))) {
-        JsonItemVMBase vm = (JsonItemVMBase)Activator.CreateInstance(vmType);
+      foreach (var vmType in ApplicationManager.Manager.GetTypes(typeof(IJsonItemVM))) {
+        IJsonItemVM vm = (IJsonItemVM)Activator.CreateInstance(vmType);
         JI2VM.Add(vm.JsonItemType, vmType);
       }
@@ -96 +96 @@
         foreach (var c in item.Children) {
           if (IsDrawableItem(c)) {
-            if (c is ResultJsonItem) {
+            if (c is IResultJsonItem) {
               TreeNode childNode = new TreeNode(c.Name);
               treeViewResults.Nodes.Add(childNode);
@@ -113 +113 @@
 
     private void RegisterItem(TreeNode node, IJsonItem item, TreeView tv) {
-      if (JI2VM.TryGetValue(item.GetType(), out Type vmType)) {
+      if (JI2VM.TryGetValue(item.GetType(), out Type vmType)) { // TODO: enhance for interfaces?
         IJsonItemVM vm = (IJsonItemVM)Activator.CreateInstance(vmType);
 
@@ -123 +123 @@
         VMs.Add(vm);
         Node2VM.Add(node, vm);
-        UserControl control = vm.Control;
+        UserControl control = new JsonItemBaseControl(vm, vm.Control);
         Node2Control.Add(node, control);
+      } else {
+        //node.
       }
     }
@@ -136 +138 @@
       }
       
-      return b || (item.Value != null || item.Range != null || item.ActualName != null || item is ResultJsonItem);
+      return b || (item.Value != null || item.Range != null || item is ILookupJsonItem || item is IResultJsonItem);
     }