Changeset 17410 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared

Timestamp:

01/28/20 14:53:45 (5 years ago)

Author:

dpiringe

Message:

#3026:

• deleted JsonItemArrayControl and JsonItemDefaultControl
• redesigned architecture for JsonItem: now there are different types of JsonItem (IntJsonItem, BoolJsonItem, ...) -> for better type safety and expandability
• fixed bug in BaseConverter for GetMinValue and GetMaxValue for IntValue, but ignored for other value types (DoubleValue, DateTimeValue, ...) because the redesign of JsonItem-Architecture can make these two methods obsolet soon
• fixed bug in JsonItemConverter to prevent null pointer exceptions
• refactored value and range converters -> removed complicated generic ValueTypeValueConverter and ValueRangeConverter and implemented the necessary methods directly in concrete classes (improves readability and removes the need of reflection)
• redesigned view handling in OptimizerIntegration -> dynamically seaches for JsonItemVMBase implementations, which are connected with a view
  • this enables better scaling with more user controls
• JsonItemVMBase implements MVVM architecture

Location:

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

Files:

• JsonItemBaseControl.Designer.cs (modified) (3 diffs)
• JsonItemBaseControl.cs (modified) (3 diffs)
• NumericRangeControl.Designer.cs (modified) (1 diff)
• NumericRangeControl.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/JsonItemBaseControl.Designer.cs

@@ -51 +51 @@
       this.checkBoxActive.TabIndex = 2;
       this.checkBoxActive.UseVisualStyleBackColor = true;
-      this.checkBoxActive.CheckedChanged += new System.EventHandler(this.checkBoxActive_CheckedChanged);
       // 
       // textBoxActualName
@@ -61 +60 @@
       this.textBoxActualName.Size = new System.Drawing.Size(404, 20);
       this.textBoxActualName.TabIndex = 12;
-      this.textBoxActualName.TextChanged += new System.EventHandler(this.textBoxActualName_TextChanged);
       // 
       // labelActualName
@@ -82 +80 @@
       this.textBoxName.Size = new System.Drawing.Size(404, 20);
       this.textBoxName.TabIndex = 10;
-      this.textBoxName.TextChanged += new System.EventHandler(this.textBoxName_TextChanged);
       // 
       // label1

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/JsonItemBaseControl.cs

@@ -11 +11 @@
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
   public partial class JsonItemBaseControl : UserControl {
-    public JsonItemVM VM { get; set; }
+    private JsonItemVMBase VM { get; set; }
 
     private JsonItemBaseControl() {
@@ -17 +17 @@
     }
 
-    public JsonItemBaseControl(JsonItemVM vm) {
+    public JsonItemBaseControl(JsonItemVMBase vm) {
       InitializeComponent();
       VM = vm;
-      checkBoxActive.Checked = VM.Selected;
-      textBoxName.Text = VM.Item.Name;
+
+      checkBoxActive.DataBindings.Add("Checked", VM, nameof(JsonItemVMBase.Selected));
+      textBoxName.DataBindings.Add("Text", VM, nameof(JsonItemVMBase.Name));
+      textBoxActualName.DataBindings.Add("Text", VM, nameof(JsonItemVMBase.ActualName));
+
+      //checkBoxActive.Checked = VM.Selected;
+      //textBoxName.Text = VM.Item.Name;
       if (string.IsNullOrWhiteSpace(VM.Item.ActualName))
         textBoxActualName.ReadOnly = true;
@@ -27 +32 @@
         textBoxActualName.Text = VM.Item.ActualName;
     }
-
-    private void checkBoxActive_CheckedChanged(object sender, EventArgs e) {
-      VM.Selected = checkBoxActive.Checked;
-    }
-
-    private void textBoxName_TextChanged(object sender, EventArgs e) {
-      VM.Item.Name = textBoxName.Text;
-    }
-
-    private void textBoxActualName_TextChanged(object sender, EventArgs e) {
-      VM.Item.ActualName = textBoxActualName.Text;
-    }
   }
 }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/NumericRangeControl.Designer.cs

@@ -1 @@
-namespace HeuristicLab.JsonInterface.OptimizerIntegration.Shared {
+namespace HeuristicLab.JsonInterface.OptimizerIntegration {
   partial class NumericRangeControl {
     /// <summary> 

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/Shared/NumericRangeControl.cs

@@ -10 +10 @@
 using System.Globalization;
 
-namespace HeuristicLab.JsonInterface.OptimizerIntegration.Shared {
+namespace HeuristicLab.JsonInterface.OptimizerIntegration {
   public partial class NumericRangeControl : UserControl {
 
@@ -22 +22 @@
     }
     public bool IsDouble { get; set; }
-
-
 
     public NumericRangeControl() {