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

Timestamp:

02/10/20 17:29:35 (5 years ago)

Author:

dpiringe

Message:

#3026:

• added property Description in IJsonItem and updated all construction calls
• updated UnsupportedJsonItem with unsupported property Description
• updated JsonItemBaseControl and JsonItemVMBase for new property Description

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration

Files:

• Shared/JsonItemBaseControl.Designer.cs (modified) (5 diffs)
• Shared/JsonItemBaseControl.cs (modified) (1 diff)
• ViewModels/ArrayValueVM.cs (modified) (3 diffs)
• ViewModels/JsonItemVMBase.cs (modified) (1 diff)
• ViewModels/MatrixValueVM.cs (modified) (1 diff)
• ViewModels/SingleValueVM.cs (modified) (2 diffs)
• Views/JsonItemBoolControl.Designer.cs (modified) (3 diffs)
• Views/JsonItemMultiValueControl.Designer.cs (modified) (3 diffs)
• Views/JsonItemMultiValueControl.cs (modified) (2 diffs)
• Views/JsonItemRangeControl.Designer.cs (modified) (3 diffs)
• Views/JsonItemValidValuesControl.Designer.cs (modified) (5 diffs)
• Views/JsonItemValueControl.Designer.cs (modified) (4 diffs)
• Views/JsonItemValueControl.cs (modified) (3 diffs)

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

@@ -30 +30 @@
       this.textBoxName = new System.Windows.Forms.TextBox();
       this.label1 = new System.Windows.Forms.Label();
+      this.labelDescription = new System.Windows.Forms.Label();
+      this.textBoxDescription = new System.Windows.Forms.TextBox();
       this.SuspendLayout();
       // 
@@ -56 +58 @@
       this.textBoxActualName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.textBoxActualName.Location = new System.Drawing.Point(92, 49);
+      this.textBoxActualName.Location = new System.Drawing.Point(92, 75);
       this.textBoxActualName.Name = "textBoxActualName";
       this.textBoxActualName.Size = new System.Drawing.Size(404, 20);
@@ -64 +66 @@
       // 
       this.labelActualName.AutoSize = true;
-      this.labelActualName.Location = new System.Drawing.Point(6, 52);
+      this.labelActualName.Location = new System.Drawing.Point(6, 78);
       this.labelActualName.Name = "labelActualName";
       this.labelActualName.Size = new System.Drawing.Size(65, 13);
@@ -91 +93 @@
       this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
       // 
+      // labelDescription
+      // 
+      this.labelDescription.AutoSize = true;
+      this.labelDescription.Location = new System.Drawing.Point(6, 52);
+      this.labelDescription.Name = "labelDescription";
+      this.labelDescription.Size = new System.Drawing.Size(60, 13);
+      this.labelDescription.TabIndex = 13;
+      this.labelDescription.Text = "Description";
+      // 
+      // textBoxDescription
+      // 
+      this.textBoxDescription.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.textBoxDescription.Location = new System.Drawing.Point(92, 49);
+      this.textBoxDescription.Name = "textBoxDescription";
+      this.textBoxDescription.Size = new System.Drawing.Size(404, 20);
+      this.textBoxDescription.TabIndex = 14;
+      // 
       // JsonItemBaseControl
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.textBoxDescription);
+      this.Controls.Add(this.labelDescription);
       this.Controls.Add(this.labelEnable);
       this.Controls.Add(this.checkBoxActive);
@@ -117 +139 @@
     private System.Windows.Forms.TextBox textBoxName;
     private System.Windows.Forms.Label label1;
+    private System.Windows.Forms.Label labelDescription;
+    private System.Windows.Forms.TextBox textBoxDescription;
   }
 }

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

@@ -24 +24 @@
         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));
 
-      //checkBoxActive.Checked = VM.Selected;
-      //textBoxName.Text = VM.Item.Name;
       if (string.IsNullOrWhiteSpace(VM.Item.ActualName))
         textBoxActualName.ReadOnly = true;

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/ArrayValueVM.cs

@@ -15 +15 @@
     protected override double MaxTypeValue => double.MaxValue;
 
-    public override JsonItemBaseControl GetControl() => new JsonItemDoubleArrayValueControl(this);
+    public override JsonItemBaseControl GetControl() => 
+      new JsonItemDoubleArrayValueControl(this);
     
     public override double[] Value {
@@ -33 +34 @@
     protected override int MaxTypeValue => int.MaxValue;
 
-    public override JsonItemBaseControl GetControl() => new JsonItemIntArrayValueControl(this);
+    public override JsonItemBaseControl GetControl() => 
+      new JsonItemIntArrayValueControl(this);
     
     public override int[] Value {
@@ -46 +48 @@
   public abstract class ArrayValueVM<T> : RangedValueBaseVM<T> {
     
-    public ArrayValueVM() {
-      //base.ItemChanged += OnItemChanged;
-    }
+    public ArrayValueVM() { }
 
     public void SetIndexValue(object obj, int index) {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/JsonItemVMBase.cs

@@ -58 +58 @@
     }
 
+    public string Description {
+      get => Item.Description;
+      set {
+        Item.Description = value;
+        OnPropertyChange(this, nameof(Description));
+      }
+    }
+
     public string ActualName {
       get => Item.ActualName;

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/MatrixValueVM.cs

@@ -10 +10 @@
   public class DoubleMatrixValueVM : MatrixValueVM<double> {
     public override Type JsonItemType => typeof(DoubleMatrixJsonItem);
-    public override JsonItemBaseControl GetControl() => new JsonItemDoubleMatrixValueControl(this);
+    public override JsonItemBaseControl GetControl() => 
+      new JsonItemDoubleMatrixValueControl(this);
 
     public override double[][] Value {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/ViewModels/SingleValueVM.cs

@@ -14 +14 @@
     protected override int MaxTypeValue => int.MaxValue;
 
-    public override JsonItemBaseControl GetControl() =>
+    public override JsonItemBaseControl GetControl() => 
       new JsonItemIntValueControl(this);
   }
@@ -24 +24 @@
     protected override double MaxTypeValue => double.MaxValue;
 
-    public override JsonItemBaseControl GetControl() =>
+    public override JsonItemBaseControl GetControl() => 
        new JsonItemDoubleValueControl(this);
   }

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

@@ -33 +33 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.checkBoxValue.AutoSize = true;
-      this.checkBoxValue.Location = new System.Drawing.Point(92, 75);
+      this.checkBoxValue.Location = new System.Drawing.Point(92, 101);
       this.checkBoxValue.Name = "checkBoxValue";
       this.checkBoxValue.Size = new System.Drawing.Size(15, 14);
@@ -42 +42 @@
       // 
       this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(6, 75);
+      this.label2.Location = new System.Drawing.Point(6, 101);
       this.label2.Name = "label2";
       this.label2.Size = new System.Drawing.Size(34, 13);
@@ -56 +56 @@
       this.Controls.Add(this.checkBoxValue);
       this.Name = "JsonItemBoolControl";
-      this.Size = new System.Drawing.Size(500, 105);
+      this.Size = new System.Drawing.Size(500, 140);
       this.Controls.SetChildIndex(this.checkBoxValue, 0);
       this.Controls.SetChildIndex(this.label2, 0);

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

@@ -35 +35 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-      this.dataGridView.Location = new System.Drawing.Point(9, 75);
+      this.dataGridView.Location = new System.Drawing.Point(9, 101);
       this.dataGridView.Name = "dataGridView";
-      this.dataGridView.Size = new System.Drawing.Size(487, 171);
+      this.dataGridView.Size = new System.Drawing.Size(487, 208);
       this.dataGridView.TabIndex = 13;
       // 
@@ -44 +44 @@
       this.numericRangeControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.numericRangeControl1.Location = new System.Drawing.Point(9, 252);
+      this.numericRangeControl1.Location = new System.Drawing.Point(9, 315);
       this.numericRangeControl1.Name = "numericRangeControl1";
       this.numericRangeControl1.Size = new System.Drawing.Size(487, 128);
       this.numericRangeControl1.TabIndex = 14;
       // 
-      // JsonItemArrayValueControl
+      // JsonItemMultiValueControl
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -55 +55 @@
       this.Controls.Add(this.numericRangeControl1);
       this.Controls.Add(this.dataGridView);
-      this.Name = "JsonItemArrayValueControl";
-      this.Size = new System.Drawing.Size(502, 386);
+      this.Name = "JsonItemMultiValueControl";
+      this.Size = new System.Drawing.Size(502, 449);
       this.Controls.SetChildIndex(this.dataGridView, 0);
       this.Controls.SetChildIndex(this.numericRangeControl1, 0);

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

@@ -10 +10 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-
+  
   public class JsonItemDoubleMatrixValueControl : JsonItemMultiValueControl<double> {
 
@@ -81 +81 @@
     protected abstract void SaveCellData(object data, int col, int row);
 
-    /*
-public JsonItemMultiValueControl(JsonItemVMBase vm, object dataSource) : base(vm) {
- InitializeComponent();
- dataGridView.DataSource = dataSource;
-
- InitRangeBinding();
-}
-*/
     private void InitRangeBinding() {
       NumericRangeControl = numericRangeControl1;

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

@@ -41 +41 @@
       this.groupBox1.Controls.Add(this.label4);
       this.groupBox1.Controls.Add(this.label2);
-      this.groupBox1.Location = new System.Drawing.Point(9, 75);
+      this.groupBox1.Location = new System.Drawing.Point(9, 101);
       this.groupBox1.Name = "groupBox1";
       this.groupBox1.Size = new System.Drawing.Size(487, 64);
@@ -90 +90 @@
       this.numericRangeControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.numericRangeControl1.Location = new System.Drawing.Point(9, 145);
+      this.numericRangeControl1.Location = new System.Drawing.Point(9, 171);
       this.numericRangeControl1.Name = "numericRangeControl1";
       this.numericRangeControl1.Size = new System.Drawing.Size(487, 112);
@@ -102 +102 @@
       this.Controls.Add(this.groupBox1);
       this.Name = "JsonItemRangeControl";
-      this.Size = new System.Drawing.Size(500, 262);
+      this.Size = new System.Drawing.Size(500, 301);
       this.Controls.SetChildIndex(this.groupBox1, 0);
       this.Controls.SetChildIndex(this.numericRangeControl1, 0);

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

@@ -44 +44 @@
       this.tableOptions.RowCount = 1;
       this.tableOptions.RowStyles.Add(new System.Windows.Forms.RowStyle());
-      this.tableOptions.Size = new System.Drawing.Size(478, 137);
+      this.tableOptions.Size = new System.Drawing.Size(478, 417);
       this.tableOptions.TabIndex = 12;
       // 
@@ -54 +54 @@
       this.groupBoxRange.AutoSize = true;
       this.groupBoxRange.Controls.Add(this.tableOptions);
-      this.groupBoxRange.Location = new System.Drawing.Point(6, 108);
+      this.groupBoxRange.Location = new System.Drawing.Point(6, 128);
       this.groupBoxRange.Name = "groupBoxRange";
-      this.groupBoxRange.Size = new System.Drawing.Size(490, 162);
+      this.groupBoxRange.Size = new System.Drawing.Size(490, 442);
       this.groupBoxRange.TabIndex = 14;
       this.groupBoxRange.TabStop = false;
@@ -67 +67 @@
       this.comboBoxValues.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
       this.comboBoxValues.FormattingEnabled = true;
-      this.comboBoxValues.Location = new System.Drawing.Point(92, 75);
+      this.comboBoxValues.Location = new System.Drawing.Point(92, 101);
       this.comboBoxValues.Name = "comboBoxValues";
       this.comboBoxValues.Size = new System.Drawing.Size(404, 21);
@@ -75 +75 @@
       // 
       this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(6, 78);
+      this.label2.Location = new System.Drawing.Point(6, 104);
       this.label2.Name = "label2";
       this.label2.Size = new System.Drawing.Size(34, 13);
@@ -91 +91 @@
       this.ForeColor = System.Drawing.Color.Black;
       this.Name = "JsonItemValidValuesControl";
-      this.Size = new System.Drawing.Size(500, 276);
+      this.Size = new System.Drawing.Size(500, 576);
       this.Controls.SetChildIndex(this.groupBoxRange, 0);
       this.Controls.SetChildIndex(this.comboBoxValues, 0);

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

@@ -33 +33 @@
       this.textBoxValue.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.textBoxValue.Location = new System.Drawing.Point(92, 75);
+      this.textBoxValue.Location = new System.Drawing.Point(92, 101);
       this.textBoxValue.Name = "textBoxValue";
       this.textBoxValue.Size = new System.Drawing.Size(404, 20);
@@ -41 +41 @@
       // 
       this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(6, 78);
+      this.label2.Location = new System.Drawing.Point(6, 104);
       this.label2.Name = "label2";
       this.label2.Size = new System.Drawing.Size(34, 13);
@@ -49 +49 @@
       // numericRangeControl1
       // 
-      this.numericRangeControl1.Location = new System.Drawing.Point(9, 101);
-      this.numericRangeControl1.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+      this.numericRangeControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.numericRangeControl1.Location = new System.Drawing.Point(9, 127);
       this.numericRangeControl1.Name = "numericRangeControl1";
       this.numericRangeControl1.Size = new System.Drawing.Size(487, 112);
@@ -63 +64 @@
       this.Controls.Add(this.textBoxValue);
       this.Name = "JsonItemValueControl";
-      this.Size = new System.Drawing.Size(500, 220);
+      this.Size = new System.Drawing.Size(500, 247);
       this.Controls.SetChildIndex(this.textBoxValue, 0);
       this.Controls.SetChildIndex(this.label2, 0);

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

@@ -11 +11 @@
 
 namespace HeuristicLab.JsonInterface.OptimizerIntegration {
-
+  
   public class JsonItemIntValueControl : JsonItemValueControl {
 
@@ -21 +21 @@
       Init();
     }
-
   }
 
@@ -33 +32 @@
       Init();
     }
-
   }
-
+  
   public abstract partial class JsonItemValueControl : JsonItemBaseControl {
     #region Protected Properties