Changeset 11748 for stable

Timestamp:

01/13/15 13:15:03 (9 years ago)

Author:

ascheibe

Message:

#2158 merged r11555,r11557,r11592,r11736 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/ItemView.cs (modified) (3 diffs)
• HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.Designer.cs) (2 diffs)
• HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs) (1 diff)

stable/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -147 +147 @@
       <DependentUpon>LogView.cs</DependentUpon>
     </Compile>
+    <Compile Include="NestingLevelErrorControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="NestingLevelErrorControl.Designer.cs">
+      <DependentUpon>NestingLevelErrorControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="VariableValueView.cs">
@@ -378 +384 @@
   -->
   <PropertyGroup>
-   <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
 set ProjectDir=$(ProjectDir)
 set SolutionDir=$(SolutionDir)
@@ -385 +391 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

stable/HeuristicLab.Core.Views/3.3/ItemView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Windows.Forms;
 using HeuristicLab.MainForm.WindowsForms;
 
@@ -27 +29 @@
   /// </summary>
   public partial class ItemView : AsynchronousContentView {
+    public const int MaximumNestingLevel = 35;
+
     public new IItem Content {
       get { return (IItem)base.Content; }
@@ -38 +42 @@
       InitializeComponent();
     }
+
+    protected override void OnInitialized(EventArgs e) {
+      base.OnInitialized(e);
+
+      if (CountParentControls() > MaximumNestingLevel) {
+        //capture content, needed because it is set at a later time
+        NestingLevelErrorControl errorControl = new NestingLevelErrorControl(() => Content, this.GetType());
+        errorControl.Dock = DockStyle.Fill;
+
+        Controls.Clear();
+        Controls.Add(errorControl);
+      }
+    }
+
+    private int CountParentControls() {
+      int cnt = 0;
+      Control parent = Parent;
+      while (parent != null) {
+        parent = parent.Parent;
+        cnt++;
+      }
+      return cnt;
+    }
   }
 }

stable/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.Designer.cs

@@ -61 +61 @@
       // showButton
       // 
-      this.showButton.Location = new System.Drawing.Point(3, 19);
+      this.showButton.Location = new System.Drawing.Point(7, 21);
       this.showButton.Name = "showButton";
       this.showButton.Size = new System.Drawing.Size(132, 23);
@@ -75 +75 @@
       this.Controls.Add(this.infoLabel);
       this.Name = "NestingLevelErrorControl";
-      this.Size = new System.Drawing.Size(387, 46);
+      this.Size = new System.Drawing.Size(387, 50);
       this.ResumeLayout(false);
       this.PerformLayout();

stable/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs

@@ -27 +27 @@
 namespace HeuristicLab.Core.Views {
   public partial class NestingLevelErrorControl : UserControl {
-    public Func<IContent> Content { get; set; }
+    private Func<IContent> Content { get; set; }
+    private Type ViewType { get; set; }
 
-    public NestingLevelErrorControl() {
+    public NestingLevelErrorControl(Func<IContent> content, Type viewType)
+      : base() {
       InitializeComponent();
+      Content = content;
+      ViewType = viewType;
     }
 
     private void showButton_Click(object sender, System.EventArgs e) {
-      if (Content != null) {
-        if (MainFormManager.MainForm.ShowContent(Content()) == null) {
-          using (TypeSelectorDialog dialog = new TypeSelectorDialog()) {
-            dialog.Caption = "Unable to find view for content. Please choose a appropriate view.";
-            dialog.TypeSelector.Configure(typeof(IContentView), false, false);
-
-            if (dialog.ShowDialog(this) == DialogResult.OK) {
-              MainFormManager.MainForm.ShowContent(Content(), dialog.TypeSelector.SelectedType);
-            }
-          }
-        }
+      if (Content != null && ViewType != null) {
+        MainFormManager.MainForm.ShowContent(Content(), ViewType);
       }
     }