Changeset 3244 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3

Timestamp:

03/31/10 18:34:34 (14 years ago)

Author:

gkronber

Message:

Integrated graphical symbolic expression tree view from model analyzer. #937 (Data types and operators for symbolic expression tree encoding)

Location:

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

Files:

• GraphicalSymbolicExpressionTreeView.Designer.cs (added)
• GraphicalSymbolicExpressionTreeView.cs (added)
• GraphicalSymbolicExpressionTreeView.resx (added)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.csproj (modified) (2 diffs)
• Properties/Resources.Designer.cs (added)
• Properties/Resources.resx (added)
• SymbolicExpressionTreeChart.Designer.cs (added)
• SymbolicExpressionTreeChart.cs (added)
• SymbolicExpressionTreeChart.resx (added)
• SymbolicExpressionView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionTreeView.Designer.cs) (1 diff)
• SymbolicExpressionView.cs (moved) (moved from trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionTreeView.cs) (3 diffs)
• VisualSymbolicExpressionTreeNode.cs (added)

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

@@ -82 +82 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GraphicalSymbolicExpressionTreeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GraphicalSymbolicExpressionTreeView.Designer.cs">
+      <DependentUpon>GraphicalSymbolicExpressionTreeView.cs</DependentUpon>
+    </Compile>
     <Compile Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingViewsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SymbolicExpressionTreeView.cs">
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="SymbolicExpressionTreeChart.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="SymbolicExpressionTreeView.Designer.cs">
-      <DependentUpon>SymbolicExpressionTreeView.cs</DependentUpon>
+    <Compile Include="SymbolicExpressionTreeChart.Designer.cs">
+      <DependentUpon>SymbolicExpressionTreeChart.cs</DependentUpon>
     </Compile>
+    <Compile Include="SymbolicExpressionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SymbolicExpressionView.Designer.cs">
+      <DependentUpon>SymbolicExpressionView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="VisualSymbolicExpressionTreeNode.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -118 +136 @@
     <None Include="Properties\AssemblyInfo.frame" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="GraphicalSymbolicExpressionTreeView.resx">
+      <DependentUpon>GraphicalSymbolicExpressionTreeView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SymbolicExpressionTreeChart.resx">
+      <DependentUpon>SymbolicExpressionTreeChart.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.3/SymbolicExpressionView.Designer.cs

@@ -1 +1 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
-  partial class SymbolicExpressionTreeView {
+  partial class SymbolicExpressionView {
     /// <summary> 
     /// Required designer variable.

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

@@ -11 +11 @@
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
-  [View("SymbolicExpressionTree View")]
-  [Content(typeof(SymbolicExpressionTree), true)]
-  public partial class SymbolicExpressionTreeView : AsynchronousContentView {
+  [View("SymbolicExpression View")]
+  [Content(typeof(SymbolicExpressionTree), false)]
+  public partial class SymbolicExpressionView : AsynchronousContentView {
     public new SymbolicExpressionTree Content {
       get { return (SymbolicExpressionTree)base.Content; }
@@ -19 +19 @@
     }
 
-    public SymbolicExpressionTreeView() {
+    public SymbolicExpressionView() {
       InitializeComponent();
-      Caption = "SymbolicExpressionTree View";
+      Caption = "SymbolicExpression View";
     }
 
-    public SymbolicExpressionTreeView(SymbolicExpressionTree content)
+    public SymbolicExpressionView(SymbolicExpressionTree content)
       : this() {
       Content = content;
@@ -33 +33 @@
       base.OnContentChanged();
       if (Content == null) {
-        Caption = "SymbolicExpressionTree View";
+        Caption = "SymbolicExpression View";
         textBox.Text = string.Empty;
         textBox.Enabled = false;