Changeset 7665 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views

Timestamp:

03/27/12 13:31:44 (12 years ago)

Author:

sforsten

Message:

#1784:

• minor bug fixes in several views

Location:

branches/ProblemInstancesRegressionAndClassification

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/ProblemView.cs (modified) (2 diffs)

branches/ProblemInstancesRegressionAndClassification

@@ -3 +3 @@
 protoc.exe
 ProtoGen.exe
+bin

@@ -3 +3 @@
 protoc.exe
 ProtoGen.exe
+bin

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

@@ -325 +325 @@
   <ItemGroup>
     <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.Views\3.4\HeuristicLab.Problems.Instances.Views-3.4.csproj">
-      <Project>{1BFDCC58-E228-46DE-A36E-8503194B434D}</Project>
+      <Project>{B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}</Project>
       <Name>HeuristicLab.Problems.Instances.Views-3.4</Name>
     </ProjectReference>

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.cs

@@ -32 +32 @@
 namespace HeuristicLab.Optimization.Views {
   [View("ProblemInstanceProviderView")]
-  [Content(typeof(IProblemInstanceProvider<>), IsDefaultView = true)]
+  [Content(typeof(IProblemInstanceProvider<>), IsDefaultView = false)]
   public partial class ProblemInstanceProviderView<T> : AsynchronousContentView {
 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs

@@ -76 +76 @@
       // problemInstanceSplitContainer
       // 
-      this.problemInstanceSplitContainer.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.problemInstanceSplitContainer.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.problemInstanceSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
       this.problemInstanceSplitContainer.IsSplitterFixed = true;
@@ -102 +102 @@
       // problemInstanceConsumerView
       // 
-      this.problemInstanceConsumerView.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.problemInstanceConsumerView.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.problemInstanceConsumerView.Caption = "ProblemInstanceProviderView";
       this.problemInstanceConsumerView.Content = null;
-      this.problemInstanceConsumerView.Location = new System.Drawing.Point(0, 0);
+      this.problemInstanceConsumerView.Location = new System.Drawing.Point(0, 1);
       this.problemInstanceConsumerView.Name = "problemInstanceConsumerView";
       this.problemInstanceConsumerView.ReadOnly = false;
-      this.problemInstanceConsumerView.Size = new System.Drawing.Size(511, 25);
+      this.problemInstanceConsumerView.Size = new System.Drawing.Size(511, 23);
       this.problemInstanceConsumerView.TabIndex = 0;
       // 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/ProblemView.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Core.Views;
@@ -46 +47 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      //Check if IProblem implements IProblemInstancesConsumer interface
-      problemInstanceConsumerView.Content = (IProblemInstanceConsumer)Content;
-      problemInstanceSplitContainer.Panel1Collapsed = !problemInstanceConsumerView.ContainsProviders();
+      if (Content != null && CheckForIProblemInstanceConsumer(Content)) {
+        problemInstanceConsumerView.Content = (IProblemInstanceConsumer)Content;
+        problemInstanceSplitContainer.Panel1Collapsed = !problemInstanceConsumerView.ContainsProviders();
+      } else {
+        problemInstanceSplitContainer.Panel1Collapsed = true;
+      }
       SetEnabledStateOfControls();
     }
 
-    protected override void SetEnabledStateOfControls() {
-      base.SetEnabledStateOfControls();
+    protected bool CheckForIProblemInstanceConsumer(IProblem Content) {
+      return Content.GetType().GetInterfaces().Any(x => x.IsInterface && x.Equals(typeof(IProblemInstanceConsumer)));
     }
   }

@@ -3 +3 @@
 protoc.exe
 ProtoGen.exe
+bin