Changeset 18068 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

Timestamp:

10/15/21 17:00:28 (3 years ago)

Author:

dpiringe

Message:

#3136

• modified the StructureTemplateView to enable colorful tree nodes of type SubFunctionTreeNode
• refactored SubFunctionTreeNode, SubFunction and StructureTemplate

Location:

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

Files:

• StructureTemplateView.Designer.cs (modified) (10 diffs)
• StructureTemplateView.cs (modified) (2 diffs)

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

@@ -30 +30 @@
       this.expressionInput = new System.Windows.Forms.TextBox();
       this.parseButton = new System.Windows.Forms.Button();
-      this.errorLabel = new System.Windows.Forms.Label();
-      this.symRegTreeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.GraphicalSymbolicExpressionTreeView();
+      this.infoLabel = new System.Windows.Forms.Label();
       this.templateStructureGroupBox = new System.Windows.Forms.GroupBox();
       this.treeChart = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.detailsGroupBox = new System.Windows.Forms.GroupBox();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.templateStructureGroupBox.SuspendLayout();
@@ -41 +41 @@
       this.splitContainer.Panel2.SuspendLayout();
       this.splitContainer.SuspendLayout();
+      this.detailsGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -51 +52 @@
       this.expressionInput.Size = new System.Drawing.Size(288, 20);
       this.expressionInput.TabIndex = 1;
-      this.expressionInput.TextChanged += new System.EventHandler(this.expressionInput_TextChanged);
+      this.expressionInput.TextChanged += new System.EventHandler(this.ExpressionInputTextChanged);
       // 
       // parseButton
@@ -61 +62 @@
       this.parseButton.Text = "Parse";
       this.parseButton.UseVisualStyleBackColor = true;
-      this.parseButton.Click += new System.EventHandler(this.parseButton_Click);
+      this.parseButton.Click += new System.EventHandler(this.ParseButtonClick);
       // 
       // errorLabel
       // 
-      this.errorLabel.AutoSize = true;
-      this.errorLabel.Location = new System.Drawing.Point(155, 50);
-      this.errorLabel.Name = "errorLabel";
-      this.errorLabel.Size = new System.Drawing.Size(54, 13);
-      this.errorLabel.TabIndex = 4;
-      this.errorLabel.Text = "errorLabel";
-      // 
-      // symRegTreeChart
-      // 
-      this.symRegTreeChart.AllowDrop = true;
-      this.symRegTreeChart.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.symRegTreeChart.Caption = "Graphical SymbolicExpressionTree View";
-      this.symRegTreeChart.Content = null;
-      this.symRegTreeChart.Location = new System.Drawing.Point(6, 74);
-      this.symRegTreeChart.Name = "symRegTreeChart";
-      this.symRegTreeChart.ReadOnly = false;
-      this.symRegTreeChart.Size = new System.Drawing.Size(288, 153);
-      this.symRegTreeChart.TabIndex = 6;
+      this.infoLabel.AutoSize = true;
+      this.infoLabel.Location = new System.Drawing.Point(155, 50);
+      this.infoLabel.Name = "errorLabel";
+      this.infoLabel.Size = new System.Drawing.Size(54, 13);
+      this.infoLabel.TabIndex = 4;
+      this.infoLabel.Text = "errorLabel";
       // 
       // templateStructureGroupBox
       // 
       this.templateStructureGroupBox.Controls.Add(this.treeChart);
-      this.templateStructureGroupBox.Controls.Add(this.symRegTreeChart);
       this.templateStructureGroupBox.Controls.Add(this.parseButton);
-      this.templateStructureGroupBox.Controls.Add(this.errorLabel);
+      this.templateStructureGroupBox.Controls.Add(this.infoLabel);
       this.templateStructureGroupBox.Controls.Add(this.expressionInput);
       this.templateStructureGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -102 +89 @@
       // treeChart
       // 
-      this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+      this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.treeChart.BackgroundColor = System.Drawing.Color.White;
       this.treeChart.LineColor = System.Drawing.Color.Black;
-      this.treeChart.Location = new System.Drawing.Point(6, 233);
+      this.treeChart.Location = new System.Drawing.Point(6, 74);
       this.treeChart.MinimumHorizontalDistance = 30;
       this.treeChart.MinimumHorizontalPadding = 20;
@@ -114 +102 @@
       this.treeChart.PreferredNodeHeight = 46;
       this.treeChart.PreferredNodeWidth = 70;
-      this.treeChart.Size = new System.Drawing.Size(288, 150);
+      this.treeChart.Size = new System.Drawing.Size(288, 320);
       this.treeChart.SuspendRepaint = false;
       this.treeChart.TabIndex = 7;
@@ -134 +122 @@
       // splitContainer.Panel2
       // 
-      this.splitContainer.Panel2.Controls.Add(this.viewHost);
+      this.splitContainer.Panel2.Controls.Add(this.detailsGroupBox);
       this.splitContainer.Panel2MinSize = 5;
       this.splitContainer.Size = new System.Drawing.Size(600, 400);
       this.splitContainer.SplitterDistance = 300;
       this.splitContainer.TabIndex = 10;
+      // 
+      // detailsGroupBox
+      // 
+      this.detailsGroupBox.Controls.Add(this.viewHost);
+      this.detailsGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.detailsGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.detailsGroupBox.Name = "detailsGroupBox";
+      this.detailsGroupBox.Size = new System.Drawing.Size(296, 400);
+      this.detailsGroupBox.TabIndex = 9;
+      this.detailsGroupBox.TabStop = false;
+      this.detailsGroupBox.Text = "Details";
       // 
       // viewHost
@@ -146 +145 @@
       this.viewHost.Dock = System.Windows.Forms.DockStyle.Fill;
       this.viewHost.Enabled = false;
-      this.viewHost.Location = new System.Drawing.Point(0, 0);
+      this.viewHost.Location = new System.Drawing.Point(3, 16);
       this.viewHost.Name = "viewHost";
       this.viewHost.ReadOnly = false;
-      this.viewHost.Size = new System.Drawing.Size(296, 400);
+      this.viewHost.Size = new System.Drawing.Size(290, 381);
       this.viewHost.TabIndex = 8;
       this.viewHost.ViewsLabelVisible = true;
@@ -167 +166 @@
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
+      this.detailsGroupBox.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -174 +174 @@
     private System.Windows.Forms.TextBox expressionInput;
     private System.Windows.Forms.Button parseButton;
-    private System.Windows.Forms.Label errorLabel;
-    private Encodings.SymbolicExpressionTreeEncoding.Views.GraphicalSymbolicExpressionTreeView symRegTreeChart;
+    private System.Windows.Forms.Label infoLabel;
     private System.Windows.Forms.GroupBox templateStructureGroupBox;
     private System.Windows.Forms.SplitContainer splitContainer;
     private Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionTreeChart treeChart;
     private MainForm.WindowsForms.ViewHost viewHost;
+    private System.Windows.Forms.GroupBox detailsGroupBox;
   }
 }

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

@@ -24 +24 @@
     public StructureTemplateView() {
       InitializeComponent();
-      errorLabel.Text = "";
-      treeChart.SymbolicExpressionTreeNodeClicked += TreeChart_SymbolicExpressionTreeNodeClicked;
+      infoLabel.Text = "";
+      treeChart.SymbolicExpressionTreeNodeClicked += SymbolicExpressionTreeNodeClicked;
+      
     }
 
-    private void TreeChart_SymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
+    private void SymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
       var visualTreeNode = sender as VisualTreeNode<ISymbolicExpressionTreeNode>;
       if(visualTreeNode != null) {
         var subFunctionTreeNode = visualTreeNode.Content as SubFunctionTreeNode;
-        viewHost.Content = subFunctionTreeNode?.SubFunction;
+        if(Content.SubFunctions.TryGetValue(subFunctionTreeNode.Name, out SubFunction subFunction))
+          viewHost.Content = subFunction;
       }
     }
@@ -39 +41 @@
       base.OnContentChanged();
       if (Content == null) return;
-
       expressionInput.Text = Content.Template;
-      symRegTreeChart.Content = Content.Tree;
-
-      treeChart.Tree = Content.Tree;
-
-      errorLabel.Text = "";
-      
+      PaintTree();
+      infoLabel.Text = "";
     }
 
-    private void parseButton_Click(object sender, EventArgs e) {
+    private void ParseButtonClick(object sender, EventArgs e) {
       if(!string.IsNullOrEmpty(expressionInput.Text)) {
         try {
           Content.Template = expressionInput.Text;
-          symRegTreeChart.Content = Content.Tree;
-          treeChart.Tree = Content.Tree;
-
-          errorLabel.Text = "Template structure successfully parsed.";
-          errorLabel.ForeColor = Color.DarkGreen;
+          PaintTree();
+          infoLabel.Text = "Template structure successfully parsed.";
+          infoLabel.ForeColor = Color.DarkGreen;
         } catch (Exception ex) {
-          errorLabel.Text = ex.Message;
-          errorLabel.ForeColor = Color.DarkRed;
+          infoLabel.Text = ex.Message;
+          infoLabel.ForeColor = Color.DarkRed;
         }
       }
     }
 
-    private void expressionInput_TextChanged(object sender, EventArgs e) {
-      errorLabel.Text = "Unparsed changes! Press parse button to save changes.";
-      errorLabel.ForeColor = Color.DarkOrange;
+    private void ExpressionInputTextChanged(object sender, EventArgs e) {
+      infoLabel.Text = "Unparsed changes! Press parse button to save changes.";
+      infoLabel.ForeColor = Color.DarkOrange;
     }
 
+
+    private void PaintTree() {
+      if(Content != null && Content.Tree != null) {
+        treeChart.Tree = Content.Tree;
+        foreach (var n in Content.Tree.IterateNodesPrefix()) {
+          if (n.Symbol is SubFunctionSymbol) {
+            var visualNode = treeChart.GetVisualSymbolicExpressionTreeNode(n);
+            visualNode.FillColor = Color.LightCyan;
+            visualNode.LineColor = Color.SlateGray;
+          }
+        }
+        treeChart.RepaintNodes();
+      }
+    }
   }
 }