Changeset 5612

Timestamp:

03/05/11 00:33:31 (13 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

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

Files:

• HeuristicLab.Clients.OKB-3.3.csproj (modified) (1 diff)
• Query/Views/OrdinalComparisonDateTimeFilterView.Designer.cs (added)
• Query/Views/OrdinalComparisonDateTimeFilterView.cs (added)
• Query/Views/OrdinalComparisonFloatFilterView.Designer.cs (added)
• Query/Views/OrdinalComparisonFloatFilterView.cs (added)
• Query/Views/OrdinalComparisonIntFilterView.Designer.cs (added)
• Query/Views/OrdinalComparisonIntFilterView.cs (added)
• Query/Views/QueryView.Designer.cs (modified) (8 diffs)
• Query/Views/QueryView.cs (modified) (4 diffs)

branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

@@ -208 +208 @@
       <DependentUpon>CombinedFilterView.cs</DependentUpon>
     </Compile>
+    <Compile Include="Query\Views\OrdinalComparisonDateTimeFilterView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Query\Views\OrdinalComparisonDateTimeFilterView.Designer.cs">
+      <DependentUpon>OrdinalComparisonDateTimeFilterView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Query\Views\OrdinalComparisonFloatFilterView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Query\Views\OrdinalComparisonFloatFilterView.Designer.cs">
+      <DependentUpon>OrdinalComparisonFloatFilterView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Query\Views\OrdinalComparisonIntFilterView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Query\Views\OrdinalComparisonIntFilterView.Designer.cs">
+      <DependentUpon>OrdinalComparisonIntFilterView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Query\Views\EqualityComparisonBoolFilterView.cs">
       <SubType>UserControl</SubType>

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

@@ -52 +52 @@
       this.filtersGroupBox = new System.Windows.Forms.GroupBox();
       this.filterPanel = new System.Windows.Forms.Panel();
+      this.refreshFiltersButton = new System.Windows.Forms.Button();
       this.resultsGroupBox = new System.Windows.Forms.GroupBox();
+      this.includeBinaryValuesCheckBox = new System.Windows.Forms.CheckBox();
       this.deserializeBlobsCheckBox = new System.Windows.Forms.CheckBox();
       this.resultsInfoPanel = new System.Windows.Forms.Panel();
@@ -92 +94 @@
       this.runCollectionView.ReadOnly = false;
       this.runCollectionView.Size = new System.Drawing.Size(826, 223);
-      this.runCollectionView.TabIndex = 2;
+      this.runCollectionView.TabIndex = 3;
       // 
       // splitContainer
@@ -120 +122 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.filtersGroupBox.Controls.Add(this.filterPanel);
+      this.filtersGroupBox.Controls.Add(this.refreshFiltersButton);
       this.filtersGroupBox.Location = new System.Drawing.Point(0, 0);
       this.filtersGroupBox.Name = "filtersGroupBox";
@@ -134 +137 @@
       this.filterPanel.Location = new System.Drawing.Point(6, 19);
       this.filterPanel.Name = "filterPanel";
-      this.filterPanel.Size = new System.Drawing.Size(826, 254);
-      this.filterPanel.TabIndex = 0;
+      this.filterPanel.Size = new System.Drawing.Size(796, 254);
+      this.filterPanel.TabIndex = 1;
+      // 
+      // refreshFiltersButton
+      // 
+      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.Name = "refreshFiltersButton";
+      this.refreshFiltersButton.Size = new System.Drawing.Size(24, 24);
+      this.refreshFiltersButton.TabIndex = 0;
+      this.refreshFiltersButton.UseVisualStyleBackColor = true;
+      this.refreshFiltersButton.Click += new System.EventHandler(this.refreshFiltersButton_Click);
       // 
       // resultsGroupBox
@@ -142 +156 @@
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
+      this.resultsGroupBox.Controls.Add(this.includeBinaryValuesCheckBox);
       this.resultsGroupBox.Controls.Add(this.deserializeBlobsCheckBox);
       this.resultsGroupBox.Controls.Add(this.refreshResultsButton);
@@ -152 +167 @@
       this.resultsGroupBox.Text = "Results";
       // 
+      // includeBinaryValuesCheckBox
+      // 
+      this.includeBinaryValuesCheckBox.AutoSize = true;
+      this.includeBinaryValuesCheckBox.Checked = true;
+      this.includeBinaryValuesCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
+      this.includeBinaryValuesCheckBox.Location = new System.Drawing.Point(74, 24);
+      this.includeBinaryValuesCheckBox.Name = "includeBinaryValuesCheckBox";
+      this.includeBinaryValuesCheckBox.Size = new System.Drawing.Size(128, 17);
+      this.includeBinaryValuesCheckBox.TabIndex = 1;
+      this.includeBinaryValuesCheckBox.Text = "&Include Binary Values";
+      this.includeBinaryValuesCheckBox.UseVisualStyleBackColor = true;
+      // 
       // deserializeBlobsCheckBox
       // 
@@ -157 +184 @@
       this.deserializeBlobsCheckBox.Checked = true;
       this.deserializeBlobsCheckBox.CheckState = System.Windows.Forms.CheckState.Checked;
-      this.deserializeBlobsCheckBox.Location = new System.Drawing.Point(62, 24);
+      this.deserializeBlobsCheckBox.Location = new System.Drawing.Point(225, 24);
       this.deserializeBlobsCheckBox.Name = "deserializeBlobsCheckBox";
-      this.deserializeBlobsCheckBox.Size = new System.Drawing.Size(106, 17);
-      this.deserializeBlobsCheckBox.TabIndex = 1;
-      this.deserializeBlobsCheckBox.Text = "&Deserialize Blobs";
+      this.deserializeBlobsCheckBox.Size = new System.Drawing.Size(144, 17);
+      this.deserializeBlobsCheckBox.TabIndex = 2;
+      this.deserializeBlobsCheckBox.Text = "&Deserialize Binary Values";
       this.deserializeBlobsCheckBox.UseVisualStyleBackColor = true;
       // 
@@ -271 +298 @@
     private System.Windows.Forms.Panel filtersInfoPanel;
     private System.Windows.Forms.Label filtersInfoLabel;
+    private System.Windows.Forms.Button refreshFiltersButton;
+    private System.Windows.Forms.CheckBox includeBinaryValuesCheckBox;
 
   }

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

@@ -31 +31 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.Xml;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Clients.OKB.Query {
@@ -71 +72 @@
     }
 
-    private void Content_Refreshing(object sender, EventArgs e) {
-      if (InvokeRequired) {
-        Invoke(new EventHandler(Content_Refreshing), sender, e);
-      } else {
-        Cursor = Cursors.AppStarting;
-        filtersInfoPanel.Visible = true;
-        splitContainer.Enabled = false;
-      }
-    }
-    private void Content_Refreshed(object sender, EventArgs e) {
-      if (InvokeRequired) {
-        Invoke(new EventHandler(Content_Refreshed), sender, e);
-      } else {
-        CreateFilterView();
-        filtersInfoPanel.Visible = false;
-        splitContainer.Enabled = true;
-        Cursor = Cursors.Default;
-        SetEnabledStateOfControls();
-      }
-    }
-
     #region Load Results
     private void LoadResultsAsync(int batchSize) {
+      bool includeBinaryValues = includeBinaryValuesCheckBox.Checked;
       bool deserialize = deserializeBlobsCheckBox.Checked;
 
@@ -116 +97 @@
 
         RunCollection runs = new RunCollection();
-        runs.CollectionReset += new Collections.CollectionItemsChangedEventHandler<IRun>(runs_CollectionReset);
         runCollectionView.Content = runs;
         while (ids.Count() > 0) {
           cancellationToken.ThrowIfCancellationRequested();
-          runs.AddRange(QueryClient.Instance.GetRuns(ids.Take(batchSize), true).Select(x => ConvertToOptimizationRun(x, deserialize)));
+          runs.AddRange(QueryClient.Instance.GetRuns(ids.Take(batchSize), includeBinaryValues).Select(x => ConvertToOptimizationRun(x, deserialize)));
           ids = ids.Skip(batchSize);
           Invoke(new Action(() => {
@@ -139 +119 @@
       });
     }
-
-    void runs_CollectionReset(object sender, Collections.CollectionItemsChangedEventArgs<IRun> e) {
-    }
     #endregion
+
+    private void Content_Refreshing(object sender, EventArgs e) {
+      if (InvokeRequired) {
+        Invoke(new EventHandler(Content_Refreshing), sender, e);
+      } else {
+        Cursor = Cursors.AppStarting;
+        filtersInfoPanel.Visible = true;
+        splitContainer.Enabled = false;
+      }
+    }
+    private void Content_Refreshed(object sender, EventArgs e) {
+      if (InvokeRequired) {
+        Invoke(new EventHandler(Content_Refreshed), sender, e);
+      } else {
+        CreateFilterView();
+        filtersInfoPanel.Visible = false;
+        splitContainer.Enabled = true;
+        Cursor = Cursors.Default;
+        SetEnabledStateOfControls();
+      }
+    }
+
+    private void refreshFiltersButton_Click(object sender, EventArgs e) {
+      Content.RefreshAsync(new Action<Exception>((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Refresh failed.", ex)));
+    }
 
     private void refreshResultsButton_Click(object sender, EventArgs e) {