Changeset 14154 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3

Timestamp:

07/21/16 15:08:21 (8 years ago)

Author:

gkronber

Message:

#1966: refactoring

Location:

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3

Files:

• Container2DView.xaml.cs (modified) (2 diffs)
• Container3DView.xaml (modified) (1 diff)
• Container3DView.xaml.cs (modified) (3 diffs)
• PackingPlan3DView.cs (modified) (1 diff)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container2DView.xaml.cs

@@ -71 +71 @@
       if (packing == null) return;
       // the container should fill the whole size
-      var scalingX = renderSize.Width / Packing.BinMeasures.Width;
-      var scalingY = renderSize.Height / Packing.BinMeasures.Width;
+      var scalingX = renderSize.Width / Packing.BinShape.Width;
+      var scalingY = renderSize.Height / Packing.BinShape.Width;
       // draw container
       drawingContext.DrawRectangle(Brushes.LightGray, new Pen(Brushes.Black, 1), new Rect(new Point(0, 0), renderSize));
@@ -79 +79 @@
       var unselectedBrush = selectedItemKey < 0 ? selectedBrush : Brushes.DarkGray;
 
-      foreach (var t in Packing.ItemMeasures) {
+      foreach (var t in Packing.Items) {
         var key = t.Key;
         var item = t.Value;
-        var pos = Packing.ItemPositions[key];
+        var pos = Packing.Positions[key];
 
         var scaledPos = new Point(pos.X * scalingX, pos.Y * scalingY);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml

@@ -128 +128 @@
                         </RotateTransform3D>
                         <TranslateTransform3D OffsetX="0.5" OffsetY="0.5" OffsetZ="0.5" />
-                        <ScaleTransform3D x:Name="scaleZoom" CenterX="0.5" CenterY="0.5" CenterZ="0.5" ScaleX="0.6" ScaleY="0.6" ScaleZ="0.6"/>
+                        <ScaleTransform3D x:Name="scaleZoom" CenterX="0.5" CenterY="0.5" CenterZ="0.5" ScaleX="1" ScaleY="1" ScaleZ="1"/>
                     </Transform3DGroup>
                 </ModelVisual3D.Transform>

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs

@@ -47 +47 @@
     public Container3DView() {
       InitializeComponent();
-      camMain.Position = new Point3D(0.5, 2, 2); // for design time we use a different camera position 
+      camMain.Position = new Point3D(0.5, 3, 3); // for design time we use a different camera position 
       Clear();
     }
@@ -80 +80 @@
       //  - from rotation and Z-ordering
 
-      foreach (var item in packing.ItemMeasures.OrderBy(i => packing.ItemPositions[i.Key].Z)) {
-        var position = packing.ItemPositions[item.Key];
+      foreach (var item in packing.Items.OrderBy(i => packing.Positions[i.Key].Z)) {
+        var position = packing.Positions[item.Key];
 
         var w = position.Rotated ? item.Value.Depth : item.Value.Width;
@@ -98 +98 @@
       }
 
-      var container = packing.BinMeasures;
+      var container = packing.BinShape;
       // draw a transparent container
       AddCube(meshTransparent, container.Origin.X, container.Origin.Y, container.Origin.Z, container.Width, container.Height, container.Depth, addInsideTriangles: true);

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.Views/3.3/PackingPlan3DView.cs

@@ -67 +67 @@
       int currentBin = (binSelection != null) ? (int)(binSelection.SelectedIndex) : 0;
       var packing = Content.BinPackings[currentBin];
-      foreach (var item in packing.ItemMeasures) {
+      foreach (var item in packing.Items) {
         itemSelection.Items.Add(item.Key);
       }