Changeset 18059 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration

Timestamp:

09/23/21 13:03:53 (3 years ago)

Author:

dpiringe

Message:

#3026

• removed/renamed all interfaces, classes and views related to results (are replaced by RunCollectionModifiers)
• fixed a bug in JsonTemplateInstantiator to prevent errors for opening templates without a defined property for RunCollectionModifiers

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration

Files:

• HeuristicLab.JsonInterface.OptimizerIntegration.csproj (modified) (3 diffs)
• ViewModels/ResultItemVM.cs (deleted)
• Views/ExportJsonDialog.Designer.cs (modified) (9 diffs)
• Views/ExportJsonDialog.cs (modified) (8 diffs)
• Views/ResultJsonItemControl.Designer.cs (deleted)
• Views/ResultJsonItemControl.cs (deleted)
• Views/ResultJsonItemControl.resx (deleted)
• Views/RunCollectionModifierControl.Designer.cs (moved) (moved from branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ResultCollectionPostProcessorControl.Designer.cs) (1 diff)
• Views/RunCollectionModifierControl.cs (moved) (moved from branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/ResultCollectionPostProcessorControl.cs) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/HeuristicLab.JsonInterface.OptimizerIntegration.csproj

@@ -134 +134 @@
     <Compile Include="ViewModels\RangedValueBaseVM.cs" />
     <Compile Include="ViewModels\RangeVM.cs" />
-    <Compile Include="ViewModels\ResultItemVM.cs" />
     <Compile Include="ViewModels\SingleValueVM.cs" />
     <Compile Include="ViewModels\StringValueVM.cs" />
@@ -155 +154 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Views\ResultCollectionPostProcessorControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\ResultCollectionPostProcessorControl.Designer.cs">
-      <DependentUpon>ResultCollectionPostProcessorControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ResultJsonItemControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Views\ResultJsonItemControl.Designer.cs">
-      <DependentUpon>ResultJsonItemControl.cs</DependentUpon>
+    <Compile Include="Views\RunCollectionModifierControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\RunCollectionModifierControl.Designer.cs">
+      <DependentUpon>RunCollectionModifierControl.cs</DependentUpon>
     </Compile>
     <Compile Include="Views\ValueLookupJsonItemControl.cs">
@@ -241 +234 @@
     <EmbeddedResource Include="Views\ExportJsonDialog.resx">
       <DependentUpon>ExportJsonDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Views\ResultJsonItemControl.resx">
-      <DependentUpon>ResultJsonItemControl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Views\ValueLookupJsonItemControl.resx">

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

@@ -34 +34 @@
       this.groupBoxDetails = new System.Windows.Forms.GroupBox();
       this.panelParameterDetails = new System.Windows.Forms.Panel();
-      this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-      this.treeViewResults = new System.Windows.Forms.TreeView();
-      this.groupBox = new System.Windows.Forms.GroupBox();
-      this.panelResultDetails = new System.Windows.Forms.Panel();
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
       this.tabControl1 = new System.Windows.Forms.TabControl();
       this.tabPage1 = new System.Windows.Forms.TabPage();
       this.tabPage2 = new System.Windows.Forms.TabPage();
-      this.tabPage3 = new System.Windows.Forms.TabPage();
-      this.postProcessorListControl = new HeuristicLab.JsonInterface.OptimizerIntegration.ResultCollectionPostProcessorControl();
+      this.postProcessorListControl = new HeuristicLab.JsonInterface.OptimizerIntegration.RunCollectionModifierControl();
       this.label1 = new System.Windows.Forms.Label();
       this.textBoxTemplateName = new System.Windows.Forms.TextBox();
@@ -49 +44 @@
       this.jsonItemBindingSource = new System.Windows.Forms.BindingSource(this.components);
       this.groupBoxDetails.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
-      this.splitContainer1.Panel1.SuspendLayout();
-      this.splitContainer1.Panel2.SuspendLayout();
-      this.splitContainer1.SuspendLayout();
-      this.groupBox.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
       this.splitContainer2.Panel1.SuspendLayout();
@@ -61 +51 @@
       this.tabPage1.SuspendLayout();
       this.tabPage2.SuspendLayout();
-      this.tabPage3.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.jsonItemBindingSource)).BeginInit();
@@ -113 +102 @@
       this.panelParameterDetails.TabIndex = 0;
       // 
-      // splitContainer1
-      // 
-      this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.splitContainer1.Location = new System.Drawing.Point(3, 3);
-      this.splitContainer1.Name = "splitContainer1";
-      // 
-      // splitContainer1.Panel1
-      // 
-      this.splitContainer1.Panel1.Controls.Add(this.treeViewResults);
-      this.splitContainer1.Panel1.Padding = new System.Windows.Forms.Padding(0, 6, 0, 1);
-      // 
-      // splitContainer1.Panel2
-      // 
-      this.splitContainer1.Panel2.Controls.Add(this.groupBox);
-      this.splitContainer1.Size = new System.Drawing.Size(796, 499);
-      this.splitContainer1.SplitterDistance = 380;
-      this.splitContainer1.TabIndex = 7;
-      // 
-      // treeViewResults
-      // 
-      this.treeViewResults.CheckBoxes = true;
-      this.treeViewResults.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.treeViewResults.Location = new System.Drawing.Point(0, 6);
-      this.treeViewResults.Name = "treeViewResults";
-      this.treeViewResults.Size = new System.Drawing.Size(380, 492);
-      this.treeViewResults.TabIndex = 6;
-      this.treeViewResults.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.treeViewResults_AfterCheck);
-      this.treeViewResults.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeViewResults_AfterSelect);
-      // 
-      // groupBox
-      // 
-      this.groupBox.Controls.Add(this.panelResultDetails);
-      this.groupBox.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.groupBox.Location = new System.Drawing.Point(0, 0);
-      this.groupBox.Name = "groupBox";
-      this.groupBox.Size = new System.Drawing.Size(412, 499);
-      this.groupBox.TabIndex = 5;
-      this.groupBox.TabStop = false;
-      this.groupBox.Text = "Details";
-      // 
-      // panelResultDetails
-      // 
-      this.panelResultDetails.AutoScroll = true;
-      this.panelResultDetails.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.panelResultDetails.Location = new System.Drawing.Point(3, 16);
-      this.panelResultDetails.Name = "panelResultDetails";
-      this.panelResultDetails.Size = new System.Drawing.Size(406, 480);
-      this.panelResultDetails.TabIndex = 0;
-      // 
       // splitContainer2
       // 
@@ -187 +127 @@
       this.tabControl1.Controls.Add(this.tabPage1);
       this.tabControl1.Controls.Add(this.tabPage2);
-      this.tabControl1.Controls.Add(this.tabPage3);
       this.tabControl1.Location = new System.Drawing.Point(12, 38);
       this.tabControl1.Name = "tabControl1";
@@ -207 +146 @@
       // tabPage2
       // 
-      this.tabPage2.Controls.Add(this.splitContainer1);
+      this.tabPage2.Controls.Add(this.postProcessorListControl);
       this.tabPage2.Location = new System.Drawing.Point(4, 22);
       this.tabPage2.Name = "tabPage2";
-      this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
       this.tabPage2.Size = new System.Drawing.Size(802, 505);
-      this.tabPage2.TabIndex = 1;
-      this.tabPage2.Text = "Results";
+      this.tabPage2.TabIndex = 2;
+      this.tabPage2.Text = "Result Collection Modifiers";
       this.tabPage2.UseVisualStyleBackColor = true;
-      // 
-      // tabPage3
-      // 
-      this.tabPage3.Controls.Add(this.postProcessorListControl);
-      this.tabPage3.Location = new System.Drawing.Point(4, 22);
-      this.tabPage3.Name = "tabPage3";
-      this.tabPage3.Size = new System.Drawing.Size(802, 505);
-      this.tabPage3.TabIndex = 2;
-      this.tabPage3.Text = "Result Collection Modifiers";
-      this.tabPage3.UseVisualStyleBackColor = true;
       // 
       // postProcessorListControl
@@ -281 +209 @@
       this.Text = "Export Json";
       this.groupBoxDetails.ResumeLayout(false);
-      this.splitContainer1.Panel1.ResumeLayout(false);
-      this.splitContainer1.Panel2.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
-      this.splitContainer1.ResumeLayout(false);
-      this.groupBox.ResumeLayout(false);
       this.splitContainer2.Panel1.ResumeLayout(false);
       this.splitContainer2.Panel2.ResumeLayout(false);
@@ -293 +216 @@
       this.tabPage1.ResumeLayout(false);
       this.tabPage2.ResumeLayout(false);
-      this.tabPage3.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.jsonItemBindingSource)).EndInit();
@@ -312 +234 @@
     private System.Windows.Forms.TabControl tabControl1;
     private System.Windows.Forms.TabPage tabPage1;
-    private System.Windows.Forms.TabPage tabPage2;
-    private System.Windows.Forms.TreeView treeViewResults;
     private System.Windows.Forms.Label label1;
     private System.Windows.Forms.TextBox textBoxTemplateName;
     private System.Windows.Forms.ErrorProvider errorProvider;
-    private System.Windows.Forms.SplitContainer splitContainer1;
-    private System.Windows.Forms.GroupBox groupBox;
-    private System.Windows.Forms.Panel panelResultDetails;
-    private System.Windows.Forms.TabPage tabPage3;
-    private ResultCollectionPostProcessorControl postProcessorListControl;
+    private System.Windows.Forms.TabPage tabPage2;
+    private RunCollectionModifierControl postProcessorListControl;
   }
 }

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

@@ -30 +30 @@
       set {
         content = value;
-        //CheckedItemListView
         #region Clear
         VMs = new List<IJsonItemVM>();
         treeView.Nodes.Clear();
-        treeViewResults.Nodes.Clear();
         #endregion
         Optimizer = content as IOptimizer;
@@ -46 +44 @@
           treeView.ExpandAll();
           panelParameterDetails.Controls.Clear();
-          panelResultDetails.Controls.Clear();
         }
       } 
@@ -61 +58 @@
     public ExportJsonDialog() {
       InitializeComponent();
-      this.RunCollectionModifiers = this.postProcessorListControl.Content;
-      this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
+      RunCollectionModifiers = postProcessorListControl.Content;
+      Icon = Common.Resources.HeuristicLab.Icon;
       InitCache();
     }
@@ -74 +71 @@
       if (FolderBrowserDialog.ShowDialog() == DialogResult.OK) {
         try {
-          //foreach(var x in PostProcessors.CheckedItems)
-            
           JsonTemplateGenerator.GenerateTemplate(
             Path.Combine(FolderBrowserDialog.SelectedPath, textBoxTemplateName.Text), 
@@ -92 +87 @@
           if (IsDrawableItem(c)) {
             TreeNode childNode = new TreeNode(c.Name);
-            if (c is IResultJsonItem) {
-              treeViewResults.Nodes.Add(childNode);
-              IJsonItemVM vm = RegisterItem(childNode, c, treeViewResults);
-              if (vm != null) vm.Selected = true;              
-            } else {
-              node.Nodes.Add(childNode);
-              BuildTreeNode(childNode, c);
-            }
+            node.Nodes.Add(childNode);
+            BuildTreeNode(childNode, c);
           }
         }
@@ -128 +117 @@
     private bool IsDrawableItem(IJsonItem item) {
       bool b = false;
-      if (item.Children != null) {
-        foreach (var c in item.Children) {
+      if (item.Children != null)
+        foreach (var c in item.Children)
           b = b || IsDrawableItem(c);
-        }
-      }
       
       return b || !(item is EmptyJsonItem) || !(item is UnsupportedJsonItem);
@@ -140 +127 @@
       if(Node2Control.TryGetValue(treeView.SelectedNode, out UserControl control)) {
         SetControlOnPanel(control, panelParameterDetails);
-      }
-    }
-
-    private void treeViewResults_AfterSelect(object sender, TreeViewEventArgs e) {
-      if (Node2Control.TryGetValue(treeViewResults.SelectedNode, out UserControl control)) {
-        SetControlOnPanel(control, panelResultDetails);
       }
     }
@@ -171 +152 @@
 
     private void TreeView_AfterCheck(object sender, TreeViewEventArgs e) {
-      if (e.Action != TreeViewAction.Unknown) {
-        if (Node2VM.TryGetValue(e.Node, out IJsonItemVM vm)) {
+      if (e.Action != TreeViewAction.Unknown)
+        if (Node2VM.TryGetValue(e.Node, out IJsonItemVM vm))
           vm.Selected = e.Node.Checked;
-        }
-      }
     }
 
     private void treeViewResults_AfterCheck(object sender, TreeViewEventArgs e) {
-      if (e.Action != TreeViewAction.Unknown) {
-        if (Node2VM.TryGetValue(e.Node, out IJsonItemVM vm)) {
+      if (e.Action != TreeViewAction.Unknown)
+        if (Node2VM.TryGetValue(e.Node, out IJsonItemVM vm))
           vm.Selected = e.Node.Checked;
-        }
-      }
     }
   }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Views/RunCollectionModifierControl.Designer.cs

@@ -1 +1 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-  partial class ResultCollectionPostProcessorControl {
+  partial class RunCollectionModifierControl {
     /// <summary> 
     /// Erforderliche Designervariable.

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

@@ -12 +12 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-  public partial class ResultCollectionPostProcessorControl : Core.Views.CheckedItemListView<IRunCollectionModifier> {
-    public ResultCollectionPostProcessorControl() {
+  public partial class RunCollectionModifierControl : Core.Views.CheckedItemListView<IRunCollectionModifier> {
+    public RunCollectionModifierControl() {
       InitializeComponent();
     }