Changeset 11611 for branches

Timestamp:

12/01/14 22:09:58 (10 years ago)

Author:

ascheibe

Message:

#2031 adapted statistical testing view to new histogram

Location:

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3

Files:

• DensityDataTableView.cs (deleted)
• HeuristicLab.Analysis.Statistics-3.3.csproj (modified) (1 diff)
• NormalDistribution.cs (deleted)
• StatisticalTestingView.cs (modified) (1 diff)
• StatisticalTestingView.designer.cs (modified) (3 diffs)

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/HeuristicLab.Analysis.Statistics-3.3.csproj

@@ -120 +120 @@
   <ItemGroup>
     <Compile Include="BonferroniHolm.cs" />
-    <Compile Include="DensityDataTableView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
     <Compile Include="EnumerableStatisticsExtension.cs" />
     <Compile Include="ExpFitting.cs" />
     <Compile Include="IFitting.cs" />
-    <Compile Include="NormalDistribution.cs" />
     <Compile Include="LinearLeastSquaresFitting.cs" />
     <Compile Include="LogFitting.cs" />

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs

@@ -205 +205 @@
         }
 
-        dataTableView.Content = histogramDataTable;
+        GenerateChart(histogramDataTable);
         stringConvertibleMatrixView.Content = dt;
+      }
+    }
+
+    private void GenerateChart(DataTable histogramTable) {
+      foreach (var row in histogramTable.Rows) {
+        dataTableView.AddPoints(row.Name, row.Values, true);
       }
     }

branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.designer.cs

@@ -74 +74 @@
       this.tabPage1 = new System.Windows.Forms.TabPage();
       this.tabPage2 = new System.Windows.Forms.TabPage();
-      this.dataTableView = new DensityDataTableView();
+      this.dataTableView = new HeuristicLab.Analysis.Views.HistogramControl();
       this.contextMenuStrip1.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -456 +456 @@
             | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.dataTableView.Caption = "DataTable View";
-      this.dataTableView.Content = null;
       this.dataTableView.Location = new System.Drawing.Point(6, 6);
       this.dataTableView.Name = "dataTableView";
-      this.dataTableView.ReadOnly = false;
       this.dataTableView.Size = new System.Drawing.Size(910, 529);
       this.dataTableView.TabIndex = 0;
@@ -523 +520 @@
     private System.Windows.Forms.TabPage tabPage1;
     private System.Windows.Forms.TabPage tabPage2;
-    private DensityDataTableView dataTableView;
+    private HeuristicLab.Analysis.Views.HistogramControl dataTableView;
   }
 }