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

Localization, Export Windows, Extension Test

Browse source
This commit is contained in:
gregory-diaz 2014-02-18 13:07:50 -08:00
commit 5465563e82
67 changed files with 1651 additions and 812 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PrintQueue/ExportToFolderProcess.cs
View file

@ -7,6 +7,7 @@ using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.Agg.UI;
using MatterHackers.GCodeVisualizer;
using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.PrintQueue
{
@ -147,7 +148,7 @@ namespace MatterHackers.MatterControl.PrintQueue
string outputFileName = Path.ChangeExtension(originalFileName, ".gcode");
string outputPathAndName = Path.Combine(exportPath, outputFileName);
if (PrinterCommunication.Instance.DoPrintLeveling)
if (ActivePrinterProfile.Instance.DoPrintLeveling)
{
GCodeFile unleveledGCode = new GCodeFile(savedGcodeFileName);
PrintLeveling.Instance.ApplyLeveling(unleveledGCode);

3
PrintQueue/ExportToSdCardProcess.cs
View file

@ -5,6 +5,7 @@ using System.IO;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.Agg.UI;
using MatterHackers.GCodeVisualizer;
@ -143,7 +144,7 @@ namespace MatterHackers.MatterControl.PrintQueue
throw new NotImplementedException();
//string outputPathAndName = Path.Combine(exportPath, outputFileName);
if (PrinterCommunication.Instance.DoPrintLeveling)
if (ActivePrinterProfile.Instance.DoPrintLeveling)
{
GCodeFile unleveledGCode = new GCodeFile(savedGcodeFileName);
PrintLeveling.Instance.ApplyLeveling(unleveledGCode);

9
PrintQueue/PrintItemWrapper.cs
View file

@ -10,6 +10,7 @@ using System.Diagnostics;
using MatterHackers.Agg.UI;
using MatterHackers.Agg;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.PrintQueue
{
@ -168,10 +169,10 @@ namespace MatterHackers.MatterControl.PrintQueue
}
// check if there is a known line at the end of the file (this will let us know if slicer finished building the file).
switch (PrinterCommunication.Instance.ActiveSliceEngine)
switch (ActivePrinterProfile.Instance.ActiveSliceEngineType)
{
case PrinterCommunication.SlicingEngine.CuraEngine:
case PrinterCommunication.SlicingEngine.Slic3r:
case ActivePrinterProfile.SlicingEngineTypes.CuraEngine:
case ActivePrinterProfile.SlicingEngineTypes.Slic3r:
if (gcodeFileContents.Contains("filament used ="))
{
gCodeFileIsComplete = true;
@ -193,7 +194,7 @@ namespace MatterHackers.MatterControl.PrintQueue
return FileLocation;
}
string engineString = ((int)PrinterCommunication.Instance.ActiveSliceEngine).ToString();
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");

16
PrintQueue/PrintQueueControl.cs
View file

@ -108,6 +108,22 @@ namespace MatterHackers.MatterControl.PrintQueue
}
}
public void MoveToNext()
{
if (SelectedIndex >= 0 && SelectedIndex < Count)
{
if (this.SelectedIndex == Count - 1)
{
this.SelectedIndex = 0;
}
else
{
this.SelectedIndex++;
}
}
}
public void MoveSelectedToBottom()
{
if (SelectedIndex >= 0 && SelectedIndex < Count)

2
PrintQueue/PrintQueueMenu.cs
View file

@ -130,7 +130,7 @@ namespace MatterHackers.MatterControl.PrintQueue
bool exportGCodeToFolderButton_Click()
{
if (PrinterCommunication.Instance.ActivePrinter == null)
if (ActivePrinterProfile.Instance.ActivePrinter == null)
{
UiThread.RunOnIdle(MustSelectPrinterMessage);
}