Changeset 9239 for branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4

Timestamp:

02/21/13 16:16:21 (12 years ago)

Author:

bburlacu

Message:

#1772: Minor updates to existing views. Added LineageExplorerView.

Location:

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4

Files:

• . (modified) (1 prop)
• GenealogyGraphChart.cs (modified) (3 diffs)
• GenealogyGraphDialog.Designer.cs (added)
• GenealogyGraphDialog.cs (added)
• GenealogyGraphView.cs (modified) (1 diff)
• HeuristicLab.EvolutionaryTracking.Views-3.4.csproj (modified) (4 diffs)
• LineageExplorerView.Designer.cs (added)
• LineageExplorerView.cs (added)

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4

@@ -1 +1 @@
 obj
+*.resx

@@ -1 +1 @@
 obj
+*.resx

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphChart.cs

@@ -47 +47 @@
       internal set {
         graph = value;
+        if (graph == null) return;
         // TODO: should move the subtree sorting code out of here and int the view
         var canonicalSorter = new SymbolicExpressionTreeCanonicalSorter();
@@ -172 +173 @@
 
       DrawLineage(visualNode, n => n.IncomingArcs, a => a.Source);
+      visualNode.Brush = null;
       DrawLineage(visualNode, n => n.OutgoingArcs, a => a.Target);
 
@@ -186 +188 @@
                              Func<VisualGenealogyGraphNode, IEnumerable<VisualGenealogyGraphArc>> arcSelector,
                              Func<VisualGenealogyGraphArc, VisualGenealogyGraphNode> nodeSelector) {
+      if (node.Brush != null) return;
       node.Brush = new SolidBrush(node.Data.GetColor());
       var arcs = arcSelector(node);
+      if (arcs == null) return;
       foreach (var arc in arcs) {
         var source = arc.Source.Data;

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/GenealogyGraphView.cs

@@ -108 +108 @@
       if (arc == null) return;
       var fragment = (IFragment)arc.Data;
+      if (fragment.Root == null) return;
       foreach (var node in fragment.Root.IterateNodesBreadth()) {
         var visualSymbExprTreeNode = symbolicExpressionTreeChart.GetVisualSymbolicExpressionTreeNode(node);

branches/HeuristicLab.EvolutionaryTracking/HeuristicLab.EvolutionaryTracking.Views/3.4/HeuristicLab.EvolutionaryTracking.Views-3.4.csproj

@@ -94 +94 @@
       <DependentUpon>GenealogyGraphChart.cs</DependentUpon>
     </Compile>
+    <Compile Include="GenealogyGraphDialog.cs" />
+    <Compile Include="GenealogyGraphDialog.designer.cs">
+      <DependentUpon>GenealogyGraphDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="GenealogyGraphView.cs">
       <SubType>UserControl</SubType>
@@ -99 +103 @@
     <Compile Include="GenealogyGraphView.Designer.cs">
       <DependentUpon>GenealogyGraphView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="LineageExplorerView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="LineageExplorerView.Designer.cs">
+      <DependentUpon>LineageExplorerView.cs</DependentUpon>
     </Compile>
     <Compile Include="Plugin.cs" />
@@ -112 +122 @@
   <ItemGroup>
     <ProjectReference Include="..\..\HeuristicLab.EvolutionaryTracking\3.4\HeuristicLab.EvolutionaryTracking-3.4.csproj">
-      <Project>{1F75CEA3-464F-4A6F-B2F0-04B9841EBC16}</Project>
+      <Project>{1f75cea3-464f-4a6f-b2f0-04b9841ebc16}</Project>
       <Name>HeuristicLab.EvolutionaryTracking-3.4</Name>
     </ProjectReference>
@@ -124 +134 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="GenealogyGraphDialog.resx">
+      <DependentUpon>GenealogyGraphDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="GenealogyGraphView.resx">
       <DependentUpon>GenealogyGraphView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="LineageExplorerView.resx">
+      <DependentUpon>LineageExplorerView.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">

@@ -1 +1 @@
 obj
+*.resx