Changeset 8172 for branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/BoxChart

Timestamp:

07/01/12 14:36:47 (12 years ago)

Author:

gkronber

Message:

#1797: adapted return type of ConstrainedValueParameter properties in FLA branch.

File:

• branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/BoxChart/BoxChartCreator.cs (modified) (9 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/BoxChart/BoxChartCreator.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
-using System.Text;
 using HeuristicLab.Collections;
 using HeuristicLab.Common;
@@ -14 +13 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using ICSharpCode.SharpZipLib.Zip;
-using System.Drawing.Imaging;
 
 namespace HeuristicLab.Analysis.FitnessLandscape.BoxCharts {
@@ -35 +33 @@
     }
     public ValueParameter<IntValue> PaddingParameter {
-      get { return (ValueParameter<IntValue>) Parameters["Padding"]; }
+      get { return (ValueParameter<IntValue>)Parameters["Padding"]; }
     }
     public ValueParameter<StringValue> ZipFileNameParameter {
-      get { return (ValueParameter<StringValue>) Parameters["ZipFileName"]; }
-    } 
-    public ConstrainedValueParameter<StringValue> AppendModeParameter {
-      get { return (ConstrainedValueParameter<StringValue>) Parameters["AppendMode"]; }
-    } 
+      get { return (ValueParameter<StringValue>)Parameters["ZipFileName"]; }
+    }
+    public IConstrainedValueParameter<StringValue> AppendModeParameter {
+      get { return (IConstrainedValueParameter<StringValue>)Parameters["AppendMode"]; }
+    }
     #endregion
 
@@ -51 +49 @@
     protected int Padding { get { return PaddingParameter.Value.Value; } }
     protected AppendModes AppendMode { get { return (AppendModes)Enum.Parse(typeof(AppendModes), AppendModeParameter.Value.Value); } }
-      protected List<IBoxChartElementGenerator> Generators {
+    protected List<IBoxChartElementGenerator> Generators {
       get {
         return ElementsParameter.Value.CheckedItems.Select(i => i.Value).ToList();
@@ -61 +59 @@
     [StorableConstructor]
     protected BoxChartCreator(bool deserializing) : base(deserializing) { }
-    protected BoxChartCreator(BoxChartCreator original, Cloner cloner) : base(original, cloner) {
+    protected BoxChartCreator(BoxChartCreator original, Cloner cloner)
+      : base(original, cloner) {
       RegisterEvents();
     }
@@ -67 +66 @@
       Parameters.Add(new ValueParameter<StringValue>("ChartName", "The result name of the chart.", new StringValue("Chart")));
       Parameters.Add(new ValueParameter<CheckedItemList<IBoxChartElementGenerator>>("Elements", "List of patient chart element generators.", new CheckedItemList<IBoxChartElementGenerator>()));
-      Parameters.Add(new ValueParameter<IntValue>("Size", "The size of one box in pixels.", new IntValue(50))); 
-      Parameters.Add(new ValueParameter<IntValue>("Padding", "The padding inside the boxes", new IntValue(1))); 
+      Parameters.Add(new ValueParameter<IntValue>("Size", "The size of one box in pixels.", new IntValue(50)));
+      Parameters.Add(new ValueParameter<IntValue>("Padding", "The padding inside the boxes", new IntValue(1)));
       Parameters.Add(new ValueParameter<StringValue>("ZipFileName", "The name of the zip file that will contain all generated charts.", new StringValue("")));
       Parameters.Add(new ConstrainedValueParameter<StringValue>("AppendMode", "Determines how coordinates of new elements are calculated.",
-        new ItemSet<StringValue>(Enum.GetNames(typeof (AppendModes)).Select(v => new StringValue(v)))));
+        new ItemSet<StringValue>(Enum.GetNames(typeof(AppendModes)).Select(v => new StringValue(v)))));
       AppendModeParameter.Value = AppendModeParameter.ValidValues.SingleOrDefault(v => v.Value == AppendModes.Horizontal.ToString());
       RegisterEvents();
@@ -84 +83 @@
       if (!Parameters.ContainsKey("AppendMode")) {
         Parameters.Add(new ConstrainedValueParameter<StringValue>("AppendMode", "Determines how coordinates of new elements are calculated.",
-          new ItemSet<StringValue>(Enum.GetNames(typeof (AppendModes)).Select(v => new StringValue(v)))));
+          new ItemSet<StringValue>(Enum.GetNames(typeof(AppendModes)).Select(v => new StringValue(v)))));
         AppendModeParameter.Value = AppendModeParameter.ValidValues.SingleOrDefault(v => v.Value == AppendModes.Horizontal.ToString());
       }
@@ -109 +108 @@
         var newItems = e.Items.Select(kvp => kvp.Value).ToList();
         switch (AppendMode) {
-          case AppendModes.Horizontal: 
+          case AppendModes.Horizontal:
             foreach (var generator in newItems) {
               generator.Y = generators.Max(g => g.Y + g.RowSpan - 1);
@@ -132 +131 @@
       var maxX = generators.Max(g => g.X + g.ColSpan);
       var maxY = generators.Max(g => g.Y + g.RowSpan);
-      for (int i = 0; i<runs.Count; i++) {
+      for (int i = 0; i < runs.Count; i++) {
         var run = runs[i];
-        var b = new Bitmap(maxX*Size, maxY*Size);
+        var b = new Bitmap(maxX * Size, maxY * Size);
         using (var g = Graphics.FromImage(b)) {
           g.FillRectangle(SystemBrushes.Control, 0, 0, b.Width, b.Height);
           foreach (var gen in generators) {
-            g.SetClip(new Rectangle(gen.X*Size+Padding, gen.Y*Size+Padding, gen.ColSpan*Size-2*Padding, gen.RowSpan*Size-2*Padding));
+            g.SetClip(new Rectangle(gen.X * Size + Padding, gen.Y * Size + Padding, gen.ColSpan * Size - 2 * Padding, gen.RowSpan * Size - 2 * Padding));
             gen.Draw(run, g);
             g.ResetClip();