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

Timestamp:

09/08/21 15:53:37 (3 years ago)

Author:

dpiringe

Message:

#3026

• added a new protected virtual property in CheckedItemListView to be able to change the text of the groupBox
• removed event handling in ResultCollectionPostProcessorControl and overwrote the new property GroupBoxText
• added a new section in ExportJsonDialog for result collection processors
• renamed IResultCollectionPostProcessor to IResultCollectionProcessor + all connected classes
• added/changed the workflow of ResultCollectionProcessors in JsonTemplateGenerator and JsonTemplateInstantiator
  • also changed Constants.cs -> added a new section in template ResultCollectionProcessorItems

Location:

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

Files:

• ExportJsonDialog.Designer.cs (modified) (1 diff)
• ExportJsonDialog.cs (modified) (1 diff)
• ResultCollectionPostProcessorControl.cs (modified) (1 diff)

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

@@ -177 +177 @@
       // postProcessorListView
       this.postProcessorListControl = new ResultCollectionPostProcessorControl();
-      this.postProcessorListControl.Content = new CheckedItemList<IResultCollectionPostProcessor>();
-      this.postProcessorListControl.Content.Add(new SymRegPythonPostProcessor());
+      this.postProcessorListControl.Content = new CheckedItemList<IResultCollectionProcessor>();
       this.postProcessorListControl.Location = new System.Drawing.Point(0, 6);
       this.postProcessorListControl.Dock = System.Windows.Forms.DockStyle.Fill;

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

@@ -22 +22 @@
     private IOptimizer Optimizer { get; set; }
     private IList<IJsonItemVM> VMs { get; set; }
-    private ICheckedItemList<IResultCollectionPostProcessor> PostProcessors { get; set; }
+    private ICheckedItemList<IResultCollectionProcessor> PostProcessors { get; set; }
     #endregion
 

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

@@ -11 +11 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-  public partial class ResultCollectionPostProcessorControl : Core.Views.CheckedItemListView<IResultCollectionPostProcessor> {
+  public partial class ResultCollectionPostProcessorControl : Core.Views.CheckedItemListView<IResultCollectionProcessor> {
     public ResultCollectionPostProcessorControl() {
       InitializeComponent();
     }
 
-    #region Content Events
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
-      if (Content != null) {
-        SetNumberOfCheckItems();
-      }
-    }
+    protected override string GroupBoxText => "Result Collection Processors";
 
-    protected override void Content_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<IResultCollectionPostProcessor>> e) {
-      base.Content_CheckedItemsChanged(sender, e);
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<IResultCollectionPostProcessor>>(Content_CheckedItemsChanged), sender, e);
-      else {
-        SetNumberOfCheckItems();
-      }
-    }
-    protected override void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<IResultCollectionPostProcessor>> e) {
-      base.Content_CollectionReset(sender, e);
-      SetNumberOfCheckItems();
-    }
-    protected override void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IResultCollectionPostProcessor>> e) {
-      base.Content_ItemsAdded(sender, e);
-      SetNumberOfCheckItems();
-    }
-    protected override void Content_ItemsMoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IResultCollectionPostProcessor>> e) {
-      base.Content_ItemsMoved(sender, e);
-      SetNumberOfCheckItems();
-    }
-    protected override void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<IResultCollectionPostProcessor>> e) {
-      base.Content_ItemsRemoved(sender, e);
-      SetNumberOfCheckItems();
-    }
-    protected override void Content_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<IResultCollectionPostProcessor>> e) {
-      base.Content_ItemsReplaced(sender, e);
-      SetNumberOfCheckItems();
-    }
-    #endregion
-
-    private void SetNumberOfCheckItems() { // TODO: eigene override für "Post Processors" -> Item Naming
-      if (InvokeRequired) {
-        Invoke((Action)SetNumberOfCheckItems);
-      } else {
-        this.itemsGroupBox.Text = String.Format("Post Processors (Checked: {0}/{1})", Content.CheckedItems.Count(), Content.Count);
-      }
-    }
   }
 }