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

Timestamp:

02/18/20 16:28:53 (5 years ago)

Author:

dpiringe

Message:

#3026:

• added two new methods in IJsonItem -> FixatePath and LoosenPath to fixate/loosen the path (to enable name changing without effects on path)
• set IsInRange to virtual and made overrides for IntMatrixJsonItem and DoubleMatrixJsonItem (IsInRange is a bad name and needs to be renamed in future versions)
• implemented basic validation feedback with ErrorProvider for some inputs (templateName, Name, Range)
• now all items gets validated before export (validation errors are shown with ErrorHandling.ShowErrorDialog)
• added a check in AlgorithmConverter to prevent an exception for accessing the first element of an empty IEnumerable

Location:

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

Files:

• JsonItemBaseControl.Designer.cs (modified) (6 diffs)
• JsonItemBaseControl.cs (modified) (1 diff)
• JsonItemBaseControl.resx (modified) (1 diff)
• NumericRangeControl.Designer.cs (modified) (9 diffs)
• NumericRangeControl.cs (modified) (1 diff)
• NumericRangeControl.resx (modified) (1 diff)

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       this.labelEnable = new System.Windows.Forms.Label();
       this.checkBoxActive = new System.Windows.Forms.CheckBox();
@@ -32 +33 @@
       this.labelDescription = new System.Windows.Forms.Label();
       this.textBoxDescription = new System.Windows.Forms.TextBox();
+      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
       // 
@@ -77 +80 @@
       this.textBoxName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+      this.errorProvider.SetIconAlignment(this.textBoxName, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.textBoxName.Location = new System.Drawing.Point(92, 23);
       this.textBoxName.Name = "textBoxName";
       this.textBoxName.Size = new System.Drawing.Size(402, 20);
       this.textBoxName.TabIndex = 10;
+      this.textBoxName.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxName_Validating);
       // 
       // label1
@@ -110 +115 @@
       this.textBoxDescription.TabIndex = 14;
       // 
+      // errorProvider
+      // 
+      this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
+      this.errorProvider.ContainerControl = this;
+      // 
       // JsonItemBaseControl
       // 
@@ -122 +132 @@
       this.Controls.Add(this.textBoxName);
       this.Controls.Add(this.label1);
+      this.errorProvider.SetIconAlignment(this, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.Name = "JsonItemBaseControl";
       this.Padding = new System.Windows.Forms.Padding(3);
       this.Size = new System.Drawing.Size(500, 154);
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -140 +152 @@
     private System.Windows.Forms.Label labelDescription;
     private System.Windows.Forms.TextBox textBoxDescription;
+    protected System.Windows.Forms.ErrorProvider errorProvider;
   }
 }

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

@@ -31 +31 @@
       else
         textBoxActualName.Text = VM.Item.ActualName;
-        
+
+    }
+
+    private void textBoxName_Validating(object sender, CancelEventArgs e) {
+      if(string.IsNullOrWhiteSpace(textBoxName.Text)) {
+        errorProvider.SetError(textBoxName, "Name must not be empty.");
+        e.Cancel = true;
+      } else {
+        errorProvider.SetError(textBoxName, null);
+      }
     }
   }

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

@@ -118 +118 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
+      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.checkBoxFrom = new System.Windows.Forms.CheckBox();
       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);
       this.groupBox2.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
       // 
@@ -38 +41 @@
       this.textBoxFrom.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.textBoxFrom.Location = new System.Drawing.Point(36, 36);
+      this.errorProvider.SetIconAlignment(this.textBoxFrom, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
+      this.textBoxFrom.Location = new System.Drawing.Point(67, 17);
       this.textBoxFrom.Name = "textBoxFrom";
       this.textBoxFrom.ReadOnly = true;
-      this.textBoxFrom.Size = new System.Drawing.Size(164, 20);
+      this.textBoxFrom.Size = new System.Drawing.Size(253, 20);
       this.textBoxFrom.TabIndex = 2;
+      this.textBoxFrom.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxFrom_Validating);
       // 
       // label6
@@ -49 +54 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.label6.AutoSize = true;
-      this.label6.Location = new System.Drawing.Point(7, 20);
+      this.label6.Location = new System.Drawing.Point(31, 21);
       this.label6.Name = "label6";
       this.label6.Size = new System.Drawing.Size(30, 13);
@@ -57 +62 @@
       // groupBox2
       // 
-      this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
       this.groupBox2.Controls.Add(this.checkBoxTo);
       this.groupBox2.Controls.Add(this.textBoxTo);
@@ -65 +68 @@
       this.groupBox2.Controls.Add(this.textBoxFrom);
       this.groupBox2.Controls.Add(this.label6);
-      this.groupBox2.Location = new System.Drawing.Point(0, 3);
+      this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.groupBox2.Location = new System.Drawing.Point(0, 0);
       this.groupBox2.Name = "groupBox2";
-      this.groupBox2.Size = new System.Drawing.Size(206, 109);
+      this.groupBox2.Size = new System.Drawing.Size(326, 75);
       this.groupBox2.TabIndex = 19;
       this.groupBox2.TabStop = false;
       this.groupBox2.Text = "Range";
       // 
-      // checkBoxFrom
-      // 
-      this.checkBoxFrom.AutoSize = true;
-      this.checkBoxFrom.Location = new System.Drawing.Point(10, 39);
-      this.checkBoxFrom.Name = "checkBoxFrom";
-      this.checkBoxFrom.Size = new System.Drawing.Size(15, 14);
-      this.checkBoxFrom.TabIndex = 4;
-      this.checkBoxFrom.UseVisualStyleBackColor = true;
-      // 
       // checkBoxTo
       // 
       this.checkBoxTo.AutoSize = true;
-      this.checkBoxTo.Location = new System.Drawing.Point(10, 78);
+      this.checkBoxTo.Location = new System.Drawing.Point(10, 46);
       this.checkBoxTo.Name = "checkBoxTo";
       this.checkBoxTo.Size = new System.Drawing.Size(15, 14);
@@ -94 +89 @@
       this.textBoxTo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.textBoxTo.Location = new System.Drawing.Point(36, 75);
+      this.errorProvider.SetIconAlignment(this.textBoxTo, System.Windows.Forms.ErrorIconAlignment.TopLeft);
+      this.textBoxTo.Location = new System.Drawing.Point(67, 43);
       this.textBoxTo.Name = "textBoxTo";
       this.textBoxTo.ReadOnly = true;
-      this.textBoxTo.Size = new System.Drawing.Size(164, 20);
+      this.textBoxTo.Size = new System.Drawing.Size(253, 20);
       this.textBoxTo.TabIndex = 6;
+      this.textBoxTo.Validating += new System.ComponentModel.CancelEventHandler(this.textBoxTo_Validating);
       // 
       // label1
@@ -105 +102 @@
             | System.Windows.Forms.AnchorStyles.Right)));
       this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(7, 59);
+      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.Name = "checkBoxFrom";
+      this.checkBoxFrom.Size = new System.Drawing.Size(15, 14);
+      this.checkBoxFrom.TabIndex = 4;
+      this.checkBoxFrom.UseVisualStyleBackColor = true;
+      // 
+      // errorProvider
+      // 
+      this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
+      this.errorProvider.ContainerControl = this;
       // 
       // NumericRangeControl
@@ -117 +128 @@
       this.Controls.Add(this.groupBox2);
       this.Name = "NumericRangeControl";
-      this.Size = new System.Drawing.Size(206, 112);
+      this.Size = new System.Drawing.Size(326, 75);
       this.groupBox2.ResumeLayout(false);
       this.groupBox2.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
 
@@ -132 +144 @@
     private System.Windows.Forms.Label label1;
     private System.Windows.Forms.CheckBox checkBoxFrom;
+    private System.Windows.Forms.ErrorProvider errorProvider;
   }
 }

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

@@ -33 +33 @@
       textBoxFrom.ReadOnly = !checkBoxFrom.Checked;
     }
+
+    private void textBoxFrom_Validating(object sender, CancelEventArgs e) {
+      if (string.IsNullOrWhiteSpace(textBoxFrom.Text)) {
+        errorProvider.SetError(textBoxFrom, "'From' must not be empty.");
+        e.Cancel = true;
+      } else {
+        errorProvider.SetError(textBoxFrom, null);
+      }
+    }
+
+    private void textBoxTo_Validating(object sender, CancelEventArgs e) {
+      if (string.IsNullOrWhiteSpace(textBoxTo.Text)) {
+        errorProvider.SetError(textBoxTo, "'To' must not be empty.");
+        e.Cancel = true;
+      } else {
+        errorProvider.SetError(textBoxTo, null);
+      }
+    }
   }
 }

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

@@ -118 +118 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>