Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/11/15 13:37:32 (9 years ago)
Author:
ascheibe
Message:

#2270 and #2354: merged r12173, r12458, r12077, r12599, r12613, r12112, r12116, r12117, r12131, r12631, r12672, r12684, r12690, r12692 into stable

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTableView.cs

    r12009 r12725  
    5353      base.OnContentChanged();
    5454      if (Content != null) {
    55         runToRowMapping = Enumerable.Range(0, Content.Count).ToArray();
    5655        UpdateRowAttributes();
    5756      }
     
    117116    }
    118117
     118    protected override void UpdateData() {
     119      if (suppressUpdates) return;
     120      base.UpdateData();
     121    }
     122
    119123    protected override void UpdateColumnHeaders() {
    120124      HashSet<string> visibleColumnNames = new HashSet<string>(dataGridView.Columns.OfType<DataGridViewColumn>()
     
    145149      else {
    146150        suppressUpdates = Content.UpdateOfRunsInProgress;
    147         if (!suppressUpdates) UpdateRowAttributes();
     151        if (!suppressUpdates) {
     152          UpdateData();
     153          UpdateRowAttributes();
     154        }
    148155      }
    149156    }
     
    171178    protected override void ClearSorting() {
    172179      base.ClearSorting();
    173       runToRowMapping = Enumerable.Range(0, Content.Count).ToArray();
    174180      UpdateRowAttributes();
    175181    }
     
    190196        i++;
    191197      }
    192       UpdateRowAttributes();
     198      UpdateRowAttributes(rebuild: false);
    193199      return newSortedIndex;
    194200    }
    195201
    196     private void UpdateRowAttributes() {
     202    private void UpdateRowAttributes(bool rebuild = true) {
     203      if (rebuild) runToRowMapping = Enumerable.Range(0, Content.Count).ToArray();
    197204      int runIndex = 0;
    198205      foreach (IRun run in Content) {
Note: See TracChangeset for help on using the changeset viewer.