Changeset 10571 for branches/DataPreprocessing

Timestamp:

03/12/14 12:33:09 (11 years ago)

Author:

sbreuer

Message:

• Update DataGrid on changes in preprocessingData

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridLogic.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IDataGridContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Interfaces/IDataGridLogic.cs (modified) (1 diff)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (5 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs

@@ -50 +50 @@
     }
 
+
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.Changed += Content_Changed;
+    }
+
+    protected override void DeregisterContentEvents() {
+      base.DeregisterContentEvents();
+      Content.Changed -= Content_Changed;
+    }
+
+    void Content_Changed(object sender, DataPreprocessingChangedEventArgs e) {
+      dataGridView.Refresh();
+    }
 
     private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridContent.cs

@@ -140 +140 @@
     public event EventHandler Reset;
 
+    public event DataPreprocessingChangedEventHandler Changed {
+      add { dataGridLogic.Changed += value; }
+      remove { dataGridLogic.Changed -= value; }
+    }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/DataGridLogic.cs

@@ -120 +120 @@
       return valid;
     }
+
+    public event DataPreprocessingChangedEventHandler Changed {
+      add { preprocessingData.Changed += value; }
+      remove { preprocessingData.Changed -= value; }
+    }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IDataGridContent.cs

@@ -26 +26 @@
     IDataGridLogic DataGridLogic { get; }
     IManipulationLogic PreprocessingDataManipulation { get; }
+
+    event DataPreprocessingChangedEventHandler Changed;
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IDataGridLogic.cs

@@ -32 +32 @@
     bool SetValue(string value, int rowIndex, int columnIndex);
     bool Validate(string value, out string errorMessage, int columnIndex);
+
+    event DataPreprocessingChangedEventHandler Changed;
   }
 }

branches/DataPreprocessing/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -166 +166 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.DataPreprocessing-3.3, Version=3.3.9.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\bin\HeuristicLab.DataPreprocessing-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3">
       <HintPath>..\bin\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.dll</HintPath>
@@ -324 +329 @@
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <Private>false</Private>
+    </Reference>
+    <Reference Include="Rhino.Mocks">
+      <HintPath>..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
     </Reference>
     <Reference Include="System" />
@@ -361 +369 @@
     <Compile Include="HeuristicLab.Collections-3.3\BidirectionalLookupTest.cs" />
     <Compile Include="HeuristicLab.Collections-3.3\ObservableKeyedListTest.cs" />
+    <Compile Include="HeuristicLab.DataPreprocessing-3.3\StatisticInfoTest.cs" />
     <Compile Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3\Auxiliary.cs" />
     <Compile Include="HeuristicLab.Encodings.BinaryVectorEncoding-3.3\NPointCrossoverTest.cs" />
@@ -474 +483 @@
     </None>
     <None Include="HeuristicLab.snk" />
+    <None Include="packages.config" />
     <None Include="Test Resources\GA_SymbReg.hl">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -503 +513 @@
     </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.