nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Took out the min bed size (regression)

Browse source
This commit is contained in:
Lars Brubaker 2016-02-29 14:04:52 -08:00
parent 5197d1f62c
commit 12eeacdef3
7 changed files with 12 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

17
BrailleBuilder/View3DBrailleBuilder.cs
View file

@ -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)

1
CustomWidgets/ThumbnailTracer.cs
View file

@ -94,7 +94,6 @@ namespace MatterHackers.RayTracer
public void SetRenderPosition(List<MeshGroup> loadedMeshGroups)
{
trackballTumbleWidget.TrackBallController.Reset();
trackballTumbleWidget.TrackBallController.MinScale = 0;
trackballTumbleWidget.TrackBallController.Scale = .03;
trackballTumbleWidget.TrackBallController.Rotate(Quaternion.FromEulerAngles(new Vector3(0, 0, MathHelper.Tau / 16)));

2
PartPreviewWindow/BaseClasses/PartPreview3DWidget.cs
View file

@ -96,8 +96,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
});
}
public abstract void SetDefaultView();
public override void OnDraw(Graphics2D graphics2D)
{
if (needToRecretaeBed)

16
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -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()

15
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -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) =>
{

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit ff68e9c814a845bbbf691d37695a928cd0c7e939
Subproject commit 929f796a7062ad4b1b75f6d05fcde46d296c991e

17
TextCreator/View3DTextCreator.cs
View file

@ -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()