Changeset 6673 for trunk/sources/HeuristicLab.Optimization.Views

Timestamp:

08/19/11 11:25:46 (13 years ago)

Author:

mkommend

Message:

#1624: Implemented RunCollectionContentConstraint to hide specific runs.

Location:

trunk/sources/HeuristicLab.Optimization.Views/3.3

Files:

• HeuristicLab.Optimization.Views-3.3.csproj (modified) (2 diffs)
• RunCollectionBubbleChartView.Designer.cs (modified) (3 diffs)
• RunCollectionBubbleChartView.cs (modified) (3 diffs)
• RunCollectionColumnConstraintView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.Designer.cs) (1 diff)
• RunCollectionColumnConstraintView.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.cs) (1 diff)
• RunCollectionComparisonConstraintView.cs (modified) (1 diff)
• RunCollectionContentConstraintView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.Designer.cs) (4 diffs)
• RunCollectionContentConstraintView.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionConstraintView.cs) (4 diffs)
• RunCollectionEqualityConstraintView.cs (modified) (1 diff)
• RunCollectionTypeCompatibilityConstraintView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -128 +128 @@
       <DependentUpon>BatchRunView.cs</DependentUpon>
     </Compile>
+    <Compile Include="RunCollectionContentConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionContentConstraintView.Designer.cs">
+      <DependentUpon>RunCollectionContentConstraintView.cs</DependentUpon>
+    </Compile>
     <Compile Include="ExperimentTreeView.cs">
       <SubType>UserControl</SubType>
@@ -176 +182 @@
       <DependentUpon>RunCollectionConstraintCollectionView.cs</DependentUpon>
     </Compile>
-    <Compile Include="RunCollectionConstraintView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RunCollectionConstraintView.Designer.cs">
-      <DependentUpon>RunCollectionConstraintView.cs</DependentUpon>
+    <Compile Include="RunCollectionColumnConstraintView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionColumnConstraintView.Designer.cs">
+      <DependentUpon>RunCollectionColumnConstraintView.cs</DependentUpon>
     </Compile>
     <Compile Include="OptimizerListView.cs">

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.Designer.cs

@@ -61 +61 @@
       this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
       this.openBoxPlotViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.hideRunToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.zoomButton = new System.Windows.Forms.RadioButton();
       this.selectButton = new System.Windows.Forms.RadioButton();
@@ -214 +215 @@
       this.openBoxPlotViewToolStripMenuItem.Text = "Open BoxPlot View";
       this.openBoxPlotViewToolStripMenuItem.Click += new System.EventHandler(this.openBoxPlotViewToolStripMenuItem_Click);
+      //
+      // hideRunToolStripMenuItem
+      //
+      this.hideRunToolStripMenuItem.Name = "hideRunToolStripMenuItem";
+      this.hideRunToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
+      this.hideRunToolStripMenuItem.Text = "Hide Run";
+      this.hideRunToolStripMenuItem.Click += new System.EventHandler(hideRunToolStripMenuItem_Click);
       // 
       // zoomButton
@@ -374 +382 @@
     private System.Windows.Forms.Label noRunsLabel;
     private System.Windows.Forms.ToolStripMenuItem openBoxPlotViewToolStripMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem hideRunToolStripMenuItem;
     private System.Windows.Forms.Button colorXAxisButton;
     private System.Windows.Forms.Button colorYAxisButton;

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -55 +55 @@
     public RunCollectionBubbleChartView() {
       InitializeComponent();
-      chart.ContextMenuStrip.Items.Insert(0, openBoxPlotViewToolStripMenuItem);
+
+      chart.ContextMenuStrip.Items.Insert(0, hideRunToolStripMenuItem);
+      chart.ContextMenuStrip.Items.Insert(1, openBoxPlotViewToolStripMenuItem);
+      chart.ContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(ContextMenuStrip_Opening);
 
       runToDataPointMapping = new Dictionary<IRun, List<DataPoint>>();
@@ -631 +634 @@
     }
 
+    private IRun runToHide = null;
+    private void ContextMenuStrip_Opening(object sender, System.ComponentModel.CancelEventArgs e) {
+      var pos = Control.MousePosition;
+      var chartPos = chart.PointToClient(pos);
+
+      HitTestResult h = this.chart.HitTest(chartPos.X, chartPos.Y);
+      if (h.ChartElementType == ChartElementType.DataPoint) {
+        runToHide = (IRun)((DataPoint)h.Object).Tag;
+        hideRunToolStripMenuItem.Visible = true;
+      } else {
+        runToHide = null;
+        hideRunToolStripMenuItem.Visible = false;
+      }
+
+    }
+    private void hideRunToolStripMenuItem_Click(object sender, EventArgs e) {
+      var constraint = Content.Constraints.OfType<RunCollectionContentConstraint>().Where(c => c.Active).FirstOrDefault();
+      if (constraint == null) {
+        constraint = new RunCollectionContentConstraint();
+        Content.Constraints.Add(constraint);
+        constraint.Active = true;
+      }
+      constraint.ConstraintData.Add(runToHide);
+    }
+
     private void openBoxPlotViewToolStripMenuItem_Click(object sender, EventArgs e) {
       RunCollectionBoxPlotView boxplotView = new RunCollectionBoxPlotView();
@@ -662 +690 @@
     }
     #endregion
-
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionColumnConstraintView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Optimization.Views {
-  partial class RunCollectionConstraintView {
+  partial class RunCollectionColumnConstraintView {
     /// <summary> 
     /// Required designer variable.

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionColumnConstraintView.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Optimization.Views {
-  [Content(typeof(IRunCollectionConstraint))]
-  public partial class RunCollectionConstraintView : ItemView {
-    public RunCollectionConstraintView() {
+  [Content(typeof(IRunCollectionColumnConstraint))]
+  public partial class RunCollectionColumnConstraintView : ItemView {
+    public RunCollectionColumnConstraintView() {
       InitializeComponent();
     }
 
-    public new IRunCollectionConstraint Content {
-      get { return (IRunCollectionConstraint)base.Content; }
+    public new IRunCollectionColumnConstraint Content {
+      get { return (IRunCollectionColumnConstraint)base.Content; }
       set { base.Content = value; }
     }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionComparisonConstraintView.cs

@@ -29 +29 @@
 namespace HeuristicLab.Optimization.Views {
   [Content(typeof(RunCollectionComparisonConstraint), true)]
-  public partial class RunCollectionComparisonConstraintView : RunCollectionConstraintView {
+  public partial class RunCollectionComparisonConstraintView : RunCollectionColumnConstraintView {
     public RunCollectionComparisonConstraintView() {
       InitializeComponent();

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionContentConstraintView.Designer.cs

@@ -20 +20 @@
 #endregion
 
+using System.Windows.Forms;
+
 namespace HeuristicLab.Optimization.Views {
-  partial class RunCollectionConstraintView {
+  partial class RunCollectionContentConstraintView {
     /// <summary> 
     /// Required designer variable.
@@ -45 +47 @@
     /// </summary>
     private void InitializeComponent() {
-      this.lblConstrainedMember = new System.Windows.Forms.Label();
-      this.lblComparisonOperation = new System.Windows.Forms.Label();
-      this.lblCompareValue = new System.Windows.Forms.Label();
-      this.cmbConstraintOperation = new System.Windows.Forms.ComboBox();
       this.chbActive = new System.Windows.Forms.CheckBox();
-      this.cmbConstraintColumn = new System.Windows.Forms.ComboBox();
+      this.runsView = new HeuristicLab.Optimization.Views.RunCollectionContentConstraintView.RunSetView();
       this.SuspendLayout();
-      // 
-      // lblConstrainedMember
-      // 
-      this.lblConstrainedMember.AutoSize = true;
-      this.lblConstrainedMember.Location = new System.Drawing.Point(3, 6);
-      this.lblConstrainedMember.Name = "lblConstrainedMember";
-      this.lblConstrainedMember.Size = new System.Drawing.Size(107, 13);
-      this.lblConstrainedMember.TabIndex = 0;
-      this.lblConstrainedMember.Text = "Constrained Member:";
-      // 
-      // lblComparisonOperation
-      // 
-      this.lblComparisonOperation.AutoSize = true;
-      this.lblComparisonOperation.Location = new System.Drawing.Point(3, 32);
-      this.lblComparisonOperation.Name = "lblComparisonOperation";
-      this.lblComparisonOperation.Size = new System.Drawing.Size(106, 13);
-      this.lblComparisonOperation.TabIndex = 1;
-      this.lblComparisonOperation.Text = "Constraint Operation:";
-      // 
-      // lblCompareValue
-      // 
-      this.lblCompareValue.AutoSize = true;
-      this.lblCompareValue.Location = new System.Drawing.Point(3, 59);
-      this.lblCompareValue.Name = "lblCompareValue";
-      this.lblCompareValue.Size = new System.Drawing.Size(83, 13);
-      this.lblCompareValue.TabIndex = 2;
-      this.lblCompareValue.Text = "Constraint Data:";
-      // 
-      // cmbConstraintOperation
-      // 
-      this.cmbConstraintOperation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.cmbConstraintOperation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.cmbConstraintOperation.FormattingEnabled = true;
-      this.cmbConstraintOperation.Location = new System.Drawing.Point(127, 29);
-      this.cmbConstraintOperation.Name = "cmbConstraintOperation";
-      this.cmbConstraintOperation.Size = new System.Drawing.Size(246, 21);
-      this.cmbConstraintOperation.TabIndex = 4;
-      this.cmbConstraintOperation.SelectedIndexChanged += new System.EventHandler(this.cmbComparisonOperation_SelectedIndexChanged);
       // 
       // chbActive
       // 
       this.chbActive.AutoSize = true;
-      this.chbActive.Location = new System.Drawing.Point(127, 82);
+      this.chbActive.Location = new System.Drawing.Point(3, 3);
       this.chbActive.Name = "chbActive";
       this.chbActive.Size = new System.Drawing.Size(56, 17);
@@ -103 +62 @@
       this.chbActive.CheckedChanged += new System.EventHandler(this.chbActive_CheckedChanged);
       // 
-      // cmbConstraintColumn
+      // operatorSetView1
       // 
-      this.cmbConstraintColumn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.cmbConstraintColumn.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.cmbConstraintColumn.FormattingEnabled = true;
-      this.cmbConstraintColumn.Location = new System.Drawing.Point(127, 3);
-      this.cmbConstraintColumn.Name = "cmbConstraintColumn";
-      this.cmbConstraintColumn.Size = new System.Drawing.Size(246, 21);
-      this.cmbConstraintColumn.TabIndex = 8;
-      this.cmbConstraintColumn.SelectedIndexChanged += new System.EventHandler(this.cmbConstraintColumn_SelectedIndexChanged);
+      this.runsView.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom;
+      this.runsView.Caption = "Runs View";
+      this.runsView.Content = null;
+      this.runsView.Location = new System.Drawing.Point(3, 26);
+      this.runsView.Name = "runsView";
+      this.runsView.ReadOnly = false;
+      this.runsView.Size = new System.Drawing.Size(309, 323);
+      this.runsView.TabIndex = 8;
       // 
-      // RunCollectionConstraintView
+      // RunCollectionContentConstraintView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.cmbConstraintColumn);
+      this.Controls.Add(this.runsView);
       this.Controls.Add(this.chbActive);
-      this.Controls.Add(this.cmbConstraintOperation);
-      this.Controls.Add(this.lblCompareValue);
-      this.Controls.Add(this.lblComparisonOperation);
-      this.Controls.Add(this.lblConstrainedMember);
-      this.Name = "RunCollectionConstraintView";
-      this.Size = new System.Drawing.Size(376, 102);
+      this.Name = "RunCollectionContentConstraintView";
+      this.Size = new System.Drawing.Size(315, 352);
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -134 +88 @@
     #endregion
 
-    private System.Windows.Forms.Label lblConstrainedMember;
-    private System.Windows.Forms.Label lblComparisonOperation;
-    private System.Windows.Forms.Label lblCompareValue;
     private System.Windows.Forms.CheckBox chbActive;
-    protected System.Windows.Forms.ComboBox cmbConstraintColumn;
-    protected System.Windows.Forms.ComboBox cmbConstraintOperation;
+    private RunSetView runsView;
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionContentConstraintView.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using HeuristicLab.Core;
+using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Optimization.Views {
-  [Content(typeof(IRunCollectionConstraint))]
-  public partial class RunCollectionConstraintView : ItemView {
-    public RunCollectionConstraintView() {
+  [Content(typeof(RunCollectionContentConstraint), true)]
+  public partial class RunCollectionContentConstraintView : ItemView {
+    public RunCollectionContentConstraintView() {
       InitializeComponent();
+      runsView.ShowDetails = false;
     }
 
-    public new IRunCollectionConstraint Content {
-      get { return (IRunCollectionConstraint)base.Content; }
+    public new RunCollectionContentConstraint Content {
+      get { return (RunCollectionContentConstraint)base.Content; }
       set { base.Content = value; }
     }
@@ -41 +42 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      cmbConstraintColumn.Items.Clear();
-      cmbConstraintOperation.Items.Clear();
-
       if (Content != null) {
-        cmbConstraintOperation.Items.AddRange(Content.AllowedConstraintOperations.ToArray());
-        if (Content.ConstraintOperation != null)
-          cmbConstraintOperation.SelectedItem = Content.ConstraintOperation;
-        else if (cmbConstraintOperation.Items.Count != 0)
-          cmbConstraintOperation.SelectedIndex = 0;
-        UpdateColumnComboBox();
         chbActive.Checked = Content.Active;
         ReadOnly = Content.Active;
-      } else
+        runsView.RunCollection = Content.ConstrainedValue;
+        runsView.Content = Content.ConstraintData;
+      } else {
         chbActive.Checked = false;
-    }
-
-    protected virtual void UpdateColumnComboBox() {
-      this.cmbConstraintColumn.Items.Clear();
-      if (Content.ConstrainedValue != null) {
-        this.cmbConstraintColumn.Items.AddRange(((IStringConvertibleMatrix)Content.ConstrainedValue).ColumnNames.ToArray());
-        if (!string.IsNullOrEmpty(Content.ConstraintColumn))
-          this.cmbConstraintColumn.SelectedItem = Content.ConstraintColumn;
+        runsView.RunCollection = null;
+        runsView.Content = null;
       }
     }
@@ -68 +56 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      this.Content.ActiveChanged += new EventHandler(Content_ActiveChanged);
-      this.Content.ConstraintOperationChanged += new EventHandler(Content_ComparisonOperationChanged);
-      this.Content.ConstraintColumnChanged += new EventHandler(Content_ConstraintColumnChanged);
-      this.Content.ConstrainedValueChanged += new EventHandler(Content_ConstrainedValueChanged);
+      Content.ActiveChanged += new EventHandler(Content_ActiveChanged);
     }
 
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
-      this.Content.ActiveChanged -= new EventHandler(Content_ActiveChanged);
-      this.Content.ConstraintOperationChanged -= new EventHandler(Content_ComparisonOperationChanged);
-      this.Content.ConstraintColumnChanged -= new EventHandler(Content_ConstraintColumnChanged);
-      this.Content.ConstrainedValueChanged += new EventHandler(Content_ConstrainedValueChanged);
+      Content.ActiveChanged -= new EventHandler(Content_ActiveChanged);
     }
 
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      cmbConstraintColumn.Enabled = !this.ReadOnly && Content != null;
-      cmbConstraintOperation.Enabled = !this.ReadOnly && Content != null;
-      chbActive.Enabled = !this.Locked && Content != null;
-    }
-
-    protected virtual void Content_ConstrainedValueChanged(object sender, EventArgs e) {
-      this.UpdateColumnComboBox();
-    }
-
-    protected virtual void Content_ConstraintColumnChanged(object sender, EventArgs e) {
-      if (Content.ConstrainedValue != null) {
-        if (cmbConstraintColumn.SelectedItem.ToString() != Content.ConstraintColumn)
-          cmbConstraintColumn.SelectedItem = Content.ConstraintColumn;
-      }
-    }
-    private void cmbConstraintColumn_SelectedIndexChanged(object sender, EventArgs e) {
-      if (Content.ConstrainedValue != null) {
-        Content.ConstraintColumn = (string)cmbConstraintColumn.SelectedItem;
-      }
-    }
-
-    protected virtual void Content_ComparisonOperationChanged(object sender, EventArgs e) {
-      if (Content.ConstraintOperation != (ConstraintOperation)this.cmbConstraintOperation.SelectedItem)
-        this.cmbConstraintOperation.SelectedItem = Content.ConstraintOperation;
-    }
-    protected virtual void cmbComparisonOperation_SelectedIndexChanged(object sender, EventArgs e) {
-      Content.ConstraintOperation = (ConstraintOperation)this.cmbConstraintOperation.SelectedItem;
+      chbActive.Enabled = !Locked && Content != null;
+      runsView.Enabled = !Locked && Content != null;
     }
 
     protected virtual void Content_ActiveChanged(object sender, EventArgs e) {
-      if (this.chbActive.Checked != Content.Active)
-        this.chbActive.Checked = Content.Active;
-      this.ReadOnly = Content.Active;
+      chbActive.Checked = Content.Active;
+      ReadOnly = Content.Active;
     }
     protected virtual void chbActive_CheckedChanged(object sender, EventArgs e) {
@@ -122 +78 @@
         Content.Active = chbActive.Checked;
     }
+
+    private class RunSetView : ItemSetView<IRun> {
+      public RunCollection RunCollection { get; set; }
+
+      protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
+        base.itemsListView_DragEnter(sender, e);
+        if (RunCollection != null) {
+          var dropData = e.Data.GetData(HeuristicLab.Common.Constants.DragDropDataFormat);
+          foreach (var run in dropData.GetObjectGraphObjects().OfType<IRun>())
+            validDragOperation = validDragOperation && RunCollection.Contains(run);
+        }
+      }
+
+      protected override void itemsListView_DragOver(object sender, DragEventArgs e) {
+        e.Effect = DragDropEffects.None;
+        if (validDragOperation) {
+          e.Effect = DragDropEffects.Link;
+        }
+      }
+    }
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionEqualityConstraintView.cs

@@ -25 +25 @@
 namespace HeuristicLab.Optimization.Views {
   [Content(typeof(RunCollectionEqualityConstraint), true)]
-  public partial class RunCollectionEqualityConstraintView : RunCollectionConstraintView {
+  public partial class RunCollectionEqualityConstraintView : RunCollectionColumnConstraintView {
     public RunCollectionEqualityConstraintView() {
       InitializeComponent();

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionTypeCompatibilityConstraintView.cs

@@ -25 +25 @@
 namespace HeuristicLab.Optimization.Views {
   [Content(typeof(RunCollectionTypeCompatibilityConstraint), true)]
-  public partial class RunCollectionTypeCompatibilityConstraintView : RunCollectionConstraintView {
+  public partial class RunCollectionTypeCompatibilityConstraintView : RunCollectionColumnConstraintView {
     public RunCollectionTypeCompatibilityConstraintView() {
       InitializeComponent();