- Timestamp:
- 08/22/11 09:35:06 (13 years ago)
- Location:
- branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views/3.3
- Files:
-
- 8 edited
- 6 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj
r6618 r6675 128 128 <DependentUpon>BatchRunView.cs</DependentUpon> 129 129 </Compile> 130 <Compile Include="RunCollectionContentConstraintView.cs"> 131 <SubType>UserControl</SubType> 132 </Compile> 133 <Compile Include="RunCollectionContentConstraintView.Designer.cs"> 134 <DependentUpon>RunCollectionContentConstraintView.cs</DependentUpon> 135 </Compile> 130 136 <Compile Include="ExperimentTreeView.cs"> 131 137 <SubType>UserControl</SubType> … … 152 158 <DependentUpon>RunCollectionBoxPlotView.cs</DependentUpon> 153 159 </Compile> 160 <Compile Include="RunCollectionModificationEvaluatorView.cs"> 161 <SubType>UserControl</SubType> 162 </Compile> 163 <Compile Include="RunCollectionModificationEvaluatorView.Designer.cs"> 164 <DependentUpon>RunCollectionModificationEvaluatorView.cs</DependentUpon> 165 </Compile> 154 166 <Compile Include="RunCollectionComparisonConstraintView.cs"> 155 167 <SubType>UserControl</SubType> … … 170 182 <DependentUpon>RunCollectionConstraintCollectionView.cs</DependentUpon> 171 183 </Compile> 172 <Compile Include="RunCollectionCo nstraintView.cs">173 <SubType>UserControl</SubType> 174 </Compile> 175 <Compile Include="RunCollectionCo nstraintView.Designer.cs">176 <DependentUpon>RunCollectionCo nstraintView.cs</DependentUpon>184 <Compile Include="RunCollectionColumnConstraintView.cs"> 185 <SubType>UserControl</SubType> 186 </Compile> 187 <Compile Include="RunCollectionColumnConstraintView.Designer.cs"> 188 <DependentUpon>RunCollectionColumnConstraintView.cs</DependentUpon> 177 189 </Compile> 178 190 <Compile Include="OptimizerListView.cs"> … … 295 307 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> 296 308 <Name>HeuristicLab.Optimization-3.3</Name> 309 </ProjectReference> 310 <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj"> 311 <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project> 312 <Name>HeuristicLab.Parameters-3.3</Name> 297 313 </ProjectReference> 298 314 <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj"> -
branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views/3.3/HeuristicLabOptimizationViewsPlugin.cs.frame
r6618 r6675 38 38 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 39 39 [PluginDependency("HeuristicLab.Optimization", "3.3")] 40 [PluginDependency("HeuristicLab.Parameters", "3.3")] 40 41 [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions","3.3")] 41 42 public class HeuristicLabOptimizationViewsPlugin : PluginBase { -
branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.Designer.cs
r6618 r6675 61 61 this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart(); 62 62 this.openBoxPlotViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 63 this.hideRunToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 63 64 this.zoomButton = new System.Windows.Forms.RadioButton(); 64 65 this.selectButton = new System.Windows.Forms.RadioButton(); … … 214 215 this.openBoxPlotViewToolStripMenuItem.Text = "Open BoxPlot View"; 215 216 this.openBoxPlotViewToolStripMenuItem.Click += new System.EventHandler(this.openBoxPlotViewToolStripMenuItem_Click); 217 // 218 // hideRunToolStripMenuItem 219 // 220 this.hideRunToolStripMenuItem.Name = "hideRunToolStripMenuItem"; 221 this.hideRunToolStripMenuItem.Size = new System.Drawing.Size(256, 22); 222 this.hideRunToolStripMenuItem.Text = "Hide Run"; 223 this.hideRunToolStripMenuItem.Click += new System.EventHandler(hideRunToolStripMenuItem_Click); 216 224 // 217 225 // zoomButton … … 374 382 private System.Windows.Forms.Label noRunsLabel; 375 383 private System.Windows.Forms.ToolStripMenuItem openBoxPlotViewToolStripMenuItem; 384 private System.Windows.Forms.ToolStripMenuItem hideRunToolStripMenuItem; 376 385 private System.Windows.Forms.Button colorXAxisButton; 377 386 private System.Windows.Forms.Button colorYAxisButton; -
branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs
r6096 r6675 55 55 public RunCollectionBubbleChartView() { 56 56 InitializeComponent(); 57 chart.ContextMenuStrip.Items.Insert(0, openBoxPlotViewToolStripMenuItem); 57 58 chart.ContextMenuStrip.Items.Insert(0, hideRunToolStripMenuItem); 59 chart.ContextMenuStrip.Items.Insert(1, openBoxPlotViewToolStripMenuItem); 60 chart.ContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(ContextMenuStrip_Opening); 58 61 59 62 runToDataPointMapping = new Dictionary<IRun, List<DataPoint>>(); … … 631 634 } 632 635 636 private IRun runToHide = null; 637 private void ContextMenuStrip_Opening(object sender, System.ComponentModel.CancelEventArgs e) { 638 var pos = Control.MousePosition; 639 var chartPos = chart.PointToClient(pos); 640 641 HitTestResult h = this.chart.HitTest(chartPos.X, chartPos.Y); 642 if (h.ChartElementType == ChartElementType.DataPoint) { 643 runToHide = (IRun)((DataPoint)h.Object).Tag; 644 hideRunToolStripMenuItem.Visible = true; 645 } else { 646 runToHide = null; 647 hideRunToolStripMenuItem.Visible = false; 648 } 649 650 } 651 private void hideRunToolStripMenuItem_Click(object sender, EventArgs e) { 652 var constraint = Content.Constraints.OfType<RunCollectionContentConstraint>().Where(c => c.Active).FirstOrDefault(); 653 if (constraint == null) { 654 constraint = new RunCollectionContentConstraint(); 655 Content.Constraints.Add(constraint); 656 constraint.Active = true; 657 } 658 constraint.ConstraintData.Add(runToHide); 659 } 660 633 661 private void openBoxPlotViewToolStripMenuItem_Click(object sender, EventArgs e) { 634 662 RunCollectionBoxPlotView boxplotView = new RunCollectionBoxPlotView(); … … 662 690 } 663 691 #endregion 664 665 692 } 666 693 } -
branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views/3.3/RunCollectionComparisonConstraintView.cs
r5445 r6675 29 29 namespace HeuristicLab.Optimization.Views { 30 30 [Content(typeof(RunCollectionComparisonConstraint), true)] 31 public partial class RunCollectionComparisonConstraintView : RunCollectionCo nstraintView {31 public partial class RunCollectionComparisonConstraintView : RunCollectionColumnConstraintView { 32 32 public RunCollectionComparisonConstraintView() { 33 33 InitializeComponent(); -
branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views/3.3/RunCollectionEqualityConstraintView.cs
r5445 r6675 25 25 namespace HeuristicLab.Optimization.Views { 26 26 [Content(typeof(RunCollectionEqualityConstraint), true)] 27 public partial class RunCollectionEqualityConstraintView : RunCollectionCo nstraintView {27 public partial class RunCollectionEqualityConstraintView : RunCollectionColumnConstraintView { 28 28 public RunCollectionEqualityConstraintView() { 29 29 InitializeComponent(); -
branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views/3.3/RunCollectionTypeCompatibilityConstraintView.cs
r5445 r6675 25 25 namespace HeuristicLab.Optimization.Views { 26 26 [Content(typeof(RunCollectionTypeCompatibilityConstraint), true)] 27 public partial class RunCollectionTypeCompatibilityConstraintView : RunCollectionCo nstraintView {27 public partial class RunCollectionTypeCompatibilityConstraintView : RunCollectionColumnConstraintView { 28 28 public RunCollectionTypeCompatibilityConstraintView() { 29 29 InitializeComponent(); -
branches/GP.Grammar.Editor/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs
r6618 r6675 98 98 } 99 99 } 100 var modifierMenuItem = new ToolStripMenuItem(); 101 modifierMenuItem.Text = "Modify RunCollection"; 102 modifierMenuItem.Click += ModifierMenuItem_OnClick; 103 analyzeRunsToolStripDropDownButton.DropDownItems.Add(modifierMenuItem); 100 104 } 101 105 … … 336 340 } 337 341 } 342 private void ModifierMenuItem_OnClick(object sender, EventArgs args) { 343 var modifier = new RunCollectionModificationEvaluator(); 344 modifier.RunCollection.AddRange(Content.Select(r => (IRun)r.Clone())); 345 MainFormManager.MainForm.ShowContent(modifier); 346 } 338 347 private void removeButton_Click(object sender, EventArgs e) { 339 348 if (itemsListView.SelectedItems.Count > 0) {
Note: See TracChangeset
for help on using the changeset viewer.