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

Timestamp:

02/20/20 16:58:03 (5 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.OptimizerIntegration/Shared

Files:

• JsonItemBaseControl.cs (modified) (2 diffs)
• NumericRangeControl.Designer.cs (modified) (5 diffs)

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

@@ -11 +11 @@
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
   public partial class JsonItemBaseControl : UserControl {
-    protected JsonItemVMBase VM { get; set; }
+    protected IJsonItemVM VM { get; set; }
 
     private JsonItemBaseControl() {
@@ -17 +17 @@
     }
     
-    public JsonItemBaseControl(JsonItemVMBase vm) {
+    public JsonItemBaseControl(IJsonItemVM vm) {
       InitializeComponent();
       VM = vm;
 
-      checkBoxActive.DataBindings.Add("Checked", VM, nameof(JsonItemVMBase.Selected),
+      checkBoxActive.DataBindings.Add("Checked", VM, nameof(IJsonItemVM.Selected),
         false, DataSourceUpdateMode.OnPropertyChanged);
-      textBoxName.DataBindings.Add("Text", VM, nameof(JsonItemVMBase.Name));
-      textBoxDescription.DataBindings.Add("Text", VM, nameof(JsonItemVMBase.Description));
-      textBoxActualName.DataBindings.Add("Text", VM, nameof(JsonItemVMBase.ActualName));
+      textBoxName.DataBindings.Add("Text", VM, nameof(IJsonItemVM.Name));
+      textBoxDescription.DataBindings.Add("Text", VM, nameof(IJsonItemVM.Description));
+      textBoxActualName.DataBindings.Add("Text", VM, nameof(IJsonItemVM.ActualName));
 
       if (string.IsNullOrWhiteSpace(VM.Item.ActualName))

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

@@ -26 +26 @@
       this.components = new System.ComponentModel.Container();
       this.textBoxFrom = new System.Windows.Forms.TextBox();
-      this.label6 = new System.Windows.Forms.Label();
       this.groupBox2 = new System.Windows.Forms.GroupBox();
       this.checkBoxTo = new System.Windows.Forms.CheckBox();
       this.textBoxTo = new System.Windows.Forms.TextBox();
-      this.label1 = new System.Windows.Forms.Label();
       this.checkBoxFrom = new System.Windows.Forms.CheckBox();
       this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
@@ -49 +47 @@
       this.textBoxFrom.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxFrom_Validating);
       // 
-      // label6
-      // 
-      this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.label6.AutoSize = true;
-      this.label6.Location = new System.Drawing.Point(31, 21);
-      this.label6.Name = "label6";
-      this.label6.Size = new System.Drawing.Size(30, 13);
-      this.label6.TabIndex = 0;
-      this.label6.Text = "From";
-      // 
       // groupBox2
       // 
       this.groupBox2.Controls.Add(this.checkBoxTo);
       this.groupBox2.Controls.Add(this.textBoxTo);
-      this.groupBox2.Controls.Add(this.label1);
       this.groupBox2.Controls.Add(this.checkBoxFrom);
       this.groupBox2.Controls.Add(this.textBoxFrom);
-      this.groupBox2.Controls.Add(this.label6);
       this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
       this.groupBox2.Location = new System.Drawing.Point(0, 0);
@@ -79 +64 @@
       // 
       this.checkBoxTo.AutoSize = true;
-      this.checkBoxTo.Location = new System.Drawing.Point(10, 46);
+      this.checkBoxTo.Location = new System.Drawing.Point(9, 45);
       this.checkBoxTo.Name = "checkBoxTo";
-      this.checkBoxTo.Size = new System.Drawing.Size(15, 14);
+      this.checkBoxTo.Size = new System.Drawing.Size(42, 17);
       this.checkBoxTo.TabIndex = 7;
+      this.checkBoxTo.Text = "To:";
       this.checkBoxTo.UseVisualStyleBackColor = true;
       // 
@@ -97 +83 @@
       this.textBoxTo.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxTo_Validating);
       // 
-      // label1
-      // 
-      this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(31, 46);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(20, 13);
-      this.label1.TabIndex = 5;
-      this.label1.Text = "To";
-      // 
       // checkBoxFrom
       // 
       this.checkBoxFrom.AutoSize = true;
-      this.checkBoxFrom.Location = new System.Drawing.Point(10, 20);
+      this.checkBoxFrom.Location = new System.Drawing.Point(9, 19);
       this.checkBoxFrom.Name = "checkBoxFrom";
-      this.checkBoxFrom.Size = new System.Drawing.Size(15, 14);
+      this.checkBoxFrom.Size = new System.Drawing.Size(52, 17);
       this.checkBoxFrom.TabIndex = 4;
+      this.checkBoxFrom.Text = "From:";
       this.checkBoxFrom.UseVisualStyleBackColor = true;
       // 
@@ -138 +114 @@
     #endregion
     private System.Windows.Forms.TextBox textBoxFrom;
-    private System.Windows.Forms.Label label6;
     private System.Windows.Forms.GroupBox groupBox2;
     private System.Windows.Forms.CheckBox checkBoxTo;
     private System.Windows.Forms.TextBox textBoxTo;
-    private System.Windows.Forms.Label label1;
     private System.Windows.Forms.CheckBox checkBoxFrom;
     private System.Windows.Forms.ErrorProvider errorProvider;