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 
Conflicts:
	SlicerConfiguration/SlicingQueue.cs
This commit is contained in:
Kevin Pope 2014-08-20 12:17:50 -07:00
commit 2b3481ff75
3 changed files with 50 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ApplicationView/CompactSlidePanel.cs
View file

@ -116,6 +116,7 @@ namespace MatterHackers.MatterControl
{ {
this.RightPanel.AddChild(new PrintProgressBar()); this.RightPanel.AddChild(new PrintProgressBar());
ThirdPanelTabView thirdPanelTabView = new ThirdPanelTabView(AdvancedControlsButton_Click, onMouseEnterBoundsPrintQueueLink, onMouseLeaveBoundsPrintQueueLink); ThirdPanelTabView thirdPanelTabView = new ThirdPanelTabView(AdvancedControlsButton_Click, onMouseEnterBoundsPrintQueueLink, onMouseLeaveBoundsPrintQueueLink);
thirdPanelTabView.Name = "For - CompactSlidePanel";
this.RightPanel.AddChild(thirdPanelTabView); this.RightPanel.AddChild(thirdPanelTabView);
} }

7
ApplicationView/WidescreenPanel.cs
View file

@ -212,10 +212,13 @@ namespace MatterHackers.MatterControl
ColumnTwo.AnchorAll(); ColumnTwo.AnchorAll();
} }
static int ColumnThreeCount = 0;
void LoadColumnThree(object state = null) void LoadColumnThree(object state = null)
{ {
ColumnThree.RemoveAllChildren(); ColumnThree.CloseAndRemoveAllChildren();
ColumnThree.AddChild(new ThirdPanelTabView()); ThirdPanelTabView thirdPanelTabView = new ThirdPanelTabView();
thirdPanelTabView.Name = "For - WideScreenPanel {0}".FormatWith(ColumnThreeCount++);
ColumnThree.AddChild(thirdPanelTabView);
ColumnThree.Width = 590; //Ordering here matters - must go after children are added ColumnThree.Width = 590; //Ordering here matters - must go after children are added
} }

76
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
SetLayerWidget setLayerWidget; SetLayerWidget setLayerWidget;
LayerNavigationWidget navigationWidget; LayerNavigationWidget navigationWidget;
TextWidget layerStartRenderRationTitle; TextWidget layerStartRenderRatioTitle;
public Slider layerStartRenderRatioSlider; public Slider layerStartRenderRatioSlider;
TextWidget layerEndRenderRationTitle; TextWidget layerEndRenderRationTitle;
public Slider layerEndRenderRatioSlider; public Slider layerEndRenderRatioSlider;
@ -268,7 +268,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void SetAnimationPosition() private void SetAnimationPosition()
{ {
int currentLayer = PrinterConnectionAndCommunication.Instance.CurrentlyPrintingLayer; int currentLayer = PrinterConnectionAndCommunication.Instance.CurrentlyPrintingLayer;
if (currentLayer >= 1) if (currentLayer >= 0)
{ {
selectLayerSlider.Value = currentLayer-1; selectLayerSlider.Value = currentLayer-1;
layerEndRenderRatioSlider.Value = PrinterConnectionAndCommunication.Instance.RatioIntoCurrentLayer; layerEndRenderRatioSlider.Value = PrinterConnectionAndCommunication.Instance.RatioIntoCurrentLayer;
@ -528,34 +528,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
syncToPrint.Checked = (UserSettings.Instance.get("LayerViewSyncToPrint") == "True"); syncToPrint.Checked = (UserSettings.Instance.get("LayerViewSyncToPrint") == "True");
syncToPrint.CheckedStateChanged += (sender, e) => syncToPrint.CheckedStateChanged += (sender, e) =>
{ {
UserSettings.Instance.set("LayerViewSyncToPrint", syncToPrint.Checked.ToString()); UserSettings.Instance.set("LayerViewSyncToPrint", syncToPrint.Checked.ToString());
SetSyncToPrintVisibility();
if (syncToPrint.Checked)
{
SetAnimationPosition();
navigationWidget.Visible = false;
setLayerWidget.Visible = false;
layerStartRenderRationTitle.Visible = false;
layerStartRenderRatioSlider.Visible = false;
layerEndRenderRationTitle.Visible = false;
layerEndRenderRatioSlider.Visible = false;
selectLayerSlider.Visible = false;
}
else
{
if (layerEndRenderRatioSlider != null)
{
layerEndRenderRatioSlider.Value = 1;
layerStartRenderRatioSlider.Value = 0;
}
navigationWidget.Visible = true;
setLayerWidget.Visible = true;
layerStartRenderRationTitle.Visible = true;
layerStartRenderRatioSlider.Visible = true;
layerEndRenderRationTitle.Visible = true;
layerEndRenderRatioSlider.Visible = true;
selectLayerSlider.Visible = true;
}
}; };
layerInfoContainer.AddChild(syncToPrint); layerInfoContainer.AddChild(syncToPrint);
@ -572,6 +546,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// However if the print finished or is canceled we are going to want to get updates again. So, hook the status event // However if the print finished or is canceled we are going to want to get updates again. So, hook the status event
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(HookUpGCodeMessagesWhenDonePrinting, ref unregisterEvents); PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(HookUpGCodeMessagesWhenDonePrinting, ref unregisterEvents);
UiThread.RunOnIdle((state) =>
{
SetSyncToPrintVisibility();
});
} }
} }
@ -582,6 +560,39 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
textImageButtonFactory.FixedWidth = oldWidth; textImageButtonFactory.FixedWidth = oldWidth;
} }
private void SetSyncToPrintVisibility()
{
if (!widgetHasCloseButton)
{
if (syncToPrint.Checked)
{
SetAnimationPosition();
//navigationWidget.Visible = false;
//setLayerWidget.Visible = false;
layerStartRenderRatioTitle.Visible = false;
layerStartRenderRatioSlider.Visible = false;
layerEndRenderRationTitle.Visible = false;
layerEndRenderRatioSlider.Visible = false;
selectLayerSlider.Visible = false;
}
else
{
if (layerEndRenderRatioSlider != null)
{
layerEndRenderRatioSlider.Value = 1;
layerStartRenderRatioSlider.Value = 0;
}
navigationWidget.Visible = true;
setLayerWidget.Visible = true;
layerStartRenderRatioTitle.Visible = true;
layerStartRenderRatioSlider.Visible = true;
layerEndRenderRationTitle.Visible = true;
layerEndRenderRatioSlider.Visible = true;
selectLayerSlider.Visible = true;
}
}
}
void SetLayerViewType() void SetLayerViewType()
{ {
if (viewControlsToggle.threeDimensionButton.Checked) if (viewControlsToggle.threeDimensionButton.Checked)
@ -615,6 +626,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// register for done slicing and slicing messages // register for done slicing and slicing messages
printItem.SlicingOutputMessage.RegisterEvent(sliceItem_SlicingOutputMessage, ref unregisterEvents); printItem.SlicingOutputMessage.RegisterEvent(sliceItem_SlicingOutputMessage, ref unregisterEvents);
printItem.SlicingDone.RegisterEvent(sliceItem_Done, ref unregisterEvents); printItem.SlicingDone.RegisterEvent(sliceItem_Done, ref unregisterEvents);
SetSyncToPrintVisibility();
} }
} }
@ -729,8 +741,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
gcodeViewWidget.ActiveLayerChanged += new EventHandler(gcodeViewWidget_ActiveLayerChanged); gcodeViewWidget.ActiveLayerChanged += new EventHandler(gcodeViewWidget_ActiveLayerChanged);
AddChild(selectLayerSlider); AddChild(selectLayerSlider);
layerStartRenderRationTitle = new TextWidget(LocalizedString.Get("start:"), 50, 77, 10, Agg.Font.Justification.Right); layerStartRenderRatioTitle = new TextWidget(LocalizedString.Get("start:"), 50, 77, 10, Agg.Font.Justification.Right);
AddChild(layerStartRenderRationTitle); AddChild(layerStartRenderRatioTitle);
layerStartRenderRatioSlider = new Slider(new Vector2(), 10); layerStartRenderRatioSlider = new Slider(new Vector2(), 10);
layerStartRenderRatioSlider.ValueChanged += new EventHandler(layerStartRenderRatioSlider_ValueChanged); layerStartRenderRatioSlider.ValueChanged += new EventHandler(layerStartRenderRatioSlider_ValueChanged);
AddChild(layerStartRenderRatioSlider); AddChild(layerStartRenderRatioSlider);