PrintitemWrapper now handles empty path.

This commit is contained in:
Kevin Pope 2014-03-01 16:33:41 -08:00
parent 7f1a7c0e8e
commit d3c8c3ad45

View file

@ -189,16 +189,24 @@ namespace MatterHackers.MatterControl.PrintQueue
public string GetGCodePathAndFileName()
{
if (Path.GetExtension(FileLocation).ToUpper() == ".GCODE")
if (FileLocation.Trim() != "")
{
return FileLocation;
if (Path.GetExtension(FileLocation).ToUpper() == ".GCODE")
{
return FileLocation;
}
string engineString = ((int)ActivePrinterProfile.Instance.ActiveSliceEngineType).ToString();
string gcodeFileName = this.StlFileHashCode.ToString() + "_" + engineString + "_" + ActiveSliceSettings.Instance.GetHashCode().ToString();
string gcodePathAndFileName = Path.Combine(DataStorage.ApplicationDataStorage.Instance.GCodeOutputPath, gcodeFileName + ".gcode");
return gcodePathAndFileName;
}
else
{
return null;
}
string engineString = ((int)ActivePrinterProfile.Instance.ActiveSliceEngineType).ToString();
string gcodeFileName = this.StlFileHashCode.ToString() + "_" + engineString + "_" + ActiveSliceSettings.Instance.GetHashCode().ToString();
string gcodePathAndFileName = Path.Combine(DataStorage.ApplicationDataStorage.Instance.GCodeOutputPath, gcodeFileName + ".gcode");
return gcodePathAndFileName;
}