Changeset 12208 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views

Timestamp:

03/17/15 08:48:41 (9 years ago)

Author:

bburlacu

Message:

#1772: Merged trunk and worked on the graph view.

Location:

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4

Files:

• GenealogyGraphChart.cs (modified) (3 diffs)
• GenealogyGraphView.Designer.cs (modified) (4 diffs)
• HeuristicLab.EvolutionTracking.Views-3.4.csproj (modified) (2 diffs)

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

@@ -66 +66 @@
       }
       set {
+        if (value == null || value == SelectedGraphNode)
+          return;
         SelectedVisualNode = GetMappedNode(value);
         UpdateSelectedVisualNode();
@@ -90 +92 @@
     protected VisualGenealogyGraphNode SelectedVisualNode { get; set; }
 
-    private VisualGenealogyGraphNode GetMappedNode(IGenealogyGraphNode node) {
+    public VisualGenealogyGraphNode GetMappedNode(IGenealogyGraphNode node) {
       VisualGenealogyGraphNode v;
       nodeMap.TryGetValue(node, out v);
@@ -96 +98 @@
     }
 
-    private VisualGenealogyGraphArc GetMappedArc(IGenealogyGraphNode source, IGenealogyGraphNode target) {
+    public VisualGenealogyGraphArc GetMappedArc(IGenealogyGraphNode source, IGenealogyGraphNode target) {
       VisualGenealogyGraphNode visualSource, visualTarget;
       nodeMap.TryGetValue(source, out visualSource);

branches/HeuristicLab.EvolutionTracking/HeuristicLab.EvolutionTracking.Views/3.4/GenealogyGraphView.Designer.cs

@@ -26 +26 @@
     private void InitializeComponent() {
       this.splitContainer = new System.Windows.Forms.SplitContainer();
-      this.genealogyGraphChart = new HeuristicLab.EvolutionTracking.Views.GenealogyGraphChart();
       this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.groupBox = new System.Windows.Forms.GroupBox();
+      this.openNew_CheckBox = new System.Windows.Forms.CheckBox();
       this.lockGraph_checkBox = new System.Windows.Forms.CheckBox();
       this.simpleLineages_checkBox = new System.Windows.Forms.CheckBox();
       this.trace_checkBox = new System.Windows.Forms.CheckBox();
-      this.openNew_CheckBox = new System.Windows.Forms.CheckBox();
+      this.genealogyGraphChart = new HeuristicLab.EvolutionTracking.Views.GenealogyGraphChart();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -59 +59 @@
       this.splitContainer.TabIndex = 0;
       // 
-      // genealogyGraphChart
-      // 
-      this.genealogyGraphChart.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.genealogyGraphChart.BackColor = System.Drawing.SystemColors.Control;
-      this.genealogyGraphChart.GenealogyGraph = null;
-      this.genealogyGraphChart.Location = new System.Drawing.Point(0, 0);
-      this.genealogyGraphChart.LockGenealogy = false;
-      this.genealogyGraphChart.Name = "genealogyGraphChart";
-      this.genealogyGraphChart.ScaleOnResize = true;
-      this.genealogyGraphChart.SimpleLineages = false;
-      this.genealogyGraphChart.Size = new System.Drawing.Size(689, 738);
-      this.genealogyGraphChart.TabIndex = 0;
-      this.genealogyGraphChart.TraceFragments = false;
-      this.genealogyGraphChart.UpdateEnabled = true;
-      // 
       // viewHost
       // 
@@ -101 +84 @@
       this.groupBox.Location = new System.Drawing.Point(3, 4);
       this.groupBox.Name = "groupBox";
-      this.groupBox.Size = new System.Drawing.Size(411, 44);
+      this.groupBox.Size = new System.Drawing.Size(602, 44);
       this.groupBox.TabIndex = 1;
       this.groupBox.TabStop = false;
       this.groupBox.Text = "Genealogy Options";
+      // 
+      // openNew_CheckBox
+      // 
+      this.openNew_CheckBox.AutoSize = true;
+      this.openNew_CheckBox.Location = new System.Drawing.Point(485, 19);
+      this.openNew_CheckBox.Name = "openNew_CheckBox";
+      this.openNew_CheckBox.Size = new System.Drawing.Size(111, 17);
+      this.openNew_CheckBox.TabIndex = 1;
+      this.openNew_CheckBox.Text = "Open in new view";
+      this.openNew_CheckBox.UseVisualStyleBackColor = true;
       // 
       // lockGraph_checkBox
@@ -142 +135 @@
       this.trace_checkBox.CheckedChanged += new System.EventHandler(this.trace_checkBox_CheckedChanged);
       // 
-      // openNew_CheckBox
+      // genealogyGraphChart
       // 
-      this.openNew_CheckBox.AutoSize = true;
-      this.openNew_CheckBox.Location = new System.Drawing.Point(237, 20);
-      this.openNew_CheckBox.Name = "openNew_CheckBox";
-      this.openNew_CheckBox.Size = new System.Drawing.Size(111, 17);
-      this.openNew_CheckBox.TabIndex = 1;
-      this.openNew_CheckBox.Text = "Open in new view";
-      this.openNew_CheckBox.UseVisualStyleBackColor = true;
+      this.genealogyGraphChart.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.genealogyGraphChart.BackColor = System.Drawing.SystemColors.Control;
+      this.genealogyGraphChart.GenealogyGraph = null;
+      this.genealogyGraphChart.Location = new System.Drawing.Point(0, 0);
+      this.genealogyGraphChart.LockGenealogy = false;
+      this.genealogyGraphChart.Name = "genealogyGraphChart";
+      this.genealogyGraphChart.ScaleOnResize = true;
+      this.genealogyGraphChart.SelectedGraphNode = null;
+      this.genealogyGraphChart.SimpleLineages = false;
+      this.genealogyGraphChart.Size = new System.Drawing.Size(689, 738);
+      this.genealogyGraphChart.TabIndex = 0;
+      this.genealogyGraphChart.TraceFragments = false;
+      this.genealogyGraphChart.UpdateEnabled = true;
       // 
       // GenealogyGraphView

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

@@ -24 +24 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -128 +129 @@
   <ItemGroup>
     <None Include="HeuristicLab.snk" />
+    <None Include="Plugin.cs.frame" />
   </ItemGroup>
   <ItemGroup>