Changeset 6010

Timestamp:

04/14/11 00:18:46 (14 years ago)

Author:

abeham

Message:

#1465

• worked on histogram integration
  • Added control to display DataRowVisualProperties
  • Added a dialog to select the DataRowVisualProperties of different series
  • Added a Properties menu item to the context menu and an option to show or hide this item (default is hide)

Location:

branches/histogram

Files:

• HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.Designer.cs (added)
• HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.cs (added)
• HeuristicLab.Analysis.Views/3.3/DataRowVisualPropertiesControl.resx (added)
• HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (6 diffs)
• HeuristicLab.Analysis.Views/3.3/DataTableView.resx (added)
• HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.Designer.cs (added)
• HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.cs (added)
• HeuristicLab.Analysis.Views/3.3/DataTableVisualPropertiesDialog.resx (added)
• HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Analysis.Views/3.3/HeuristicLabAnalysisViewsPlugin.cs.frame (modified) (1 diff)
• HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs (modified) (3 diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/QAPAlleleFrequencyAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.Designer.cs (modified) (4 diffs)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs (modified) (3 diffs)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.resx (added)
• HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj (modified) (1 diff)

branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs

@@ -89 +89 @@
       series1.Name = "Default";
       this.chart.Series.Add(series1);
+      this.chart.ShowPropertiesContextMenuItem = true;
       this.chart.Size = new System.Drawing.Size(359, 248);
       this.chart.TabIndex = 3;
@@ -96 +97 @@
       title1.Text = "Title";
       this.chart.Titles.Add(title1);
+      this.chart.PropertiesClicked += new System.EventHandler(this.chart_PropertiesClicked);
       this.chart.CustomizeLegend += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CustomizeLegendEventArgs>(this.chart_CustomizeLegend);
       this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);

branches/histogram/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -133 +133 @@
           series.ChartType = SeriesChartType.FastPoint;
           break;
+        case DataRowVisualProperties.DataRowChartType.Histogram:
+          series.ChartType = SeriesChartType.Column;
+          series["PointWidth"] = "1";
+          break;
         default:
           series.ChartType = SeriesChartType.FastPoint;
@@ -283 +287 @@
       else {
         DataRow row = (DataRow)sender;
+        if (chart.Series[row.Name].IsCustomPropertySet("PointWidth"))
+          chart.Series[row.Name].DeleteCustomProperty("PointWidth");
         switch (row.VisualProperties.ChartType) {
           case DataRowVisualProperties.DataRowChartType.Line:
@@ -296 +302 @@
             chart.Series[row.Name].ChartType = SeriesChartType.FastPoint;
             break;
+          case DataRowVisualProperties.DataRowChartType.Histogram:
+            chart.Series[row.Name].ChartType = SeriesChartType.Column;
+            chart.Series[row.Name]["PointWidth"] = "1";
+            break;
           default:
             chart.Series[row.Name].ChartType = SeriesChartType.FastPoint;
@@ -354 +364 @@
           Series rowSeries = chart.Series[row.Name];
           if (!invisibleSeries.Contains(rowSeries)) {
-            foreach (IndexedItem<double> item in e.Items) {
-              if (IsInvalidValue(item.Value))
-                rowSeries.Points[item.Index].IsEmpty = true;
-              else {
-                rowSeries.Points[item.Index].YValues = new double[] { item.Value };
-                rowSeries.Points[item.Index].IsEmpty = false;
+            if (row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram) {
+              rowSeries.Points.Clear();
+              FillSeriesWithRowValues(rowSeries, row);
+            } else {
+              foreach (IndexedItem<double> item in e.Items) {
+                if (IsInvalidValue(item.Value))
+                  rowSeries.Points[item.Index].IsEmpty = true;
+                else {
+                  rowSeries.Points[item.Index].YValues = new double[] { item.Value };
+                  rowSeries.Points[item.Index].IsEmpty = false;
+                }
               }
             }
@@ -429 +444 @@
 
     private void FillSeriesWithRowValues(Series series, DataRow row) {
-      for (int i = 0; i < row.Values.Count; i++) {
-        var value = row.Values[i];
-        DataPoint point = new DataPoint();
-        point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;
-        if (IsInvalidValue(value))
-          point.IsEmpty = true;
-        else
-          point.YValues = new double[] { value };
-        series.Points.Add(point);
-      }
+      if (row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram) {
+        series.Points.Clear();
+        if (!row.Values.Any()) return;
+        int bins = row.VisualProperties.Bins;
+
+        double minValue = row.Values.Min();
+        double maxValue = row.Values.Max();
+        double intervalWidth = (maxValue - minValue) / bins;
+        if (intervalWidth <= 0) return;
+
+        if (!row.VisualProperties.ExactBins) {
+          intervalWidth = HumanRoundRange(intervalWidth);
+          minValue = Math.Floor(minValue / intervalWidth) * intervalWidth;
+          maxValue = Math.Ceiling(maxValue / intervalWidth) * intervalWidth;
+        }
+
+        double current = minValue, intervalCenter = intervalWidth / 2.0;
+        int frequency = 0;
+        foreach (double v in row.Values.Where(x => !IsInvalidValue(x)).OrderBy(x => x)) {
+          while (v > current + intervalWidth) {
+            series.Points.AddXY(current + intervalCenter, frequency);
+            current += intervalWidth;
+            frequency = 0;
+          }
+          frequency++;
+        }
+        series.Points.AddXY(current + intervalCenter, frequency);
+      } else {
+        for (int i = 0; i < row.Values.Count; i++) {
+          var value = row.Values[i];
+          DataPoint point = new DataPoint();
+          point.XValue = row.VisualProperties.StartIndexZero ? i : i + 1;
+          if (IsInvalidValue(value))
+            point.IsEmpty = true;
+          else
+            point.YValues = new double[] { value };
+          series.Points.Add(point);
+        }
+      }
+    }
+
+    private double HumanRoundRange(double range) {
+      double base10 = Math.Pow(10.0, Math.Floor(Math.Log10(range)));
+      double rounding = range / base10;
+      if (rounding <= 1.5) rounding = 1;
+      else if (rounding <= 2.25) rounding = 2;
+      else if (rounding <= 3.75) rounding = 2.5;
+      else if (rounding <= 7.5) rounding = 5;
+      else rounding = 10;
+      return rounding * base10;
     }
 
@@ -459 +514 @@
       }
     }
+
+    private void chart_PropertiesClicked(object sender, EventArgs e) {
+      DataTableVisualPropertiesDialog dialog = new DataTableVisualPropertiesDialog(Content);
+      dialog.ShowDialog();
+    }
     #endregion
 

branches/histogram/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

@@ -130 +130 @@
       <DependentUpon>AggregatedHistogramHistoryView.cs</DependentUpon>
     </Compile>
+    <Compile Include="DataRowVisualPropertiesControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DataRowVisualPropertiesControl.Designer.cs">
+      <DependentUpon>DataRowVisualPropertiesControl.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DataTableVisualPropertiesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DataTableVisualPropertiesDialog.Designer.cs">
+      <DependentUpon>DataTableVisualPropertiesDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="HistogramHistoryView.cs">
       <SubType>UserControl</SubType>
@@ -193 +205 @@
       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
       <Name>HeuristicLab.Collections-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
@@ -251 +267 @@
     <EmbeddedResource Include="AggregatedHistogramHistoryView.resx">
       <DependentUpon>AggregatedHistogramHistoryView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DataRowVisualPropertiesControl.resx">
+      <DependentUpon>DataRowVisualPropertiesControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DataTableView.resx">
+      <DependentUpon>DataTableView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DataTableVisualPropertiesDialog.resx">
+      <DependentUpon>DataTableVisualPropertiesDialog.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="HeatMapView.resx">

branches/histogram/HeuristicLab.Analysis.Views/3.3/HeuristicLabAnalysisViewsPlugin.cs.frame

@@ -31 +31 @@
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Core.Views", "3.3")]

branches/histogram/HeuristicLab.Analysis/3.3/DataVisualization/DataRowVisualProperties.cs

@@ -36 +36 @@
       Columns,
       Points,
-      Bars
+      Bars,
+      Histogram
     }
     #endregion
@@ -80 +81 @@
       }
     }
+    private int bins;
+    public int Bins {
+      get { return bins; }
+      set {
+        if (bins != value) {
+          bins = value;
+          OnPropertyChanged("Bins");
+        }
+      }
+    }
+    private bool exactBins;
+    public bool ExactBins {
+      get { return exactBins; }
+      set {
+        if (exactBins != value) {
+          exactBins = value;
+          OnPropertyChanged("ExactBins");
+        }
+      }
+    }
 
     #region Persistence Properties
@@ -101 +122 @@
       get { return startIndexZero; }
       set { startIndexZero = value; }
+    }
+    [Storable(Name = "Bins")]
+    private int StorableBins {
+      get { return bins; }
+      set { bins = value; }
+    }
+    [Storable(Name = "ExactBins")]
+    private bool StorableExactBins {
+      get { return exactBins; }
+      set { exactBins = value; }
     }
     #endregion

branches/histogram/HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/QAPAlleleFrequencyAnalyzer.cs

@@ -68 +68 @@
         for (int j = 0; j < solution.Length; j++)
           impact += weights[source, j] * distances[target, solution[j]];
-        alleles[i] = new Allele(source.ToString() + "-" + target.ToString(), impact);
+        alleles[i] = new Allele(source.ToString() + "->" + target.ToString(), impact);
       }
 

branches/histogram/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.Designer.cs

@@ -50 +50 @@
       this.copyImageToClipboardBitmapToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+      this.propertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.propertiesToolStripSeparator = new System.Windows.Forms.ToolStripSeparator();
       this.contextMenuStrip.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -58 +60 @@
       this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.exportChartToolStripMenuItem,
-            this.copyImageToClipboardBitmapToolStripMenuItem});
+            this.copyImageToClipboardBitmapToolStripMenuItem,
+            this.propertiesToolStripSeparator,
+            this.propertiesToolStripMenuItem});
       this.contextMenuStrip.Name = "contextMenuStrip";
-      this.contextMenuStrip.Size = new System.Drawing.Size(257, 48);
+      this.contextMenuStrip.Size = new System.Drawing.Size(257, 76);
+      this.contextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip_Opening);
       // 
       // exportChartToolStripMenuItem
@@ -78 +83 @@
       // saveFileDialog
       // 
-      this.saveFileDialog.Filter = "Bitmap (*.bmp)|*.bmp|JPEG (*.jpg)|*.jpg|EMF (*.emf)|*.emf|PNG (*.png)|*.png|GIF " +
-          "(*.gif)|*.gif|TIFF (*.tif)|*.tif\"";
+      this.saveFileDialog.Filter = "Bitmap (*.bmp)|*.bmp|JPEG (*.jpg)|*.jpg|EMF (*.emf)|*.emf|PNG (*.png)|*.png|GIF (" +
+          "*.gif)|*.gif|TIFF (*.tif)|*.tif\"";
       this.saveFileDialog.FilterIndex = 2;
+      // 
+      // propertiesToolStripMenuItem
+      // 
+      this.propertiesToolStripMenuItem.Name = "propertiesToolStripMenuItem";
+      this.propertiesToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
+      this.propertiesToolStripMenuItem.Text = "Properties";
+      this.propertiesToolStripMenuItem.Click += new System.EventHandler(this.propertiesToolStripMenuItem_Click);
+      // 
+      // propertiesToolStripSeparator
+      // 
+      this.propertiesToolStripSeparator.Name = "propertiesToolStripSeparator";
+      this.propertiesToolStripSeparator.Size = new System.Drawing.Size(253, 6);
       // 
       // EnhancedChart
@@ -97 +114 @@
     private System.Windows.Forms.ToolStripMenuItem copyImageToClipboardBitmapToolStripMenuItem;
     private System.Windows.Forms.SaveFileDialog saveFileDialog;
+    private System.Windows.Forms.ToolStripSeparator propertiesToolStripSeparator;
+    private System.Windows.Forms.ToolStripMenuItem propertiesToolStripMenuItem;
   }
 }

branches/histogram/HeuristicLab.Visualization.ChartControlsExtensions/3.3/EnhancedChart.cs

@@ -40 +40 @@
     [DefaultValue(true)]
     public bool EnableMiddleClickPanning { get; set; }
+    [DefaultValue(false)]
+    public bool ShowPropertiesContextMenuItem { get; set; }
 
     public static void CustomizeChartArea(ChartArea chartArea) {
@@ -138 +140 @@
     #endregion
 
+    private void contextMenuStrip_Opening(object sender, CancelEventArgs e) {
+      propertiesToolStripSeparator.Visible = ShowPropertiesContextMenuItem;
+      propertiesToolStripMenuItem.Visible = ShowPropertiesContextMenuItem;
+    }
+
     private void exportChartToolStripMenuItem_Click(object sender, System.EventArgs e) {
       // Set image file format
@@ -168 +175 @@
       Clipboard.SetDataObject(bmp);
     }
+
+    private void propertiesToolStripMenuItem_Click(object sender, EventArgs e) {
+      OnPropertiesClicked();
+    }
+
+    public event EventHandler PropertiesClicked;
+    private void OnPropertiesClicked() {
+      var handler = PropertiesClicked;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
   }
 }

branches/histogram/HeuristicLab.Visualization.ChartControlsExtensions/3.3/HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj

@@ -141 +141 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="EnhancedChart.resx">
+      <DependentUpon>EnhancedChart.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>