Changeset 15167 for trunk/sources

Timestamp:

07/07/17 10:07:32 (7 years ago)

Author:

jkarder

Message:

#2739: improved 3d visualization

• in UpdateVisualization, no materials are available after Clear, therefore TryGetValue is unnecessary
• removed unnecessary ctrlDown field and OnKeyDown event handler

Location:

trunk/sources/HeuristicLab.Problems.BinPacking.Views/3.3

Files:

• Container3DView.xaml (modified) (1 diff)
• Container3DView.xaml.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml

@@ -30 +30 @@
              MouseWheel="Container3DView_OnMouseWheel" 
              MouseEnter="Container3DView_OnMouseEnter"
-             KeyDown="Container3DView_OnKeyDown"
              Focusable="true"
              >

trunk/sources/HeuristicLab.Problems.BinPacking.Views/3.3/Container3DView.xaml.cs

@@ -46 +46 @@
       Color.FromRgb(0x63, 0xC2, 0x16),
     };
-    
+
     private static readonly Color hiddenColor = Color.FromArgb(0x1A, 0xAA, 0xAA, 0xAA);
     private static readonly Color containerColor = Color.FromArgb(0x7F, 0xAA, 0xAA, 0xAA);
@@ -52 +52 @@
     private Point startPos;
     private bool mouseDown = false;
-    private bool ctrlDown = false;
     private double startAngleX;
     private double startAngleY;
@@ -106 +105 @@
         var selectedItem = packing.Items.Single(x => selectedItemKey == x.Key);
         var selectedPos = packing.Positions[selectedItem.Key];
-        DiffuseMaterial material;
-        if (!materials.TryGetValue(selectedItem.Value.Material, out material)) {
-          var colorIdx = selectedItem.Value.Material;
-          while (colorIdx < 0) colorIdx += colors.Length;
-          colorIdx = colorIdx % colors.Length;
-          var color = colors[colorIdx];
-          material = new DiffuseMaterial { Brush = new SolidColorBrush(color) };
-          materials[selectedItem.Value.Material] = material;
-        }
+
+        var colorIdx = selectedItem.Value.Material;
+        while (colorIdx < 0) colorIdx += colors.Length;
+        colorIdx = colorIdx % colors.Length;
+        var color = colors[colorIdx];
+        var material = new DiffuseMaterial { Brush = new SolidColorBrush(color) };
+        materials[selectedItem.Value.Material] = material;
+
         var selectedModel = new GeometryModel3D { Geometry = new MeshGeometry3D(), Material = material };
         AddSolidCube((MeshGeometry3D)selectedModel.Geometry, selectedPos.X, selectedPos.Y, selectedPos.Z,
@@ -185 +183 @@
       ((Model3DGroup)MyModel.Content).Children.Clear();
       materials.Clear();
-      
+
       mouseDown = false;
       startAngleX = 0;
@@ -194 +192 @@
       if (!mouseDown) return;
       var pos = e.GetPosition((IInputElement)this);
-      
+
       ((AxisAngleRotation3D)rotateX.Rotation).Angle = startAngleX + (pos.X - startPos.X) / 4;
       ((AxisAngleRotation3D)rotateY.Rotation).Angle = startAngleY + (pos.Y - startPos.Y) / 4;
@@ -225 +223 @@
       Focus(); // for mouse wheel events
     }
-
-    private void Container3DView_OnKeyDown(object sender, KeyEventArgs e) {
-      ctrlDown = e.Key.HasFlag(Key.LeftCtrl) || e.Key.HasFlag(Key.RightCtrl);
-    }
-
 
     #region helper for cubes