- Timestamp:
- 11/29/12 09:57:15 (12 years ago)
- Location:
- branches/RuntimeOptimizer
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/RuntimeOptimizer
- Property svn:mergeinfo changed
/branches/SlaveShutdown (added) merged: 8944-8945,8949,8951,8953-8954 /trunk/sources (added) merged: 8946-8948,8950,8952,8957,8960,8962-8970
- Property svn:mergeinfo changed
-
branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/ProblemView.cs
r7956 r8971 57 57 IEnumerable<Type> viewTypes = MainFormManager.GetViewTypes(consumer.GetType(), true); 58 58 Type genericView = viewTypes.Where(x => x.IsSubclassOf(neededViewType)).First(); 59 ProblemInstanceConsumerViewHost.Content = null; //necessary to enable the change of the ViewType 59 60 ProblemInstanceConsumerViewHost.ViewType = genericView; 60 61 ProblemInstanceConsumerViewHost.Content = consumer; -
branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBoxPlotView.cs
r8738 r8971 75 75 Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 76 76 Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged); 77 Content. AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);77 Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged); 78 78 RegisterRunEvents(Content); 79 79 } … … 86 86 Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 87 87 Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged); 88 Content. AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);88 Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged); 89 89 DeregisterRunEvents(Content); 90 90 } … … 159 159 160 160 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()); 162 162 } 163 163 -
branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionBubbleChartView.cs
r8876 r8971 93 93 Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 94 94 Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged); 95 Content. AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);95 Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged); 96 96 RegisterRunEvents(Content); 97 97 } … … 104 104 Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 105 105 Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged); 106 Content. AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);106 Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged); 107 107 DeregisterRunEvents(Content); 108 108 } … … 175 175 176 176 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()); 178 178 } 179 179 -
branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionDataTableView.cs
r8925 r8971 63 63 Content.CollectionReset += new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 64 64 Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged); 65 Content. AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);65 Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged); 66 66 } 67 67 protected override void DeregisterContentEvents() { … … 70 70 Content.CollectionReset -= new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 71 71 Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged); 72 Content. AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);72 Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged); 73 73 base.DeregisterContentEvents(); 74 74 } … … 204 204 205 205 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()); 207 207 } 208 208 -
branches/RuntimeOptimizer/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTabularView.cs
r8738 r8971 65 65 Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 66 66 Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged); 67 Content. AlgorithmNameChanged += new EventHandler(Content_AlgorithmNameChanged);67 Content.OptimizerNameChanged += new EventHandler(Content_AlgorithmNameChanged); 68 68 RegisterRunEvents(Content); 69 69 } … … 78 78 Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset); 79 79 Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged); 80 Content. AlgorithmNameChanged -= new EventHandler(Content_AlgorithmNameChanged);80 Content.OptimizerNameChanged -= new EventHandler(Content_AlgorithmNameChanged); 81 81 DeregisterRunEvents(Content); 82 82 } … … 111 111 112 112 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()); 114 114 } 115 115
Note: See TracChangeset
for help on using the changeset viewer.