Changeset 3294 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

Timestamp:

04/09/10 17:28:32 (14 years ago)

Author:

gkronber

Message:

Added first version of architecture altering operators for ADFs. #290 (Implement ADFs)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3

Files:

• GraphicalSymbolicExpressionTreeView.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj (modified) (3 diffs)
• SymbolicExpressionTreeChart.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/GraphicalSymbolicExpressionTreeView.cs

@@ -31 +31 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Core.Views;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
   [View("Graphical SymbolicExpressionTree View")]
   [Content(typeof(SymbolicExpressionTree), true)]
-  public partial class GraphicalSymbolicExpressionTreeView : AsynchronousContentView {
+  public partial class GraphicalSymbolicExpressionTreeView : ItemView {
     public new SymbolicExpressionTree Content {
       get { return (SymbolicExpressionTree)base.Content; }
@@ -60 +61 @@
       }
     }
-    
-    //private VisualFunctionTreeModel visualModel;
-    //public VisualFunctionTreeModel VisualModel {
-    //  get { return this.visualModel; }
-    //  private set {
-    //    if (value != this.visualModel) {
-    //      if (this.visualModel != null)
-    //        this.visualModel.Changed -= new EventHandler(model_Changed);
-
-    //      if (value == null) {
-    //        this.Caption = "Formula tree";
-    //        this.functionTreeChart.FunctionTree = null;
-    //      } else {
-    //        value.Changed += new EventHandler(model_Changed);
-    //        this.functionTreeChart.FunctionTree = value.FunctionTree;
-    //        this.Caption = value.ModelName + " formula tree";
-    //      }
-    //      this.visualModel = value;
-    //    }
-    //  }
-    //}
-
-    private void functionTreeChart_FunctionTreeClicked(object sender, MouseEventArgs e) {
-      VisualSymbolicExpressionTreeNode visualFunctionTreeNode = (VisualSymbolicExpressionTreeNode)sender;
-      visualFunctionTreeNode.LineColor = Color.Red;
-      this.symbolicExpressionTreeChart.Repaint();
-    }
-
-    private void functionTreeChart_FunctionTreeDoubleClicked(object sender, MouseEventArgs e) {
-      VisualSymbolicExpressionTreeNode visualFunctionTreeNode = (VisualSymbolicExpressionTreeNode)sender;
-      visualFunctionTreeNode.FillColor = Color.Blue;
-      this.symbolicExpressionTreeChart.Repaint();
-    }
   }
 }

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj

@@ -89 +89 @@
     </Compile>
     <Compile Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs" />
+    <Compile Include="PropertiesView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="PropertiesView.Designer.cs">
+      <DependentUpon>PropertiesView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -110 +116 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
+      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
+      <Name>HeuristicLab.Core.Views-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
@@ -140 +150 @@
       <DependentUpon>GraphicalSymbolicExpressionTreeView.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="PropertiesView.resx">
+      <DependentUpon>PropertiesView.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionTreeChart.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
-  public partial class SymbolicExpressionTreeChart : UserControl {
+  public sealed partial class SymbolicExpressionTreeChart : UserControl {
     private StringFormat stringFormat;
     private Dictionary<SymbolicExpressionTreeNode, VisualSymbolicExpressionTreeNode> visualTreeNodes;