Changeset 12208 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.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.Problems.DataAnalysis.Symbolic.Views

Files:

• . (modified) (1 prop)
• 3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (3 diffs)
• 3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.Designer.cs (modified) (9 diffs)
• 3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.cs (modified) (2 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -47 +47 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -103 +104 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="EPPlus-3.1.3, Version=3.1.3.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
+    <Reference Include="EPPlus-4.0.3, Version=4.0.3.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\trunk\sources\bin\EPPlus-3.1.3.dll</HintPath>
+      <HintPath>..\..\..\..\trunk\sources\bin\EPPlus-4.0.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -366 +367 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Tracking\SymbolicDataAnalysisGenealogyGraphView.resx">
+      <DependentUpon>SymbolicDataAnalysisGenealogyGraphView.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.nodeWeightLabel = new System.Windows.Forms.Label();
+      this.nodeWeightLabelLabel = new System.Windows.Forms.Label();
       this.navigateRightButton = new System.Windows.Forms.Button();
       this.navigateLeftButton = new System.Windows.Forms.Button();
@@ -76 +78 @@
       // groupBox1
       // 
+      this.groupBox1.Controls.Add(this.nodeWeightLabel);
+      this.groupBox1.Controls.Add(this.nodeWeightLabelLabel);
       this.groupBox1.Controls.Add(this.navigateRightButton);
       this.groupBox1.Controls.Add(this.navigateLeftButton);
@@ -84 +88 @@
       this.groupBox1.Controls.Add(this.nodeQualityLabel);
       this.groupBox1.Controls.Add(this.nodeQualityLabelLabel);
-      this.groupBox1.Location = new System.Drawing.Point(420, 4);
+      this.groupBox1.Location = new System.Drawing.Point(624, 4);
       this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Size = new System.Drawing.Size(624, 44);
+      this.groupBox1.Size = new System.Drawing.Size(617, 44);
       this.groupBox1.TabIndex = 2;
       this.groupBox1.TabStop = false;
       this.groupBox1.Text = "Current Node";
       // 
+      // nodeWeightLabel
+      // 
+      this.nodeWeightLabel.AutoSize = true;
+      this.nodeWeightLabel.Location = new System.Drawing.Point(285, 20);
+      this.nodeWeightLabel.Name = "nodeWeightLabel";
+      this.nodeWeightLabel.Size = new System.Drawing.Size(0, 13);
+      this.nodeWeightLabel.TabIndex = 8;
+      // 
+      // nodeWeightLabelLabel
+      // 
+      this.nodeWeightLabelLabel.AutoSize = true;
+      this.nodeWeightLabelLabel.Location = new System.Drawing.Point(241, 20);
+      this.nodeWeightLabelLabel.Name = "nodeWeightLabelLabel";
+      this.nodeWeightLabelLabel.Size = new System.Drawing.Size(44, 13);
+      this.nodeWeightLabelLabel.TabIndex = 7;
+      this.nodeWeightLabelLabel.Text = "Weight:";
+      // 
       // navigateRightButton
       // 
       this.navigateRightButton.Image = global::HeuristicLab.Problems.DataAnalysis.Symbolic.Views.Properties.Resources.LargeLeftDiagonal_235;
-      this.navigateRightButton.Location = new System.Drawing.Point(309, 15);
+      this.navigateRightButton.Location = new System.Drawing.Point(589, 14);
       this.navigateRightButton.Name = "navigateRightButton";
       this.navigateRightButton.Size = new System.Drawing.Size(22, 22);
@@ -104 +125 @@
       // 
       this.navigateLeftButton.Image = global::HeuristicLab.Problems.DataAnalysis.Symbolic.Views.Properties.Resources.LargeRightDiagonal_238;
-      this.navigateLeftButton.Location = new System.Drawing.Point(281, 15);
+      this.navigateLeftButton.Location = new System.Drawing.Point(561, 14);
       this.navigateLeftButton.Name = "navigateLeftButton";
       this.navigateLeftButton.Size = new System.Drawing.Size(22, 22);
@@ -114 +135 @@
       // 
       this.nodeDegreeLabel.AutoSize = true;
-      this.nodeDegreeLabel.Location = new System.Drawing.Point(235, 20);
+      this.nodeDegreeLabel.Location = new System.Drawing.Point(205, 20);
       this.nodeDegreeLabel.Name = "nodeDegreeLabel";
       this.nodeDegreeLabel.Size = new System.Drawing.Size(0, 13);
@@ -122 +143 @@
       // 
       this.nodeDegreeLabelLabel.AutoSize = true;
-      this.nodeDegreeLabelLabel.Location = new System.Drawing.Point(192, 20);
+      this.nodeDegreeLabelLabel.Location = new System.Drawing.Point(154, 20);
       this.nodeDegreeLabelLabel.Name = "nodeDegreeLabelLabel";
       this.nodeDegreeLabelLabel.Size = new System.Drawing.Size(45, 13);
@@ -131 +152 @@
       // 
       this.nodeRankLabel.AutoSize = true;
-      this.nodeRankLabel.Location = new System.Drawing.Point(138, 20);
+      this.nodeRankLabel.Location = new System.Drawing.Point(123, 20);
       this.nodeRankLabel.Name = "nodeRankLabel";
       this.nodeRankLabel.Size = new System.Drawing.Size(0, 13);
@@ -139 +160 @@
       // 
       this.nodeRankLabelLabel.AutoSize = true;
-      this.nodeRankLabelLabel.Location = new System.Drawing.Point(96, 20);
+      this.nodeRankLabelLabel.Location = new System.Drawing.Point(81, 20);
       this.nodeRankLabelLabel.Name = "nodeRankLabelLabel";
       this.nodeRankLabelLabel.Size = new System.Drawing.Size(36, 13);
@@ -192 +213 @@
     private System.Windows.Forms.Button navigateRightButton;
     private System.Windows.Forms.Button navigateLeftButton;
+    private System.Windows.Forms.Label nodeWeightLabelLabel;
+    private System.Windows.Forms.Label nodeWeightLabel;
   }
 }

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Tracking/SymbolicDataAnalysisGenealogyGraphView.cs

@@ -92 +92 @@
       nodeRankLabel.Text = String.Format("{0:0.0}", graphNode.Rank);
       nodeDegreeLabel.Text = String.Format("{0} / {1}", graphNode.InDegree, graphNode.OutDegree);
+      nodeWeightLabel.Text = String.Format("{0:0.00}", graphNode.Weight);
 
       if (openNew_CheckBox.Checked) {
@@ -143 +144 @@
               genealogyGraphChart.UpdateEnabled = true;
               genealogyGraphChart.EnforceUpdate();
-              MainFormManager.MainForm.ShowContent(traceGraph); // display the fragment graph on the screen
+              if (openNew_CheckBox.Checked)
+                MainFormManager.MainForm.ShowContent(traceGraph); // display the fragment graph on the screen
+
+              var max = traceGraph.Vertices.Max(x => x.Weight);
+
+              genealogyGraphChart.UpdateEnabled = false;
+              foreach (var traceNode in traceGraph.Vertices) {
+                var g = Content.GetByContent(traceNode.Data);
+                g.Weight = traceNode.Weight;
+                var v = genealogyGraphChart.GetMappedNode(g);
+                if (v != null) {
+                  int i = (int)Math.Round(g.Weight * (ColorGradient.Colors.Count - 1) / max);
+
+                  v.Brush = new SolidBrush(ColorGradient.Colors[i]);
+                }
+              }
+              genealogyGraphChart.UpdateEnabled = true;
+              genealogyGraphChart.EnforceUpdate();
             }
           } else {