Changeset 13497 for branches/HeuristicLab.BinPacking/PackingPlanVisualizations/2D/PackingPlan2D.cs

Timestamp:

01/12/16 10:42:58 (8 years ago)

Author:

gkronber

Message:

#1966: fixed various problems: bugs in cloning, bugs in persistence, method names, various minor improvements of source code for readability.

File:

• branches/HeuristicLab.BinPacking/PackingPlanVisualizations/2D/PackingPlan2D.cs (modified) (4 diffs)

branches/HeuristicLab.BinPacking/PackingPlanVisualizations/2D/PackingPlan2D.cs

@@ -33 +33 @@
 namespace PackingPlanVisualizations {
   public partial class PackingPlan2D : UserControl {
-    WindowRenderTarget wndRender = null;
-    Factory2D1 factory = new Factory2D1(FactoryType2D1.SingleThreaded);
-    SharpDX.DirectWrite.Factory dwFactory = new SharpDX.DirectWrite.Factory(SharpDX.DirectWrite.FactoryType.Shared);
-    RenderTargetProperties rndTargProperties = new RenderTargetProperties(new PixelFormat(Format.B8G8R8A8_UNorm, AlphaMode.Premultiplied));
-    HwndRenderTargetProperties hwndProperties = new HwndRenderTargetProperties();
+    private WindowRenderTarget wndRender;
+    private readonly Factory2D1 factory = new Factory2D1(FactoryType2D1.SingleThreaded);
+    private readonly SharpDX.DirectWrite.Factory dwFactory = new SharpDX.DirectWrite.Factory(SharpDX.DirectWrite.FactoryType.Shared);
+    private readonly RenderTargetProperties rndTargProperties = new RenderTargetProperties(new PixelFormat(Format.B8G8R8A8_UNorm, AlphaMode.Premultiplied));
+    private HwndRenderTargetProperties hwndProperties;
 
 
-    #region Packing members BEGIN
-    SolidColorBrush containerBrush;
-    SolidColorBrush containerFillingBrush;
-    SolidColorBrush itemBrush;
-    SolidColorBrush itemFillingBrush;
-    SolidColorBrush labelBrush;
-    TextFormat textFormat;
+    private SolidColorBrush containerBrush;
+    private SolidColorBrush containerFillingBrush;
+    private SolidColorBrush itemBrush;
+    private SolidColorBrush itemFillingBrush;
+    private SolidColorBrush labelBrush;
+    private TextFormat textFormat;
 
-    CenteredContainer2D container;
-    #endregion
-
-    //Initialization-Methods
+    private CenteredContainer2D container;
 
     public PackingPlan2D() {
       InitializeComponent();
-      this.SetStyle(
-        ControlStyles.ResizeRedraw, true);
+      this.SetStyle(ControlStyles.ResizeRedraw, true);
     }
 
@@ -74 +69 @@
     }
 
-
-
-
-
-    //Packing-Methods
     public void InitializeContainer(float width, float height) {
       container = new CenteredContainer2D(new Vector2(Math.Max(this.Width - 12, 1), Math.Max(this.Height - 12, 1)), new Vector2(width, height));
@@ -86 +76 @@
       container.AddItem(new Vector2(width, height), new Vector2(x, y), label);
     }
-
-    //Event-Listeners
 
     private void PackingPlan2D_Load(object sender, EventArgs e) {
@@ -119 +107 @@
         wndRender.Resize(new Size2(this.Width, this.Height));
     }
-
   }
 }