Changeset 8833 for trunk/sources/HeuristicLab.Data.Views

Timestamp:

10/23/12 10:07:48 (11 years ago)

Author:

sforsten

Message:

#1292:

• removed combo box in TimeframeCorrelationView and added a textbox instead
• caches are directly in (Timeframe-)FeatureCorrelationView
• caches use Tuple<> instead of nested dictionaries
• a control EnhancedStringConvertibleMatrix inherits from StringConvertibleMatrixView to reduce code duplication
• add interface IDependencyCalculator to several calculators
• fixed bug: a previous started calculation is cancelled, if a new calculation shall be started and the values are already in the cache
• fixed bug: if the content is changed, the calculation is cancelled

HeatMap is still used for the dependency representation, because a class is needed which implements IStringConvertibleMatrix and it has a maximum and minimum value.

Location:

trunk/sources/HeuristicLab.Data.Views/3.3

Files:

• HeuristicLab.Data.Views-3.3.csproj (modified) (4 diffs)
• StringConvertibleMatrixColumnVisibilityDialog.Designer.cs (added)
• StringConvertibleMatrixColumnVisibilityDialog.cs (added)
• StringConvertibleMatrixRowVisibilityDialog.Designer.cs (added)
• StringConvertibleMatrixRowVisibilityDialog.cs (added)
• StringConvertibleMatrixView.cs (modified) (3 diffs)
• StringConvertibleMatrixVisibilityDialog.Designer.cs (added)
• StringConvertibleMatrixVisibilityDialog.cs (added)

trunk/sources/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

@@ -128 +128 @@
     </Compile>
     <Compile Include="Plugin.cs" />
+    <Compile Include="StringConvertibleMatrixColumnVisibilityDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="StringConvertibleMatrixColumnVisibilityDialog.Designer.cs">
+      <DependentUpon>StringConvertibleMatrixColumnVisibilityDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="StringConvertibleMatrixRowVisibilityDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="StringConvertibleMatrixRowVisibilityDialog.Designer.cs">
+      <DependentUpon>StringConvertibleMatrixRowVisibilityDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="StringConvertibleValueTupleView.cs">
       <SubType>UserControl</SubType>
@@ -141 +153 @@
       <DependentUpon>BoolValueView.cs</DependentUpon>
     </Compile>
-    <Compile Include="ColumnsVisibilityDialog.cs">
+    <Compile Include="StringConvertibleMatrixVisibilityDialog.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="ColumnsVisibilityDialog.Designer.cs">
-      <DependentUpon>ColumnsVisibilityDialog.cs</DependentUpon>
+    <Compile Include="StringConvertibleMatrixVisibilityDialog.Designer.cs">
+      <DependentUpon>StringConvertibleMatrixVisibilityDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="ComparisonView.cs">
@@ -240 +252 @@
   -->
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -247 +259 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -35 +35 @@
   [Content(typeof(IStringConvertibleMatrix), true)]
   public partial class StringConvertibleMatrixView : AsynchronousContentView {
-    private int[] virtualRowIndices;
+    protected int[] virtualRowIndices;
     private List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
     private RowComparer rowComparer;
@@ -171 +171 @@
       }
     }
-    protected void UpdateRowHeaders() {
+    protected virtual void UpdateRowHeaders() {
       int index = dataGridView.FirstDisplayedScrollingRowIndex;
       if (index == -1) index = 0;
@@ -509 +509 @@
         contextMenu.Show(MousePosition);
     }
-    private void ShowHideColumns_Click(object sender, EventArgs e) {
-      new ColumnsVisibilityDialog(this.dataGridView.Columns.Cast<DataGridViewColumn>()).ShowDialog();
+    protected virtual void ShowHideColumns_Click(object sender, EventArgs e) {
+      new StringConvertibleMatrixColumnVisibilityDialog(this.dataGridView.Columns.Cast<DataGridViewColumn>()).ShowDialog();
     }