Changeset 9055 for trunk

Timestamp:

12/14/12 11:18:01 (12 years ago)

Author:

mkommend

Message:

#1763: Minor refactoring in tree simplifier and according views. Additionally model updates are displayed in the according views.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Files:

• GraphicalSymbolicDataAnalysisModelView.cs (modified) (1 diff)
• InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs (modified) (4 diffs)
• InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (3 diffs)
• InteractiveSymbolicExpressionTreeChart.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.cs

@@ -40 +40 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      symbolicExpressionTreeView.Content = null;
       if (Content != null)
         symbolicExpressionTreeView.Content = Content.SymbolicExpressionTree;
-      else
-        symbolicExpressionTreeView.Content = null;
     }
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs

@@ -67 +67 @@
       // viewHost
       // 
-      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.viewHost.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.viewHost.Caption = "View";
@@ -126 +126 @@
       // flowLayoutPanel
       // 
-      this.flowLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+      this.flowLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.flowLayoutPanel.Controls.Add(this.btnSimplify);
@@ -170 +170 @@
       // treeChart
       // 
-      this.treeChart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | 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;
@@ -184 +184 @@
       this.treeChart.TextFont = new System.Drawing.Font("Times New Roman", 8F);
       this.treeChart.Tree = null;
-      this.treeChart.SymbolicExpressionTreeNodeClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeClicked);
       this.treeChart.SymbolicExpressionTreeNodeDoubleClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeDoubleClicked);
       // 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -108 +108 @@
         treeStatusValue.ForeColor = Color.Green;
       } else {
-        btnOptimizeConstants.Enabled = true;
-        btnSimplify.Enabled = true;
+        btnOptimizeConstants.Enabled = false;
+        btnSimplify.Enabled = false;
         treeStatusValue.Text = "Invalid";
         treeStatusValue.ForeColor = Color.Red;
@@ -167 +167 @@
       constantTreeNode.Value = value;
       return constantTreeNode;
-    }
-
-    private void treeChart_SymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
     }
 
@@ -186 +183 @@
         parent.InsertSubtree(indexOfSubtree, originalNode);
         changedNodes.Remove(symbExprTreeNode);
-        UpdateModel(tree);
       } else if (foldedNodes.ContainsKey(symbExprTreeNode)) {
         // undo node folding
         SwitchNodeWithReplacementNode(parent, indexOfSubtree);
-        UpdateModel(tree);
-      }
+      }
+      UpdateModel(tree);
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs

@@ -79 +79 @@
 
     protected override void OnSymbolicExpressionTreeNodeClicked(object sender, MouseEventArgs e) {
-      if (currSelected != null) {
-        currSelected.LineColor = Color.FromArgb(255, currSelected.LineColor);
-        RepaintNode(currSelected);
-      }
       currSelected = (VisualSymbolicExpressionTreeNode)sender; ;
       if (currSelected != null) {
@@ -88 +84 @@
         RepaintNode(currSelected);
       }
+      base.OnSymbolicExpressionTreeNodeClicked(sender, e);
     }
 
     protected override void SymbolicExpressionTreeChart_MouseClick(object sender, MouseEventArgs e) {
-      var visualTreeNode = FindVisualSymbolicExpressionTreeNodeAt(e.X, e.Y);
-      if (visualTreeNode != null) {
-        OnSymbolicExpressionTreeNodeClicked(visualTreeNode, e);
-      } else if (currSelected != null) {
+      if (currSelected != null) {
         currSelected.LineColor = Color.FromArgb(255, currSelected.LineColor);
         RepaintNode(currSelected);
-        currSelected = null;
-      }
+      }
+      base.SymbolicExpressionTreeChart_MouseClick(sender, e);
     }
 
@@ -173 +167 @@
     private void copySubtree() {
       if (tempNode != null) {
-        foreach (var subtree in tempNode.IterateNodesBreadth()) {
-          var vNode = GetVisualSymbolicExpressionTreeNode(subtree);
-          vNode.LineColor = Color.FromArgb(255, vNode.LineColor); // reset the alpha value to 255
+        foreach (var subtree in tempNode.IterateNodesPostfix()) {
+          var visualNode = GetVisualSymbolicExpressionTreeNode(subtree);
+          visualNode.LineColor = Color.FromArgb(255, visualNode.LineColor); // reset the alpha value to 255
+          visualNode.TextColor = Color.FromArgb(255, visualNode.TextColor);
           if (subtree.Parent != null) {
-            var vArc = GetVisualSymbolicExpressionTreeNodeConnection(subtree.Parent, subtree);
-            vArc.LineColor = Color.FromArgb(255, vArc.LineColor);
+            var visualLine = GetVisualSymbolicExpressionTreeNodeConnection(subtree.Parent, subtree);
+            visualLine.LineColor = Color.FromArgb(255, visualLine.LineColor);
           }
         }
@@ -197 +192 @@
     private void removeNodeToolStripMenuItem_Click(object sender, EventArgs e) {
       var node = currSelected.SymbolicExpressionTreeNode;
+      if (node == tempNode) tempNode = null;
       ModifyTree(Tree, node.Parent, node, null, removeSubtree: false);
       currSelected = null; // because the currently selected node was just deleted
@@ -202 +198 @@
     private void removeSubtreeToolStripMenuItem_Click(object sender, EventArgs e) {
       var node = currSelected.SymbolicExpressionTreeNode;
+      if (node.IterateNodesPostfix().Contains(tempNode)) tempNode = null;
       ModifyTree(Tree, node.Parent, node, null, removeSubtree: true);
       currSelected = null; // because the currently selected node was just deleted