Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/29/12 09:57:15 (11 years ago)
Author:
abeham
Message:

#1985: Synchronized with trunk

Location:
branches/RuntimeOptimizer
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/RuntimeOptimizer

  • branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/ProblemView.cs

    r7956 r8971  
    5757        IEnumerable<Type> viewTypes = MainFormManager.GetViewTypes(consumer.GetType(), true);
    5858        Type genericView = viewTypes.Where(x => x.IsSubclassOf(neededViewType)).First();
     59        ProblemInstanceConsumerViewHost.Content = null; //necessary to enable the change of the ViewType
    5960        ProblemInstanceConsumerViewHost.ViewType = genericView;
    6061        ProblemInstanceConsumerViewHost.Content = consumer;

  • branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs

    r8738 r8971  
    7575      Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    7676      Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged);
    77       Content.AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);
     77      Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged);
    7878      RegisterRunEvents(Content);
    7979    }
    … …  
    8686      Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    8787      Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged);
    88       Content.AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
     88      Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
    8989      DeregisterRunEvents(Content);
    9090    }
    … …  
    159159
    160160    private void UpdateCaption() {
    161       Caption = Content != null ? Content.AlgorithmName + "Box Plots" : ViewAttribute.GetViewName(GetType());
     161      Caption = Content != null ? Content.OptimizerName + " Box Plots" : ViewAttribute.GetViewName(GetType());
    162162    }
    163163

  • branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs

    r8876 r8971  
    9393      Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    9494      Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged);
    95       Content.AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);
     95      Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged);
    9696      RegisterRunEvents(Content);
    9797    }
    … …  
    104104      Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    105105      Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged);
    106       Content.AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
     106      Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
    107107      DeregisterRunEvents(Content);
    108108    }
    … …  
    175175
    176176    private void UpdateCaption() {
    177       Caption = Content != null ? Content.AlgorithmName + "Bubble Chart" : ViewAttribute.GetViewName(GetType());
     177      Caption = Content != null ? Content.OptimizerName + " Bubble Chart" : ViewAttribute.GetViewName(GetType());
    178178    }
    179179

  • branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionDataTableView.cs

    r8925 r8971  
    6363      Content.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    6464      Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged);
    65       Content.AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);
     65      Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged);
    6666    }
    6767    protected override void DeregisterContentEvents() {
    … …  
    7070      Content.CollectionReset -= new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    7171      Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged);
    72       Content.AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
     72      Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
    7373      base.DeregisterContentEvents();
    7474    }
    … …  
    204204
    205205    private void UpdateCaption() {
    206       Caption = Content != null ? Content.AlgorithmName + "Data Table" : ViewAttribute.GetViewName(GetType());
     206      Caption = Content != null ? Content.OptimizerName + " Data Table" : ViewAttribute.GetViewName(GetType());
    207207    }
    208208

  • branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTabularView.cs

    r8738 r8971  
    6565      Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    6666      Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged);
    67       Content.AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);
     67      Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged);
    6868      RegisterRunEvents(Content);
    6969    }
    … …  
    7878      Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    7979      Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged);
    80       Content.AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
     80      Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged);
    8181      DeregisterRunEvents(Content);
    8282    }
    … …  
    111111
    112112    private void UpdateCaption() {
    113       Caption = Content != null ? Content.AlgorithmName + "Tabular View" : ViewAttribute.GetViewName(GetType());
     113      Caption = Content != null ? Content.OptimizerName + " Tabular View" : ViewAttribute.GetViewName(GetType());
    114114    }
    115115
Note: See TracChangeset for help on using the changeset viewer.