Changeset 11000


Ignore:
Timestamp:
06/11/14 15:33:04 (5 years ago)
Author:
sbreuer
Message:
  • derive StringConvertibleMatrixView from core
  • delete PreprocessingStringConvertibleMatrixView
Location:
branches/DataPreprocessing
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessing/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

    r9505 r11000  
    3636  public partial class StringConvertibleMatrixView : AsynchronousContentView {
    3737    protected int[] virtualRowIndices;
    38     private List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
     38    protected List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
    3939    private RowComparer rowComparer;
    4040
     
    261261
    262262    #region DataGridView Events
    263     private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
     263    protected virtual void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
    264264      if (!dataGridView.ReadOnly) {
    265265        string errorMessage;
     
    270270      }
    271271    }
    272     private void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
     272    protected virtual void dataGridView_CellParsing(object sender, DataGridViewCellParsingEventArgs e) {
    273273      if (!dataGridView.ReadOnly) {
    274274        string value = e.Value.ToString();
     
    364364    }
    365365
    366     private void PasteValuesToDataGridView() {
     366    protected virtual void PasteValuesToDataGridView() {
    367367      string[,] values = SplitClipboardString(Clipboard.GetText());
    368368      int rowIndex = 0;
     
    432432    }
    433433
    434     private void Sort() {
     434    protected void Sort() {
    435435      virtualRowIndices = Sort(sortedColumnIndices);
    436436      UpdateSortGlyph();
     
    542542    }
    543543
    544     private void dataGridView_SelectionChanged(object sender, EventArgs e) {
     544    protected virtual void dataGridView_SelectionChanged(object sender, EventArgs e) {
    545545      string stringFormat = "{0,20:0.0000}";
    546546      statisticsTextBox.Text = string.Empty;
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

    r10998 r11000  
    2626using System.Windows.Forms;
    2727using HeuristicLab.Data;
     28using HeuristicLab.Data.Views;
    2829using HeuristicLab.DataPreprocessing.Filter;
    2930using HeuristicLab.MainForm;
     
    3233  [View("Data Grid Content View")]
    3334  [Content(typeof(IDataGridContent), true)]
    34   public partial class DataGridContentView : PreprocessingStringConvertibleMatrixView {
     35  public partial class DataGridContentView : StringConvertibleMatrixView {
    3536
    3637    private bool notOwnEvent = true;
     
    137138    }
    138139
    139     #region methods which override/modify methods from PreprocessingStringConvertibleMatrixView
    140 
    141140    protected override void dataGridView_SelectionChanged(object sender, EventArgs e) {
    142141      base.dataGridView_SelectionChanged(sender, e);
     
    186185      base.ClearSorting();
    187186    }
    188 
    189     #endregion
    190187
    191188    private void dataGridView_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e) {
  • branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj

    r10987 r11000  
    185185      <DependentUpon>StatisticsView.cs</DependentUpon>
    186186    </Compile>
    187     <Compile Include="PreprocessingStringConvertibleMatrixView.cs">
    188       <SubType>UserControl</SubType>
    189     </Compile>
    190     <Compile Include="PreprocessingStringConvertibleMatrixView.Designer.cs">
    191       <DependentUpon>PreprocessingStringConvertibleMatrixView.cs</DependentUpon>
    192     </Compile>
    193187    <Compile Include="TransformationView.cs">
    194188      <SubType>UserControl</SubType>
Note: See TracChangeset for help on using the changeset viewer.