Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/12/17 21:59:49 (7 years ago)
Author:
abeham
Message:

#2634, #2744, #745: merged revisions 14102, 14647, 14652, 14654, 14734, 14737, 14775, 15048, 15125, 15126 to stable, reverted changes from revision 15153

Location:
stable
Files:
3 edited
4 copied

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Analysis.Views

  • stable/HeuristicLab.Analysis.Views/3.3/GanttDataView.cs

    r14734 r15220  
    5050      Content.Rows.ItemsReplaced += GanttRowsOnChanged;
    5151      Content.Rows.CollectionReset += GanttRowsOnChanged;
     52      Content.CategoryColors.ItemsAdded += GanttCategoryColorsOnChanged;
     53      Content.CategoryColors.ItemsRemoved += GanttCategoryColorsOnChanged;
     54      Content.CategoryColors.ItemsReplaced += GanttCategoryColorsOnChanged;
     55      Content.CategoryColors.CollectionReset += GanttCategoryColorsOnChanged;
    5256      foreach (var row in Content.Rows)
    5357        RegisterGanttRowEvents(row);
    … …  
    7377      Content.Rows.ItemsReplaced -= GanttRowsOnChanged;
    7478      Content.Rows.CollectionReset -= GanttRowsOnChanged;
     79      Content.CategoryColors.ItemsAdded -= GanttCategoryColorsOnChanged;
     80      Content.CategoryColors.ItemsRemoved -= GanttCategoryColorsOnChanged;
     81      Content.CategoryColors.ItemsReplaced -= GanttCategoryColorsOnChanged;
     82      Content.CategoryColors.CollectionReset -= GanttCategoryColorsOnChanged;
    7583      foreach (var row in Content.Rows)
    7684        DeregisterGanttRowEvents(row);
    … …  
    121129     
    122130      ganttChart.Hide();
     131      ganttChart.Title = string.IsNullOrWhiteSpace(Content.Name) ? null : Content.Name;
    123132      foreach (var row in Content.Rows) {
    124133        foreach (var item in row.Items) {
    … …  
    138147      UpdateVisualization();
    139148    }
    140 
    141149    private void GanttRowsOnRemoved(object sender, CollectionItemsChangedEventArgs<GanttRow> e) {
    142150      foreach (var row in e.Items)
    143151        DeregisterGanttRowEvents(row);
    144152
     153      UpdateVisualization();
     154    }
     155    private void GanttCategoryColorsOnChanged(object sender, EventArgs e) {
    145156      UpdateVisualization();
    146157    }

  • stable/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

    r15097 r15220  
    132132      <DependentUpon>DataTableView.cs</DependentUpon>
    133133    </Compile>
     134    <Compile Include="GanttDataView.cs">
     135      <SubType>UserControl</SubType>
     136    </Compile>
     137    <Compile Include="GanttDataView.Designer.cs">
     138      <DependentUpon>GanttDataView.cs</DependentUpon>
     139    </Compile>
     140    <Compile Include="IndexedDataTableView.cs">
     141      <SubType>UserControl</SubType>
     142    </Compile>
     143    <Compile Include="IndexedDataTableView.Designer.cs">
     144      <DependentUpon>IndexedDataTableView.cs</DependentUpon>
     145    </Compile>
    134146    <Compile Include="ScatterPlotView.cs">
    135147      <SubType>UserControl</SubType>

  • stable/HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.cs

    r14102 r15220  
    158158      series.BorderColor = Color.Empty;
    159159
    160       if (row.VisualProperties.Color != Color.Empty)
    161         series.Color = row.VisualProperties.Color;
    162       else series.Color = Color.Empty;
     160      series.Color = row.VisualProperties.Color;
    163161      series.IsVisibleInLegend = row.VisualProperties.IsVisibleInLegend;
    164162
    … …  
    561559      for (int i = 0; i < row.Values.Count; i++) {
    562560        var value = row.Values[i];
     561        if (IsInvalidValue(value.Item2)) continue;
    563562        var point = new DataPoint();
    564563        point.SetValueXY(value.Item1, value.Item2);
Note: See TracChangeset for help on using the changeset viewer.