Changeset 11569 for branches/ALPS

Timestamp:

11/24/14 14:44:42 (10 years ago)

Author:

pfleck

Message:

#2269

• Added a generic EnumValue for wrapping an enum.
• Added a generic EnumValueView which displays a drop down with the available enum values.
• Made AgingScheme an EnumValue instead of ValueTypeValue.

Location:

branches/ALPS

Files:

• HeuristicLab.Algorithms.ALPS/3.3/AgingScheme.cs (modified) (2 diffs)
• HeuristicLab.Data.Views/3.3/EnumValueView.Designer.cs (added)
• HeuristicLab.Data.Views/3.3/EnumValueView.cs (added)
• HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Data/3.3/EnumValue.cs (added)
• HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj (modified) (1 diff)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AgingScheme.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -37 +35 @@
   [Item("AgingScheme", "Represents a certain type of an aging scheme.")]
   [StorableClass]
-  public class AgingScheme : ValueTypeValue<AgingSchemes> {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Enum; }
-    }
-
+  public class AgingScheme : EnumValue<AgingSchemes> {
     [StorableConstructor]
     protected AgingScheme(bool deserializing) : base(deserializing) { }
     protected AgingScheme(AgingScheme original, Cloner cloner) : base(original, cloner) { }
-    public AgingScheme() : base() { }
+
+    public AgingScheme() : base(AgingSchemes.Linear) { }
     public AgingScheme(AgingSchemes type) : base(type) { }
 

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

@@ -208 +208 @@
       <DependentUpon>StringConvertibleValueView.cs</DependentUpon>
     </Compile>
+    <Compile Include="EnumValueView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EnumValueView.Designer.cs">
+      <DependentUpon>EnumValueView.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>

branches/ALPS/HeuristicLab.Data/3.3/HeuristicLab.Data-3.3.csproj

@@ -117 +117 @@
     <Compile Include="Comparison.cs" />
     <Compile Include="ComparisonType.cs" />
+    <Compile Include="EnumValue.cs" />
     <Compile Include="Path Types\DirectoryValue.cs" />
     <Compile Include="Path Types\FileValue.cs" />