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

Merge branch 'development' of https://github.com/gregory-diaz/MatterControl into development

Browse source
This commit is contained in:
Kevin Pope 2014-08-27 12:22:10 -07:00
commit e98cd09b28
7 changed files with 92 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

112
CustomWidgets/ExportPrintItemWindow.cs
View file

@ -14,6 +14,7 @@ using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.DataStorage;
namespace MatterHackers.MatterControl
{
@ -22,14 +23,16 @@ namespace MatterHackers.MatterControl
CheckBox showInFolderAfterSave;
CheckBox applyLeveling;
private PrintItemWrapper printItemWrapper;
string pathAndFilenameToSave;
string gcodePathAndFilenameToSave;
string x3gPathAndFilenameToSave;
bool partIsGCode = false;
string documentsPath;
public ExportPrintItemWindow(PrintItemWrapper printItemWraper)
: base(400, 250)
{
this.printItemWrapper = printItemWraper;
documentsPath = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal);
if (Path.GetExtension(printItemWraper.FileLocation).ToUpper() == ".GCODE")
{
partIsGCode = true;
@ -123,19 +126,19 @@ namespace MatterHackers.MatterControl
middleRowContainer.AddChild(exportToSdCard);
}
//if (ActiveSliceSettings.Instance.IsMakerbotGCodeFlavor() && !PrinterConnectionAndCommunication.Instance.PrinterIsPrinting)
//{
// string exportAsX3GText = "Export as X3G".Localize();
// Button exportAsX3G = textImageButtonFactory.Generate(exportAsX3GText);
// exportAsX3G.HAnchor = HAnchor.ParentLeft;
// exportAsX3G.Cursor = Cursors.Hand;
// exportAsX3G.Click += new ButtonBase.ButtonEventHandler((object sender, MouseEventArgs e) =>
// {
// UiThread.RunOnIdle(ExportX3G_Click);
// });
// middleRowContainer.AddChild(exportAsX3G);
//}
bool showExportX3GButton = ActiveSliceSettings.Instance.IsMakerbotGCodeFlavor();
if (showExportX3GButton)
{
string exportAsX3GText = "Export as X3G".Localize();
Button exportAsX3G = textImageButtonFactory.Generate(exportAsX3GText);
exportAsX3G.HAnchor = HAnchor.ParentLeft;
exportAsX3G.Cursor = Cursors.Hand;
exportAsX3G.Click += new ButtonBase.ButtonEventHandler((object sender, MouseEventArgs e) =>
{
UiThread.RunOnIdle(ExportX3G_Click);
});
middleRowContainer.AddChild(exportAsX3G);
}
}
middleRowContainer.AddChild(new VerticalSpacer());
@ -296,7 +299,7 @@ namespace MatterHackers.MatterControl
void ExportGCode_Click(object state)
{
SaveFileDialogParams saveParams = new SaveFileDialogParams("Export GCode|*.gcode", title: "Export GCode");
SaveFileDialogParams saveParams = new SaveFileDialogParams("Export GCode|*.gcode", initialDirectory: documentsPath, title: "Export GCode");
saveParams.Title = "MatterControl: Export File";
saveParams.ActionButtonLabel = "Export";
@ -305,12 +308,12 @@ namespace MatterHackers.MatterControl
{
streamToSaveTo.Close ();
pathAndFilenameToSave = saveParams.FileName;
string extension = Path.GetExtension(pathAndFilenameToSave);
gcodePathAndFilenameToSave = saveParams.FileName;
string extension = Path.GetExtension(gcodePathAndFilenameToSave);
if(extension == "")
{
File.Delete(pathAndFilenameToSave);
pathAndFilenameToSave += ".gcode";
File.Delete(gcodePathAndFilenameToSave);
gcodePathAndFilenameToSave += ".gcode";
}
if (Path.GetExtension(printItemWrapper.FileLocation).ToUpper() == ".STL")
@ -322,7 +325,7 @@ namespace MatterHackers.MatterControl
else if (partIsGCode)
{
Close();
SaveGCodeToNewLocation(printItemWrapper.FileLocation, pathAndFilenameToSave);
SaveGCodeToNewLocation(printItemWrapper.FileLocation, gcodePathAndFilenameToSave);
}
}
}
@ -330,7 +333,7 @@ namespace MatterHackers.MatterControl
void ExportX3G_Click(object state)
{
SaveFileDialogParams saveParams = new SaveFileDialogParams("Export GCode|*.gcode", title: "Export GCode");
SaveFileDialogParams saveParams = new SaveFileDialogParams("Export X3G|*.x3g", initialDirectory: documentsPath, title: "Export X3G");
saveParams.Title = "MatterControl: Export File";
saveParams.ActionButtonLabel = "Export";
@ -339,24 +342,24 @@ namespace MatterHackers.MatterControl
{
streamToSaveTo.Close ();
pathAndFilenameToSave = saveParams.FileName;
string extension = Path.GetExtension(pathAndFilenameToSave);
x3gPathAndFilenameToSave = saveParams.FileName;
string extension = Path.GetExtension(x3gPathAndFilenameToSave);
if(extension == "")
{
File.Delete(pathAndFilenameToSave);
pathAndFilenameToSave += ".gcode";
File.Delete(gcodePathAndFilenameToSave);
x3gPathAndFilenameToSave += ".x3g";
}
if (Path.GetExtension(printItemWrapper.FileLocation).ToUpper() == ".STL")
{
Close();
SlicingQueue.Instance.QueuePartForSlicing(printItemWrapper);
printItemWrapper.SlicingDone.RegisterEvent(x3gItem_Done, ref unregisterEvents);
printItemWrapper.SlicingDone.RegisterEvent(x3gItemSlice_Complete, ref unregisterEvents);
}
else if (partIsGCode)
{
Close();
SaveGCodeToNewLocation(printItemWrapper.FileLocation, pathAndFilenameToSave);
generateX3GfromGcode(printItemWrapper.FileLocation, x3gPathAndFilenameToSave);
}
}
}
@ -446,7 +449,7 @@ namespace MatterHackers.MatterControl
void DoExportSTL_Click(object state)
{
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save as STL|*.stl");
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save as STL|*.stl", initialDirectory: documentsPath);
saveParams.Title = "MatterControl: Export File";
saveParams.ActionButtonLabel = "Export";
saveParams.FileName = printItemWrapper.Name;
@ -478,15 +481,54 @@ namespace MatterHackers.MatterControl
PrintItemWrapper sliceItem = (PrintItemWrapper)sender;
printItemWrapper.SlicingDone.UnregisterEvent(sliceItem_Done, ref unregisterEvents);
SaveGCodeToNewLocation(sliceItem.GetGCodePathAndFileName(), pathAndFilenameToSave);
SaveGCodeToNewLocation(sliceItem.GetGCodePathAndFileName(), gcodePathAndFilenameToSave);
}
void x3gItem_Done(object sender, EventArgs e)
void x3gItemSlice_Complete(object sender, EventArgs e)
{
ProcessStartInfo exportX3GProcess = new ProcessStartInfo(printItemWrapper.PrintItem.Name);
exportX3GProcess.UseShellExecute = true;
exportX3GProcess.FileName = "C:\\Users\\Matter Hackers 1\\GPX\\gpx-win32-1.3\\gpx-win32-1.3\\gpx.exe";
Process.Start(exportX3GProcess);
PrintItemWrapper sliceItem = (PrintItemWrapper)sender;
printItemWrapper.SlicingDone.UnregisterEvent(x3gItemSlice_Complete, ref unregisterEvents);
if (File.Exists(sliceItem.GetGCodePathAndFileName()))
{
generateX3GfromGcode(sliceItem.GetGCodePathAndFileName(), x3gPathAndFilenameToSave);
}
}
string getGpxExectutablePath()
{
switch (OsInformation.OperatingSystem)
{
case OSType.Windows:
string gpxRelativePath = Path.Combine("..", "gpx.exe");
if (!File.Exists(gpxRelativePath))
{
gpxRelativePath = Path.Combine(".", "gpx.exe");
}
return Path.GetFullPath(gpxRelativePath);
case OSType.Mac:
return Path.Combine(ApplicationDataStorage.Instance.ApplicationPath, "gpx");
case OSType.X11:
return Path.GetFullPath(Path.Combine(".", "gpx.exe"));
default:
throw new NotImplementedException();
}
}
void generateX3GfromGcode(string gcodeInputPath, string x3gOutputPath, string machineType="r2")
{
string gpxExecutablePath = getGpxExectutablePath();
string gpxArgs = string.Format("-p -m {2} \"{0}\" \"{1}\" ", gcodeInputPath, x3gOutputPath, machineType);
ProcessStartInfo exportX3GProcess = new ProcessStartInfo(gpxExecutablePath);
exportX3GProcess.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
exportX3GProcess.Arguments = gpxArgs;
Process.Start(exportX3GProcess);
ShowFileIfRequested(x3gOutputPath);
}
}
}

3
PrintQueue/OptionsMenu/QueueOptionsMenu.cs
View file

@ -149,7 +149,8 @@ namespace MatterHackers.MatterControl.PrintQueue
List<PrintItem> parts = QueueData.Instance.CreateReadOnlyPartList();
if (parts.Count > 0)
{
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save Parts Sheet|*.pdf");
string documentsPath = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal);
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save Parts Sheet|*.pdf", initialDirectory: documentsPath);
saveParams.ActionButtonLabel = LocalizedString.Get("Save Parts Sheet");
string saveParamsTitleLabel = "MatterControl".Localize();

3
PrintQueue/QueueBottomToolbar.cs
View file

@ -175,7 +175,8 @@ namespace MatterHackers.MatterControl.PrintQueue
{
List<PrintItem> parts = QueueData.Instance.CreateReadOnlyPartList();
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save Parts Sheet|*.pdf");
string documentsPath = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal);
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save Parts Sheet|*.pdf", initialDirectory: documentsPath);
System.IO.Stream streamToSaveTo = FileDialog.SaveFileDialog(ref saveParams);
if (streamToSaveTo != null)

8
SlicerConfiguration/MatterSliceInfo.cs
View file

@ -43,8 +43,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
protected override string getWindowsPath()
{
string materSliceRelativePath = Path.Combine(".", "MatterSlice.exe");
return Path.GetFullPath(materSliceRelativePath);
string matterSliceRelativePath = Path.Combine(".", "MatterSlice.exe");
return Path.GetFullPath(matterSliceRelativePath);
}
protected override string getMacPath()
@ -55,8 +55,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
protected override string getLinuxPath()
{
string materSliceRelativePath = Path.Combine(".", "MatterSlice.exe");
return Path.GetFullPath(materSliceRelativePath);
string matterSliceRelativePath = Path.Combine(".", "MatterSlice.exe");
return Path.GetFullPath(matterSliceRelativePath);
}

3
StaticData/Translations/Master.txt
View file

@ -2561,3 +2561,6 @@ Translated:Lets the bed leveling code know if the printer can support the z axis
English:Z Can Be Negative
Translated:Z Can Be Negative
English:Export as X3G
Translated:Export as X3G

3
Utilities/ManifestFileHandler.cs
View file

@ -113,7 +113,8 @@ namespace MatterHackers.MatterControl
public void SaveAs()
//Opens Save file dialog and outputs current queue as a project
{
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save Project|*.mcp");
string documentsPath = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal);
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save Project|*.mcp", initialDirectory: documentsPath);
System.IO.Stream streamToSaveTo = FileDialog.SaveFileDialog(ref saveParams);
if (streamToSaveTo != null)

3
Utilities/ProjectFileHandler.cs
View file

@ -151,7 +151,8 @@ namespace MatterHackers.MatterControl
//Opens Save file dialog and outputs current queue as a project
public void SaveAs()
{
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save Project|*.zip");
string documentsPath = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal);
SaveFileDialogParams saveParams = new SaveFileDialogParams("Save Project|*.zip", initialDirectory: documentsPath);
System.IO.Stream streamToSaveTo = FileDialog.SaveFileDialog(ref saveParams);
if (streamToSaveTo != null)