From 749bcd06c4e4f2e277faff7d993df94f806acd6c Mon Sep 17 00:00:00 2001
From: larsbrubaker <larsbrubaker@gmail.com>
Date: Tue, 9 Sep 2014 15:17:49 -0700
Subject: [PATCH] Made the oem image always get added to the bed.

---
 .../BaseClasses/PartPreview3DWidget.cs        | 31 +++++++++++++------
 PartPreviewWindow/View3DTransfromPart.cs      | 17 +---------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs
index cab449a03..4c3ab9595 100644
--- a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs
+++ b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs
@@ -28,27 +28,21 @@ either expressed or implied, of the FreeBSD Project.
 */
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.IO;
-
 using MatterHackers.Agg;
 using MatterHackers.Agg.Image;
+using MatterHackers.Agg.PlatformAbstract;
 using MatterHackers.Agg.UI;
-using MatterHackers.Agg.OpenGlGui;
-using MatterHackers.PolygonMesh;
-using MatterHackers.RenderOpenGl;
-using MatterHackers.VectorMath;
 using MatterHackers.MatterControl.DataStorage;
-using MatterHackers.MatterControl.PrintQueue;
-using MatterHackers.MeshVisualizer;
 using MatterHackers.MatterControl.SlicerConfiguration;
+using MatterHackers.MeshVisualizer;
+using MatterHackers.VectorMath;
 
 namespace MatterHackers.MatterControl.PartPreviewWindow
 {
     public class PartPreview3DWidget : PartPreviewWidget
     {
+        protected bool autoRotateEnabled = false;
         public MeshViewerWidget meshViewerWidget;
         event EventHandler unregisterEvents;
 
@@ -70,8 +64,25 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
                     new Vector3(ActiveSliceSettings.Instance.BedSize, buildHeight),
                     ActiveSliceSettings.Instance.BedCenter,
                     ActiveSliceSettings.Instance.BedShape);
+                PutOemImageOnBed();
             });
         }
+
+        protected void PutOemImageOnBed()
+        {
+            // this is to add an image to the bed
+            string imagePathAndFile = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "OEMSettings", "bedimage.png");
+            if (autoRotateEnabled && File.Exists(imagePathAndFile))
+            {
+                ImageBuffer wattermarkImage = new ImageBuffer();
+                ImageIO.LoadImageData(imagePathAndFile, wattermarkImage);
+
+                ImageBuffer bedImage = meshViewerWidget.BedImage;
+                Graphics2D bedGraphics = bedImage.NewGraphics2D();
+                bedGraphics.Render(wattermarkImage,
+                    new Vector2((bedImage.Width - wattermarkImage.Width) / 2, (bedImage.Height - wattermarkImage.Height) / 2));
+            }
+        }
         
         public override void OnClosed(EventArgs e)
         {
diff --git a/PartPreviewWindow/View3DTransfromPart.cs b/PartPreviewWindow/View3DTransfromPart.cs
index fac6e62a6..d231f39f0 100644
--- a/PartPreviewWindow/View3DTransfromPart.cs
+++ b/PartPreviewWindow/View3DTransfromPart.cs
@@ -35,11 +35,8 @@ using System.Globalization;
 using System.IO;
 using System.Threading;
 using MatterHackers.Agg;
-using MatterHackers.Agg.Image;
-using MatterHackers.Agg.PlatformAbstract;
 using MatterHackers.Agg.UI;
 using MatterHackers.Localizations; //Added Namespace
-using MatterHackers.MatterControl.DataStorage;
 using MatterHackers.MatterControl.PrinterCommunication;
 using MatterHackers.MatterControl.PrintQueue;
 using MatterHackers.MeshVisualizer;
@@ -96,7 +93,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
         List<PlatingMeshData> asynchPlatingDataList = new List<PlatingMeshData>();
 
         List<PlatingMeshData> MeshExtraData;
-        bool autoRotateEnabled = true;
 
         public ScaleRotateTranslate SelectedMeshTransform
         {
@@ -278,19 +274,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
             viewArea.AnchorAll();
             {
                 meshViewerWidget = new MeshViewerWidget(viewerVolume, bedCenter, bedShape, "Press 'Add' to select an item.".Localize());
-                
-                // this is to add an image to the bed
-                string imagePathAndFile = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "OEMSettings", "bedimage.png");
-                if (autoRotateEnabled && File.Exists(imagePathAndFile))
-                {
-                    ImageBuffer wattermarkImage = new ImageBuffer();
-                    ImageIO.LoadImageData(imagePathAndFile, wattermarkImage);
 
-                    ImageBuffer bedImage = meshViewerWidget.BedImage;
-                    Graphics2D bedGraphics = bedImage.NewGraphics2D();
-                    bedGraphics.Render(wattermarkImage, 
-                        new Vector2((bedImage.Width - wattermarkImage.Width) / 2, (bedImage.Height - wattermarkImage.Height)/2));
-                }
+                PutOemImageOnBed();
 
                 meshViewerWidget.AnchorAll();
             }