From 12eeacdef387904360f28b6e0ae911ec9a932be6 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 29 Feb 2016 14:04:52 -0800 Subject: [PATCH] Took out the min bed size (regression) --- BrailleBuilder/View3DBrailleBuilder.cs | 17 +++-------------- CustomWidgets/ThumbnailTracer.cs | 1 - .../BaseClasses/PartPreview3DWidget.cs | 2 -- PartPreviewWindow/View3D/View3DWidget.cs | 16 +++------------- PartPreviewWindow/ViewGcodeBasic.cs | 15 ++------------- Submodules/agg-sharp | 2 +- TextCreator/View3DTextCreator.cs | 17 +++-------------- 7 files changed, 12 insertions(+), 58 deletions(-) diff --git a/BrailleBuilder/View3DBrailleBuilder.cs b/BrailleBuilder/View3DBrailleBuilder.cs index 2d1295ec5..64c755aaf 100644 --- a/BrailleBuilder/View3DBrailleBuilder.cs +++ b/BrailleBuilder/View3DBrailleBuilder.cs @@ -207,7 +207,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder viewControls3D.ResetView += (sender, e) => { - SetDefaultView(); + meshViewerWidget.ResetView(); }; buttonRightPanelDisabledCover = new Cover(HAnchor.ParentLeftRight, VAnchor.ParentBottomTop); @@ -232,7 +232,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder AddChild(viewControls3D); // set the view to be a good angle and distance - SetDefaultView(); + meshViewerWidget.ResetView(); AddHandlers(); UnlockEditControls(); @@ -241,18 +241,7 @@ namespace MatterHackers.MatterControl.Plugins.BrailleBuilder //meshViewerWidget.RenderType = RenderTypes.Outlines; viewControls3D.PartSelectVisible = false; - SetDefaultView(); - } - - public override void SetDefaultView() - { - meshViewerWidget.TrackballTumbleWidget.ZeroVelocity(); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); - - // move things into the right place and scale - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-new Vector3(ActiveSliceSettings.Instance.BedCenter)); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = 3; - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .02, 0, 0))); + meshViewerWidget.ResetView(); } private async void InsertTextNow(string text) diff --git a/CustomWidgets/ThumbnailTracer.cs b/CustomWidgets/ThumbnailTracer.cs index 23afd39e6..9ab39084e 100644 --- a/CustomWidgets/ThumbnailTracer.cs +++ b/CustomWidgets/ThumbnailTracer.cs @@ -94,7 +94,6 @@ namespace MatterHackers.RayTracer public void SetRenderPosition(List loadedMeshGroups) { trackballTumbleWidget.TrackBallController.Reset(); - trackballTumbleWidget.TrackBallController.MinScale = 0; trackballTumbleWidget.TrackBallController.Scale = .03; trackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(0, 0, MathHelper.Tau / 16))); diff --git a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs index 144120ff6..36419c8de 100644 --- a/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs +++ b/PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs @@ -96,8 +96,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow }); } - public abstract void SetDefaultView(); - public override void OnDraw(Graphics2D graphics2D) { if (needToRecretaeBed) diff --git a/PartPreviewWindow/View3D/View3DWidget.cs b/PartPreviewWindow/View3D/View3DWidget.cs index a4664768d..1294d3156 100644 --- a/PartPreviewWindow/View3D/View3DWidget.cs +++ b/PartPreviewWindow/View3D/View3DWidget.cs @@ -358,7 +358,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow viewControls3D.ResetView += (sender, e) => { - SetDefaultView(); + meshViewerWidget.ResetView(); }; buttonRightPanelDisabledCover = new Cover(HAnchor.ParentLeftRight, VAnchor.ParentBottomTop); @@ -434,7 +434,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow partHasBeenEdited = true; }; - SetDefaultView(); + meshViewerWidget.ResetView(); #if DoBooleanTest DrawBefore += CreateBooleanTestGeometry; @@ -601,16 +601,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } #endif - public override void SetDefaultView() - { - meshViewerWidget.TrackballTumbleWidget.ZeroVelocity(); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-new Vector3(ActiveSliceSettings.Instance.BedCenter)); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = 3; - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(0, 0, MathHelper.Tau / 16))); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .19, 0, 0))); - } - public enum AutoRotate { Enabled, Disabled }; public enum OpenMode { Viewing, Editing } @@ -2015,7 +2005,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow UiThread.RunOnIdle(EnterEditAndCreateSelectionData); } - SetDefaultView(); + meshViewerWidget.ResetView(); } private bool PartsAreInPrintVolume() diff --git a/PartPreviewWindow/ViewGcodeBasic.cs b/PartPreviewWindow/ViewGcodeBasic.cs index c97c595e6..9f90e08a0 100644 --- a/PartPreviewWindow/ViewGcodeBasic.cs +++ b/PartPreviewWindow/ViewGcodeBasic.cs @@ -119,17 +119,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow ActivePrinterProfile.Instance.ActivePrinterChanged.RegisterEvent(RecreateBedAndPartPosition, ref unregisterEvents); } - public override void SetDefaultView() - { - meshViewerWidget.TrackballTumbleWidget.ZeroVelocity(); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); - - // move things into the right place and scale - Vector3 bedCenter3D = new Vector3(bedCenter, 0); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-bedCenter3D); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = 3; - } - private void Clear3DGCode(object sender, EventArgs e) { if (gcodeViewWidget != null @@ -284,7 +273,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow viewControls3D.ResetView += (sender, e) => { - SetDefaultView(); + meshViewerWidget.ResetView(); }; viewControls3D.ActiveButton = ViewControls3DButtons.Rotate; @@ -297,7 +286,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow //viewControls3D.translateButton.ClickButton(null); - SetDefaultView(); + meshViewerWidget.ResetView(); viewControls2D.translateButton.Click += (sender, e) => { diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index ff68e9c81..929f796a7 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit ff68e9c814a845bbbf691d37695a928cd0c7e939 +Subproject commit 929f796a7062ad4b1b75f6d05fcde46d296c991e diff --git a/TextCreator/View3DTextCreator.cs b/TextCreator/View3DTextCreator.cs index f014dcc39..a85cb9e8a 100644 --- a/TextCreator/View3DTextCreator.cs +++ b/TextCreator/View3DTextCreator.cs @@ -221,7 +221,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator viewControls3D.ResetView += (sender, e) => { - SetDefaultView(); + meshViewerWidget.ResetView(); }; buttonRightPanelDisabledCover = new Cover(HAnchor.ParentLeftRight, VAnchor.ParentBottomTop); @@ -245,7 +245,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator AddChild(viewControls3D); - SetDefaultView(); + meshViewerWidget.ResetView(); AddHandlers(); UnlockEditControls(); @@ -274,18 +274,7 @@ namespace MatterHackers.MatterControl.Plugins.TextCreator SelectedMeshGroupIndex = 0; } - SetDefaultView(); - } - - public override void SetDefaultView() - { - meshViewerWidget.TrackballTumbleWidget.ZeroVelocity(); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Reset(); - - // move things into the right place and scale - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Translate(-new Vector3(ActiveSliceSettings.Instance.BedCenter)); - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Scale = 3; - meshViewerWidget.TrackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(-MathHelper.Tau * .02, 0, 0))); + meshViewerWidget.ResetView(); } private void ResetWordLayoutSettings()