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

Changed PrintItemWrapper to have RootedObjectEventHandlers

Browse source 
Fixed lots of code to use them correctly
CompactSlidePanel does not need to reload back panel anymore as that happens in wide screen panel
This commit is contained in:
larsbrubaker 2014-04-21 15:00:32 -07:00
parent 416bc54d2c
commit a1990f10bd
13 changed files with 104 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

18
PartPreviewWindow/GcodeViewBasic.cs
View file

@ -63,6 +63,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
GetSizeFunction bedSizeFunction;
GetSizeFunction bedCenterFunction;
EventHandler unregisterEvents;
bool widgetHasCloseButton;
public delegate Vector2 GetSizeFunction();
@ -152,8 +153,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
// we only hook these up to make sure we can regenerate the gcode when we want
printItem.SlicingOutputMessage += sliceItem_SlicingOutputMessage;
printItem.SlicingDone += new EventHandler(sliceItem_Done);
printItem.SlicingOutputMessage.RegisterEvent(sliceItem_SlicingOutputMessage, ref unregisterEvents);
printItem.SlicingDone.RegisterEvent(sliceItem_Done, ref unregisterEvents);
}
else
{
@ -610,10 +611,15 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
parent.KeyDown -= Parent_KeyDown;
if (unregisterEvents != null)
{
unregisterEvents(this, null);
}
if (printItem != null)
{
printItem.SlicingOutputMessage -= sliceItem_SlicingOutputMessage;
printItem.SlicingDone -= new EventHandler(sliceItem_Done);
printItem.SlicingOutputMessage.UnregisterEvent(sliceItem_SlicingOutputMessage, ref unregisterEvents);
printItem.SlicingDone.UnregisterEvent(sliceItem_Done, ref unregisterEvents);
if (startedSliceFromGenerateButton && printItem.CurrentlySlicing)
{
SlicingQueue.Instance.CancelCurrentSlicing();
@ -655,8 +661,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
// We can add this while we have it open (when we are done loading).
// So we need to make sure we only have it added once. This will be ok to run when
// not added or when added and will ensure we only have one hook.
printItem.SlicingOutputMessage -= sliceItem_SlicingOutputMessage;
printItem.SlicingDone -= sliceItem_Done;
printItem.SlicingOutputMessage.UnregisterEvent(sliceItem_SlicingOutputMessage, ref unregisterEvents);
printItem.SlicingDone.UnregisterEvent(sliceItem_Done, ref unregisterEvents);
UiThread.RunOnIdle(CreateAndAddChildren);
startedSliceFromGenerateButton = false;