Changeset 7589 for branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views

Timestamp:

03/08/12 20:44:53 (13 years ago)

Author:

ascheibe

Message:

#1174 values of returned runs can now be limited

Location:

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views

Files:

• QueryView.Designer.cs (modified) (11 diffs)
• QueryView.cs (modified) (6 diffs)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/QueryView.Designer.cs

@@ -50 +50 @@
       this.runCollectionView = new HeuristicLab.Optimization.Views.RunCollectionView();
       this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.filterTabControl = new System.Windows.Forms.TabControl();
+      this.filterTabPage = new System.Windows.Forms.TabPage();
       this.filtersGroupBox = new System.Windows.Forms.GroupBox();
       this.filterPanel = new System.Windows.Forms.Panel();
       this.refreshFiltersButton = new System.Windows.Forms.Button();
+      this.constraintsTabPage = new System.Windows.Forms.TabPage();
       this.resultsGroupBox = new System.Windows.Forms.GroupBox();
       this.includeBinaryValuesCheckBox = new System.Windows.Forms.CheckBox();
@@ -61 +64 @@
       this.filtersInfoPanel = new System.Windows.Forms.Panel();
       this.filtersInfoLabel = new System.Windows.Forms.Label();
+      this.constraintsCheckedListBox = new System.Windows.Forms.CheckedListBox();
+      this.selectAllButton = new System.Windows.Forms.Button();
+      this.deselectAllButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
       this.splitContainer.Panel2.SuspendLayout();
       this.splitContainer.SuspendLayout();
+      this.filterTabControl.SuspendLayout();
+      this.filterTabPage.SuspendLayout();
       this.filtersGroupBox.SuspendLayout();
+      this.constraintsTabPage.SuspendLayout();
       this.resultsGroupBox.SuspendLayout();
       this.resultsInfoPanel.SuspendLayout();
@@ -106 +115 @@
       // splitContainer.Panel1
       // 
-      this.splitContainer.Panel1.Controls.Add(this.filtersGroupBox);
+      this.splitContainer.Panel1.Controls.Add(this.filterTabControl);
       // 
       // splitContainer.Panel2
@@ -115 +124 @@
       this.splitContainer.TabIndex = 0;
       // 
+      // filterTabControl
+      // 
+      this.filterTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.filterTabControl.Controls.Add(this.filterTabPage);
+      this.filterTabControl.Controls.Add(this.constraintsTabPage);
+      this.filterTabControl.Location = new System.Drawing.Point(3, 3);
+      this.filterTabControl.Name = "filterTabControl";
+      this.filterTabControl.SelectedIndex = 0;
+      this.filterTabControl.Size = new System.Drawing.Size(832, 276);
+      this.filterTabControl.TabIndex = 1;
+      // 
+      // filterTabPage
+      // 
+      this.filterTabPage.Controls.Add(this.filtersGroupBox);
+      this.filterTabPage.Location = new System.Drawing.Point(4, 22);
+      this.filterTabPage.Name = "filterTabPage";
+      this.filterTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.filterTabPage.Size = new System.Drawing.Size(824, 250);
+      this.filterTabPage.TabIndex = 0;
+      this.filterTabPage.Text = "Filter";
+      this.filterTabPage.UseVisualStyleBackColor = true;
+      // 
       // filtersGroupBox
       // 
@@ -122 +155 @@
       this.filtersGroupBox.Controls.Add(this.filterPanel);
       this.filtersGroupBox.Controls.Add(this.refreshFiltersButton);
-      this.filtersGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.filtersGroupBox.Location = new System.Drawing.Point(6, 6);
       this.filtersGroupBox.Name = "filtersGroupBox";
-      this.filtersGroupBox.Size = new System.Drawing.Size(838, 279);
+      this.filtersGroupBox.Size = new System.Drawing.Size(812, 238);
       this.filtersGroupBox.TabIndex = 0;
       this.filtersGroupBox.TabStop = false;
@@ -136 +169 @@
       this.filterPanel.Location = new System.Drawing.Point(6, 19);
       this.filterPanel.Name = "filterPanel";
-      this.filterPanel.Size = new System.Drawing.Size(796, 254);
+      this.filterPanel.Size = new System.Drawing.Size(770, 213);
       this.filterPanel.TabIndex = 1;
       // 
@@ -143 +176 @@
       this.refreshFiltersButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.refreshFiltersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
-      this.refreshFiltersButton.Location = new System.Drawing.Point(808, 21);
+      this.refreshFiltersButton.Location = new System.Drawing.Point(782, 21);
       this.refreshFiltersButton.Name = "refreshFiltersButton";
       this.refreshFiltersButton.Size = new System.Drawing.Size(24, 24);
@@ -149 +182 @@
       this.refreshFiltersButton.UseVisualStyleBackColor = true;
       this.refreshFiltersButton.Click += new System.EventHandler(this.refreshFiltersButton_Click);
+      // 
+      // constraintsTabPage
+      // 
+      this.constraintsTabPage.Controls.Add(this.deselectAllButton);
+      this.constraintsTabPage.Controls.Add(this.selectAllButton);
+      this.constraintsTabPage.Controls.Add(this.constraintsCheckedListBox);
+      this.constraintsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.constraintsTabPage.Name = "constraintsTabPage";
+      this.constraintsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.constraintsTabPage.Size = new System.Drawing.Size(824, 250);
+      this.constraintsTabPage.TabIndex = 1;
+      this.constraintsTabPage.Text = "Downloaded Values";
+      this.constraintsTabPage.UseVisualStyleBackColor = true;
       // 
       // resultsGroupBox
@@ -245 +291 @@
       this.filtersInfoLabel.Text = "Loading Filters ...";
       this.filtersInfoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+      // 
+      // constraintsCheckedListBox
+      // 
+      this.constraintsCheckedListBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                  | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.constraintsCheckedListBox.CheckOnClick = true;
+      this.constraintsCheckedListBox.FormattingEnabled = true;
+      this.constraintsCheckedListBox.Location = new System.Drawing.Point(6, 6);
+      this.constraintsCheckedListBox.Name = "constraintsCheckedListBox";
+      this.constraintsCheckedListBox.Size = new System.Drawing.Size(812, 214);
+      this.constraintsCheckedListBox.Sorted = true;
+      this.constraintsCheckedListBox.TabIndex = 0;
+      // 
+      // selectAllButton
+      // 
+      this.selectAllButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.selectAllButton.Location = new System.Drawing.Point(6, 221);
+      this.selectAllButton.Name = "selectAllButton";
+      this.selectAllButton.Size = new System.Drawing.Size(75, 23);
+      this.selectAllButton.TabIndex = 1;
+      this.selectAllButton.Text = "Select all";
+      this.selectAllButton.UseVisualStyleBackColor = true;
+      this.selectAllButton.Click += new System.EventHandler(this.selectAllButton_Click);
+      // 
+      // deselectAllButton
+      // 
+      this.deselectAllButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+      this.deselectAllButton.Location = new System.Drawing.Point(88, 221);
+      this.deselectAllButton.Name = "deselectAllButton";
+      this.deselectAllButton.Size = new System.Drawing.Size(75, 23);
+      this.deselectAllButton.TabIndex = 2;
+      this.deselectAllButton.Text = "Deselect all";
+      this.deselectAllButton.UseVisualStyleBackColor = true;
+      this.deselectAllButton.Click += new System.EventHandler(this.deselectAllButton_Click);
       // 
       // QueryView
@@ -259 +340 @@
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
       this.splitContainer.ResumeLayout(false);
+      this.filterTabControl.ResumeLayout(false);
+      this.filterTabPage.ResumeLayout(false);
       this.filtersGroupBox.ResumeLayout(false);
+      this.constraintsTabPage.ResumeLayout(false);
       this.resultsGroupBox.ResumeLayout(false);
       this.resultsGroupBox.PerformLayout();
@@ -285 +369 @@
     private System.Windows.Forms.Button refreshFiltersButton;
     private System.Windows.Forms.CheckBox includeBinaryValuesCheckBox;
+    private System.Windows.Forms.TabControl filterTabControl;
+    private System.Windows.Forms.TabPage filterTabPage;
+    private System.Windows.Forms.TabPage constraintsTabPage;
+    private System.Windows.Forms.Button deselectAllButton;
+    private System.Windows.Forms.Button selectAllButton;
+    private System.Windows.Forms.CheckedListBox constraintsCheckedListBox;
 
   }

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/Views/QueryView.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -75 +77 @@
     private void LoadResultsAsync(int batchSize) {
       bool includeBinaryValues = includeBinaryValuesCheckBox.Checked;
+      IEnumerable<ValueName> valueNames = constraintsCheckedListBox.CheckedItems.Cast<ValueName>();
 
       Cursor = Cursors.AppStarting;
@@ -99 +102 @@
         while (ids.Count() > 0) {
           cancellationToken.ThrowIfCancellationRequested();
-          runs.AddRange(QueryClient.Instance.GetRuns(ids.Take(batchSize), includeBinaryValues).Select(x => ConvertToOptimizationRun(x)));
+          if (AllValueNamesChecked()) {
+            runs.AddRange(QueryClient.Instance.GetRuns(ids.Take(batchSize), includeBinaryValues).Select(x => ConvertToOptimizationRun(x)));
+          } else {
+            runs.AddRange(QueryClient.Instance.GetRunsWithValues(ids.Take(batchSize), includeBinaryValues, valueNames).Select(x => ConvertToOptimizationRun(x)));
+          }
           ids = ids.Skip(batchSize);
           Invoke(new Action(() => {
@@ -146 +153 @@
       } else {
         CreateFilterView();
+        CreateConstraintsView();
         filtersInfoPanel.Visible = false;
         splitContainer.Enabled = true;
@@ -179 +187 @@
         }
       }
+    }
+
+    private void CreateConstraintsView() {
+      constraintsCheckedListBox.Items.Clear();
+      constraintsCheckedListBox.Items.AddRange(QueryClient.Instance.ValueNames.ToArray());
+      SetCheckedState(true);
     }
 
@@ -221 +235 @@
       return null;
     }
+
+    private void SetCheckedState(bool val) {
+      for (int i = 0; i < constraintsCheckedListBox.Items.Count; i++) {
+        constraintsCheckedListBox.SetItemChecked(i, val);
+      }
+    }
+
+    private bool AllValueNamesChecked() {
+      return constraintsCheckedListBox.Items.Count == constraintsCheckedListBox.CheckedItems.Count;
+    }
+
+    private void selectAllButton_Click(object sender, EventArgs e) {
+      SetCheckedState(true);
+    }
+
+    private void deselectAllButton_Click(object sender, EventArgs e) {
+      SetCheckedState(false);
+    }
   }
 }