Changeset 11677 for branches/ALPS/HeuristicLab.Core.Views

Timestamp:

12/10/14 10:31:41 (10 years ago)

Author:

pfleck

Message:

#2269 Merged trunk. Updated .net version of ALPS plugin.

Location:

branches/ALPS

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/Clipboard.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj (modified) (10 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)
• HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs (copied) (copied from trunk/sources/HeuristicLab.Core.Views/3.3/NestingLevelErrorControl.cs)

branches/ALPS/HeuristicLab.Core.Views/3.3/Clipboard.cs

@@ -24 +24 @@
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Linq;
 using System.Threading;
@@ -198 +199 @@
           i++;
           SetEnabledStateOfContentViews(item, false);
-          XmlGenerator.Serialize(item, ItemsPath + Path.DirectorySeparatorChar + i.ToString("00000000") + ".hl", 9);
+          XmlGenerator.Serialize(item, ItemsPath + Path.DirectorySeparatorChar + i.ToString("00000000") + ".hl", CompressionLevel.Optimal);
           OnItemSaved(item, progressBar.Maximum / listView.Items.Count);
         }

branches/ALPS/HeuristicLab.Core.Views/3.3/HeuristicLab.Core.Views-3.3.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Core.Views</RootNamespace>
     <AssemblyName>HeuristicLab.Core.Views-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
@@ -46 +46 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -57 +58 @@
     </DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
@@ -66 +68 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
@@ -77 +80 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -86 +90 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
@@ -97 +102 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
@@ -146 +152 @@
     <Compile Include="LogView.Designer.cs">
       <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" />
@@ -378 +390 @@
   -->
   <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 +397 @@
 call PreBuildEvent.cmd
 </PreBuildEvent>
-<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 export ProjectDir=$(ProjectDir)
 export SolutionDir=$(SolutionDir)

branches/ALPS/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 = 32;
+
     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;
+    }
   }
 }