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

Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

Browse source
This commit is contained in:
larsbrubaker 2014-07-02 12:03:04 -07:00
commit 9a8ac29870
4 changed files with 87 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

66
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -63,6 +63,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
FlowLayoutWidget modelOptionsContainer;
FlowLayoutWidget displayOptionsContainer;
ViewControlsToggle viewControlsToggle;
CheckBox expandModelOptions;
CheckBox expandDisplayOptions;
@ -209,9 +210,15 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
AddChild(viewControls2D);
viewControls3D = new ViewControls3D(meshViewerWidget);
AddChild(viewControls3D);
viewControls3D.Visible = false;
viewControls3D.rotateButton.ClickButton(null);
viewControls3D.Visible = false;
viewControlsToggle = new ViewControlsToggle ();
AddChild (viewControlsToggle);
//viewControls3D.translateButton.ClickButton(null);
viewControls3D.rotateButton.ClickButton(null);
// move things into the right place and scale
{
Vector3 bedCenter3D = new Vector3(bedCenter, 0);
@ -470,38 +477,27 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// put in a show 3D view checkbox
{
CheckBox show3D = new CheckBox(LocalizedString.Get("Show 3D"), textColor: ActiveTheme.Instance.PrimaryTextColor);
show3D.CheckedStateChanged += (sender, e) =>
viewControlsToggle.twoDimensionButton.CheckedStateChanged += (sender, e) =>
{
// show the tumbel widget and not the line widget
if (show3D.Checked)
{
viewControls2D.Visible = false;
gcodeViewWidget.Visible = false;
viewControls3D.Visible = true;
meshViewerWidget.Visible = true;
}
else
{
viewControls2D.Visible = true;
gcodeViewWidget.Visible = true;
viewControls3D.Visible = false;
meshViewerWidget.Visible = false;
}
SetLayerViewType();
};
layerInfoContainer.AddChild(show3D);
viewControlsToggle.threeDimensionButton.CheckedStateChanged += (sender, e) =>
{
SetLayerViewType();
};
SetLayerViewType ();
}
// Put in the sync to print checkbox
if (!widgetHasCloseButton)
{
syncToPrint = new CheckBox("Sync To Print".Localize(), textColor: ActiveTheme.Instance.PrimaryTextColor);
syncToPrint.Checked = false;
syncToPrint.Checked = (UserSettings.Instance.get("LayerViewSyncToPrint") == "True");
syncToPrint.CheckedStateChanged += (sender, e) =>
{
if (syncToPrint.Checked)
UserSettings.Instance.set("LayerViewSyncToPrint", syncToPrint.Checked.ToString());
if (syncToPrint.Checked)
{
SetAnimationPosition();
navigationWidget.Visible = false;
@ -553,6 +549,28 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
textImageButtonFactory.FixedWidth = oldWidth;
}
void SetLayerViewType()
{
if (viewControlsToggle.threeDimensionButton.Checked)
{
UserSettings.Instance.set ("LayerViewDefault", "3D Layer");
viewControls2D.Visible = false;
gcodeViewWidget.Visible = false;
viewControls3D.Visible = true;
meshViewerWidget.Visible = true;
}
else
{
UserSettings.Instance.set ("LayerViewDefault", "2D Layer");
viewControls2D.Visible = true;
gcodeViewWidget.Visible = true;
viewControls3D.Visible = false;
meshViewerWidget.Visible = false;
}
}
void HookUpGCodeMessagesWhenDonePrinting(object sender, EventArgs e)
{
if(!PrinterConnectionAndCommunication.Instance.PrinterIsPaused && !PrinterConnectionAndCommunication.Instance.PrinterIsPrinting)