Changeset 5269 for branches/OKB/HeuristicLab.Clients.OKB-3.3/Views

Timestamp:

01/11/11 05:13:55 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views

Files:

• EqualityComparisonFilterView.Designer.cs (added)
• EqualityComparisonFilterView.cs (added)
• FilterView.Designer.cs (added)
• FilterView.cs (added)
• FiltersView.Designer.cs (added)
• FiltersView.cs (added)
• NameEqualityComparisonBoolFilterView.Designer.cs (added)
• NameEqualityComparisonBoolFilterView.cs (added)
• NameOrdinalComparisonDoubleFilterView.Designer.cs (added)
• NameOrdinalComparisonDoubleFilterView.cs (added)
• NameOrdinalComparisonLongFilterView.Designer.cs (added)
• NameOrdinalComparisonLongFilterView.cs (added)
• NameSetComparisonStringFilterView.Designer.cs (added)
• NameSetComparisonStringFilterView.cs (added)
• OrdinalComparisonFilterView.Designer.cs (added)
• OrdinalComparisonFilterView.cs (added)
• OrdinalComparisonIntFilterView.Designer.cs (added)
• OrdinalComparisonIntFilterView.cs (added)
• OrdinalComparisonLongFilterView.Designer.cs (added)
• OrdinalComparisonLongFilterView.cs (added)
• QueryView.Designer.cs (modified) (6 diffs)
• QueryView.cs (modified) (1 diff)
• SetComparisonFilterView.Designer.cs (added)
• SetComparisonFilterView.cs (added)
• SetComparisonStringFilterView.Designer.cs (added)
• SetComparisonStringFilterView.cs (added)

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/QueryView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(QueryView));
       this.refreshButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+      this.showRunsButton = new System.Windows.Forms.Button();
       this.runCollectionView = new HeuristicLab.Clients.OKB.RunCollectionView();
-      this.showRunsButton = new System.Windows.Forms.Button();
-      this.queryTextBox = new System.Windows.Forms.TextBox();
+      this.splitContainer = new System.Windows.Forms.SplitContainer();
+      this.filtersView = new HeuristicLab.Clients.OKB.FiltersView();
+      this.filtersGroupBox = new System.Windows.Forms.GroupBox();
+      this.resultsGroupBox = new System.Windows.Forms.GroupBox();
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
+      this.splitContainer.Panel1.SuspendLayout();
+      this.splitContainer.Panel2.SuspendLayout();
+      this.splitContainer.SuspendLayout();
+      this.filtersGroupBox.SuspendLayout();
+      this.resultsGroupBox.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -57 +65 @@
       // 
       this.refreshButton.Image = HeuristicLab.Common.Resources.VS2008ImageLibrary.Refresh;
-      this.refreshButton.Location = new System.Drawing.Point(0, 0);
+      this.refreshButton.Location = new System.Drawing.Point(6, 19);
       this.refreshButton.Name = "refreshButton";
       this.refreshButton.Size = new System.Drawing.Size(24, 24);
@@ -64 +72 @@
       this.refreshButton.UseVisualStyleBackColor = true;
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
+      // 
+      // showRunsButton
+      // 
+      this.showRunsButton.Location = new System.Drawing.Point(36, 19);
+      this.showRunsButton.Name = "showRunsButton";
+      this.showRunsButton.Size = new System.Drawing.Size(75, 24);
+      this.showRunsButton.TabIndex = 1;
+      this.showRunsButton.Text = "&Show Runs";
+      this.showRunsButton.UseVisualStyleBackColor = true;
+      this.showRunsButton.Click += new System.EventHandler(this.showRunsButton_Click);
       // 
       // runCollectionView
@@ -72 +90 @@
       this.runCollectionView.Caption = "RunCollection View";
       this.runCollectionView.Content = null;
-      this.runCollectionView.Location = new System.Drawing.Point(0, 30);
+      this.runCollectionView.Location = new System.Drawing.Point(6, 49);
       this.runCollectionView.Name = "runCollectionView";
       this.runCollectionView.ReadOnly = false;
-      this.runCollectionView.Size = new System.Drawing.Size(727, 405);
-      this.runCollectionView.TabIndex = 3;
+      this.runCollectionView.Size = new System.Drawing.Size(722, 156);
+      this.runCollectionView.TabIndex = 2;
       // 
-      // showRunsButton
+      // splitContainer
       // 
-      this.showRunsButton.Location = new System.Drawing.Point(30, 0);
-      this.showRunsButton.Name = "showRunsButton";
-      this.showRunsButton.Size = new System.Drawing.Size(75, 24);
-      this.showRunsButton.TabIndex = 1;
-      this.showRunsButton.Text = "&Show Runs";
-      this.showRunsButton.UseVisualStyleBackColor = true;
-      this.showRunsButton.Click += new System.EventHandler(this.showRunsButton_Click);
+      this.splitContainer.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.splitContainer.Location = new System.Drawing.Point(0, 0);
+      this.splitContainer.Name = "splitContainer";
+      this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
       // 
-      // queryTextBox
+      // splitContainer.Panel1
       // 
-      this.queryTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.splitContainer.Panel1.Controls.Add(this.filtersGroupBox);
+      // 
+      // splitContainer.Panel2
+      // 
+      this.splitContainer.Panel2.Controls.Add(this.resultsGroupBox);
+      this.splitContainer.Size = new System.Drawing.Size(734, 435);
+      this.splitContainer.SplitterDistance = 217;
+      this.splitContainer.TabIndex = 0;
+      // 
+      // filtersView
+      // 
+      this.filtersView.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.queryTextBox.Location = new System.Drawing.Point(111, 3);
-      this.queryTextBox.Name = "queryTextBox";
-      this.queryTextBox.Size = new System.Drawing.Size(616, 20);
-      this.queryTextBox.TabIndex = 2;
+      this.filtersView.Caption = "Filters View";
+      this.filtersView.Location = new System.Drawing.Point(6, 19);
+      this.filtersView.Name = "filtersView";
+      this.filtersView.ReadOnly = false;
+      this.filtersView.Size = new System.Drawing.Size(722, 189);
+      this.filtersView.TabIndex = 0;
+      // 
+      // filtersGroupBox
+      // 
+      this.filtersGroupBox.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.filtersGroupBox.Controls.Add(this.filtersView);
+      this.filtersGroupBox.Location = new System.Drawing.Point(0, 0);
+      this.filtersGroupBox.Name = "filtersGroupBox";
+      this.filtersGroupBox.Size = new System.Drawing.Size(734, 214);
+      this.filtersGroupBox.TabIndex = 0;
+      this.filtersGroupBox.TabStop = false;
+      this.filtersGroupBox.Text = "Filters";
+      // 
+      // resultsGroupBox
+      // 
+      this.resultsGroupBox.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.resultsGroupBox.Controls.Add(this.refreshButton);
+      this.resultsGroupBox.Controls.Add(this.runCollectionView);
+      this.resultsGroupBox.Controls.Add(this.showRunsButton);
+      this.resultsGroupBox.Location = new System.Drawing.Point(0, 3);
+      this.resultsGroupBox.Name = "resultsGroupBox";
+      this.resultsGroupBox.Size = new System.Drawing.Size(734, 211);
+      this.resultsGroupBox.TabIndex = 0;
+      this.resultsGroupBox.TabStop = false;
+      this.resultsGroupBox.Text = "Results";
       // 
       // QueryView
@@ -101 +160 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.queryTextBox);
-      this.Controls.Add(this.showRunsButton);
-      this.Controls.Add(this.runCollectionView);
-      this.Controls.Add(this.refreshButton);
+      this.Controls.Add(this.splitContainer);
       this.Name = "QueryView";
-      this.Size = new System.Drawing.Size(727, 435);
+      this.Size = new System.Drawing.Size(734, 435);
+      this.splitContainer.Panel1.ResumeLayout(false);
+      this.splitContainer.Panel2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit();
+      this.splitContainer.ResumeLayout(false);
+      this.filtersGroupBox.ResumeLayout(false);
+      this.resultsGroupBox.ResumeLayout(false);
       this.ResumeLayout(false);
-      this.PerformLayout();
 
     }
@@ -118 +179 @@
     private RunCollectionView runCollectionView;
     private System.Windows.Forms.Button showRunsButton;
-    private System.Windows.Forms.TextBox queryTextBox;
+    private System.Windows.Forms.SplitContainer splitContainer;
+    private FiltersView filtersView;
+    private System.Windows.Forms.GroupBox filtersGroupBox;
+    private System.Windows.Forms.GroupBox resultsGroupBox;
 
   }

branches/OKB/HeuristicLab.Clients.OKB-3.3/Views/QueryView.cs

@@ -60 +60 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      filtersView.Enabled = Content != null;
       refreshButton.Enabled = Content != null;
+      showRunsButton.Enabled = Content != null;
       runCollectionView.Enabled = Content != null;
     }
 
     private void refreshButton_Click(object sender, EventArgs e) {
-      runCollectionView.Content = Content.QueryRuns(queryTextBox.Text);
+      runCollectionView.Content = Content.QueryRuns(filtersView.Filters);
     }