Changeset 18154 for branches/3136_Structural_GP

Timestamp:

12/17/21 15:26:14 (3 years ago)

Author:

dpiringe

Message:

#3136

• overwrote the method SetEnabledStateOfControls for StructureTemplateView
• fixed the wrong usage of infoLabel in StructureTemplateView -> added a new label errorLabel for textual output
• deleted the resource file for StructureTemplateView

Location:

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (1 diff)
• StructureTemplate/StructureTemplateView.Designer.cs (modified) (6 diffs)
• StructureTemplate/StructureTemplateView.cs (modified) (6 diffs)
• StructureTemplate/StructureTemplateView.resx (deleted)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -334 +334 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="StructureTemplate\StructureTemplateView.resx">
-      <DependentUpon>StructureTemplateView.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/StructureTemplate/StructureTemplateView.Designer.cs

@@ -23 +23 @@
       this.splitContainer = new System.Windows.Forms.SplitContainer();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+      this.errorLabel = new System.Windows.Forms.Label();
       this.detailsGroupBox.SuspendLayout();
       this.templateStructureGroupBox.SuspendLayout();
@@ -58 +59 @@
       // templateStructureGroupBox
       // 
+      this.templateStructureGroupBox.Controls.Add(this.errorLabel);
       this.templateStructureGroupBox.Controls.Add(this.linearScalingCheckBox);
       this.templateStructureGroupBox.Controls.Add(this.infoLabel);
@@ -86 +88 @@
       this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.infoLabel.BackColor = System.Drawing.Color.White;
-      this.infoLabel.Image = ((System.Drawing.Image)(resources.GetObject("infoLabel.Image")));
+      this.infoLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Information;
       this.infoLabel.Location = new System.Drawing.Point(275, 22);
       this.infoLabel.Name = "infoLabel";
@@ -93 +95 @@
       this.infoLabel.Text = "    ";
       this.toolTip.SetToolTip(this.infoLabel, "Double-click to open description.");
-      this.infoLabel.DoubleClick += new System.EventHandler(this.helpButton_DoubleClick);
+      this.infoLabel.DoubleClick += new System.EventHandler(this.HelpButtonDoubleClick);
       // 
       // treeChart
@@ -157 +159 @@
       this.splitContainer.TabIndex = 10;
       // 
+      // errorLabel
+      // 
+      this.errorLabel.AutoSize = true;
+      this.errorLabel.BackColor = System.Drawing.Color.White;
+      this.errorLabel.Location = new System.Drawing.Point(3, 74);
+      this.errorLabel.Name = "errorLabel";
+      this.errorLabel.Size = new System.Drawing.Size(0, 13);
+      this.errorLabel.TabIndex = 9;
+      // 
       // StructureTemplateView
       // 
@@ -187 +198 @@
     private System.ComponentModel.IContainer components;
     private ToolTip toolTip;
+    private Label errorLabel;
   }
 }

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/StructureTemplate/StructureTemplateView.cs

@@ -25 +25 @@
     public StructureTemplateView() {
       InitializeComponent();
-      infoLabel.Text = "";
+      errorLabel.Text = "";
       this.Resize += StructureTemplateViewResize;
       splitContainer.SplitterMoved += SplitContainerSplitterMoved;
@@ -50 +50 @@
     }
 
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      parseButton.Enabled = Content != null && !Locked && !ReadOnly;
+      linearScalingCheckBox.Enabled = Content != null && !Locked && !ReadOnly;
+      expressionInput.Enabled = Content != null && !Locked && !ReadOnly;
+    }
+
     protected override void OnContentChanged() {
       base.OnContentChanged();
@@ -56 +63 @@
       linearScalingCheckBox.Checked = Content.ApplyLinearScaling; 
       PaintTree();
-      infoLabel.Text = "";
+      errorLabel.Text = "";
     }
 
@@ -64 +71 @@
 
     private void ExpressionInputTextChanged(object sender, EventArgs e) {
-      infoLabel.Text = "Unparsed changes! Press parse button to save changes.";
-      infoLabel.ForeColor = Color.DarkOrange;
+      errorLabel.Text = "Unparsed changes! Press parse button to save changes.";
+      errorLabel.ForeColor = Color.DarkOrange;
     }
 
@@ -93 +100 @@
           Content.Template = expressionInput.Text;
           PaintTree();
-          infoLabel.Text = "Template structure successfully parsed.";
-          infoLabel.ForeColor = Color.DarkGreen;
+          errorLabel.Text = "Template structure successfully parsed.";
+          errorLabel.ForeColor = Color.DarkGreen;
         } catch (AggregateException ex) {
-          infoLabel.Text = string.Join("\n", ex.InnerExceptions.Select(x => x.Message));
-          infoLabel.ForeColor = Color.DarkRed;
+          errorLabel.Text = string.Join("\n", ex.InnerExceptions.Select(x => x.Message));
+          errorLabel.ForeColor = Color.DarkRed;
         } catch (Exception ex) {
-          infoLabel.Text = ex.Message;
-          infoLabel.ForeColor = Color.DarkRed;
+          errorLabel.Text = ex.Message;
+          errorLabel.ForeColor = Color.DarkRed;
         }
       }
@@ -110 +117 @@
     }
 
-    private void helpButton_DoubleClick(object sender, EventArgs e) {
+    private void HelpButtonDoubleClick(object sender, EventArgs e) {
       using (InfoBox dialog = new InfoBox("Help for structure template",
         "HeuristicLab.Problems.DataAnalysis.Symbolic.Views.Resources.structureTemplateHelp.rtf",