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

Remove PrintItemWrapper dependency in GCodeBasic, reduce static refs

Browse source
This commit is contained in:
John Lewin 2017-08-16 07:22:07 -07:00
parent d7010c8c56
commit c0a4074d4f
2 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

29
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -33,16 +33,13 @@ using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.GCodeVisualizer;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class ViewGcodeBasic : GuiWidget
{
private TextWidget gcodeProcessingStateInfoText;
private PrintItemWrapper printItem => ApplicationController.Instance.ActivePrintItem;
private GuiWidget gcodeDisplayWidget;
@ -50,8 +47,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private EventHandler unregisterEvents;
public delegate Vector2 GetSizeFunction();
private string gcodeLoading = "Loading G-Code".Localize();
private string slicingErrorMessage = "Slicing Error.\nPlease review your slice settings.".Localize();
private string fileNotFoundMessage = "File not found on disk.".Localize();
@ -105,17 +100,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
VAnchor = VAnchor.Stretch
};
if (printItem != null)
{
SetProcessingMessage("Loading G-Code...".Localize());
bool isGCode = Path.GetExtension(printItem.FileLocation).ToUpper() == ".GCODE";
string gcodeFilePath = isGCode ? printItem.FileLocation : printItem.GetGCodePathAndFileName();
if (!File.Exists(gcodeFilePath))
{
SetProcessingMessage(string.Format("{0}\n'{1}'", fileNotFoundMessage, printItem.Name));
}
if (!File.Exists(printer.Bed.GCodePath))
{
SetProcessingMessage($"{fileNotFoundMessage}\n'{printer.Bed.GCodePath}'");
}
mainContainerTopToBottom.AddChild(gcodeDisplayWidget);
@ -126,15 +113,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
SetProcessingMessage("");
if (loadedGCode == null)
{
// If we have finished loading the gcode and the source file exists but we don't have any loaded gcode it is because the loader decided to not load it.
if (File.Exists(printItem.FileLocation))
{
SetProcessingMessage(string.Format(fileTooBigToLoad, printItem.Name));
}
else
{
SetProcessingMessage(string.Format("{0}\n'{1}'", fileNotFoundMessage, Path.GetFileName(printItem.FileLocation)));
}
SetProcessingMessage($"{fileNotFoundMessage}\n'{printer.Bed.GCodePath}'");
}
if (loadedGCode?.LineCount > 0)