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

Revise naming for clarity

Browse source 
- GCode3DWidget is no longer what the name suggests
This commit is contained in:
John Lewin 2018-03-14 15:49:00 -07:00
parent c5977bf3f4
commit 8b5d05ed93
3 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PartPreviewWindow/GCode3DWidget.cs
View file

@ -36,7 +36,7 @@ using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.PartPreviewWindow namespace MatterHackers.MatterControl.PartPreviewWindow
{ {
public class GCode3DWidget : FlowLayoutWidget public class GCodePanel : FlowLayoutWidget
{ {
private EventHandler unregisterEvents; private EventHandler unregisterEvents;
@ -45,7 +45,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private PrinterConfig printer; private PrinterConfig printer;
private SectionWidget speedsWidget; private SectionWidget speedsWidget;
public GCode3DWidget(PrinterConfig printer, BedConfig sceneContext, ThemeConfig theme) public GCodePanel(PrinterConfig printer, BedConfig sceneContext, ThemeConfig theme)
: base (FlowDirection.TopToBottom) : base (FlowDirection.TopToBottom)
{ {
this.sceneContext = sceneContext; this.sceneContext = sceneContext;

15
PartPreviewWindow/PrinterTabPage.cs
View file

@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private SystemWindow parentSystemWindow; private SystemWindow parentSystemWindow;
private SliceLayerSelector layerScrollbar; private SliceLayerSelector layerScrollbar;
internal PrinterConfig printer; internal PrinterConfig printer;
internal GCode3DWidget gcode3DWidget; internal GCodePanel gcodePanel;
internal ResizeContainer gcodeContainer; internal ResizeContainer gcodeContainer;
internal PrinterActionsBar printerActionsBar; internal PrinterActionsBar printerActionsBar;
private DockingTabControl sideBar; private DockingTabControl sideBar;
@ -157,8 +157,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var position = view3DWidget.InteractionLayer.Children.IndexOf(trackball); var position = view3DWidget.InteractionLayer.Children.IndexOf(trackball);
// The slice layers view gcodePanel = new GCodePanel(printer, sceneContext, theme)
gcode3DWidget = new GCode3DWidget(printer, sceneContext, theme)
{ {
Name = "GCode3DWidget", Name = "GCode3DWidget",
HAnchor = HAnchor.Stretch, HAnchor = HAnchor.Stretch,
@ -166,7 +165,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
BackgroundColor = theme.InteractionLayerOverlayColor, BackgroundColor = theme.InteractionLayerOverlayColor,
}; };
gcodeContainer = new ResizeContainer(gcode3DWidget) gcodeContainer = new ResizeContainer(gcodePanel)
{ {
Width = printer?.ViewState.GCodePanelWidth ?? 200, Width = printer?.ViewState.GCodePanelWidth ?? 200,
VAnchor = VAnchor.Stretch, VAnchor = VAnchor.Stretch,
@ -175,7 +174,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
SplitterWidth = theme.SplitterWidth, SplitterWidth = theme.SplitterWidth,
Visible = false, Visible = false,
}; };
gcodeContainer.AddChild(gcode3DWidget); gcodeContainer.AddChild(gcodePanel);
var splitContainer = view3DWidget.FindNamedChildRecursive("SplitContainer"); var splitContainer = view3DWidget.FindNamedChildRecursive("SplitContainer");
@ -218,7 +217,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void SetViewMode(PartViewMode viewMode) private void SetViewMode(PartViewMode viewMode)
{ {
if (gcode3DWidget == null || gcode2DWidget == null) if (gcodePanel == null || gcode2DWidget == null)
{ {
// Wait for controls to initialize // Wait for controls to initialize
return; return;
@ -354,7 +353,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
bool printerIsRunningPrint = printer.Connection.PrinterIsPaused || printer.Connection.PrinterIsPrinting; bool printerIsRunningPrint = printer.Connection.PrinterIsPaused || printer.Connection.PrinterIsPrinting;
if (gcodeOptions.SyncToPrint if (gcodeOptions.SyncToPrint
&& printerIsRunningPrint && printerIsRunningPrint
&& (gcode3DWidget.Visible || gcode2DWidget.Visible)) && (gcodePanel.Visible || gcode2DWidget.Visible))
{ {
if (this.SetAnimationPosition()) if (this.SetAnimationPosition())
{ {
@ -408,7 +407,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void Parent_KeyDown(object sender, KeyEventArgs keyEvent) private void Parent_KeyDown(object sender, KeyEventArgs keyEvent)
{ {
if (!keyEvent.Handled if (!keyEvent.Handled
&& (gcode3DWidget.Visible && (gcodePanel.Visible
|| gcode2DWidget.Visible)) || gcode2DWidget.Visible))
{ {
switch (keyEvent.KeyCode) switch (keyEvent.KeyCode)

4
PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -235,10 +235,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{ {
if (printerTabPage != null) if (printerTabPage != null)
{ {
if (printerTabPage.gcode3DWidget != null) if (printerTabPage.gcodePanel != null)
{ {
// HACK: directly fire method which previously ran on SlicingDone event on PrintItemWrapper // HACK: directly fire method which previously ran on SlicingDone event on PrintItemWrapper
UiThread.RunOnIdle(() => printerTabPage.gcode3DWidget.CreateAndAddChildren(printer)); UiThread.RunOnIdle(() => printerTabPage.gcodePanel.CreateAndAddChildren(printer));
} }
} }
} }