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

Made it so we can drag and drop zip files on the queue.

Browse source 
Made the add accept zip files.
This commit is contained in:
larsbrubaker 2014-05-17 11:06:34 -07:00
parent 618d23cf38
commit 919c246c99
1 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

37
PrintQueue/QueueBottomToolbar.cs
View file

@ -215,7 +215,7 @@ namespace MatterHackers.MatterControl.PrintQueue
foreach (string file in fileDropEventArgs.DroppedFiles)
{
string extension = Path.GetExtension(file).ToUpper();
if (extension == ".STL" || extension == ".GCODE")
if (extension == ".STL" || extension == ".GCODE" || extension == ".ZIP")
{
fileDropEventArgs.AcceptDrop = true;
}
@ -228,7 +228,7 @@ namespace MatterHackers.MatterControl.PrintQueue
foreach (string file in fileDropEventArgs.DroppedFiles)
{
string extension = Path.GetExtension(file).ToUpper();
if (extension == ".STL" || extension == ".GCODE")
if (extension == ".STL" || extension == ".GCODE" || extension == ".ZIP")
{
fileDropEventArgs.AcceptDrop = true;
}
@ -245,6 +245,18 @@ namespace MatterHackers.MatterControl.PrintQueue
{
QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(Path.GetFileNameWithoutExtension(droppedFileName), Path.GetFullPath(droppedFileName))));
}
else if (extension == ".ZIP")
{
ProjectFileHandler project = new ProjectFileHandler(null);
List<PrintItem> partFiles = project.ImportFromProjectArchive(droppedFileName);
if (partFiles != null)
{
foreach (PrintItem part in partFiles)
{
QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(part.Name, part.FileLocation)));
}
}
}
}
base.OnDragDrop(fileDropEventArgs);
@ -257,16 +269,31 @@ namespace MatterHackers.MatterControl.PrintQueue
void AddItemsToQueue(object state)
{
OpenFileDialogParams openParams = new OpenFileDialogParams("Select an STL file, Select a GCODE file|*.stl;*.gcode", multiSelect: true);
OpenFileDialogParams openParams = new OpenFileDialogParams("Select an STL file, Select a GCODE file|*.stl;*.gcode;*.zip", multiSelect: true);
openParams.ActionButtonLabel = "Add to Queue";
openParams.Title = "MatterControl: Select A File";
FileDialog.OpenFileDialog(ref openParams);
if (openParams.FileNames != null)
{
foreach (string loadedFileName in openParams.FileNames)
foreach (string fileNameToLoad in openParams.FileNames)
{
QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(Path.GetFileNameWithoutExtension(loadedFileName), Path.GetFullPath(loadedFileName))));
if (Path.GetExtension(fileNameToLoad).ToUpper() == ".ZIP")
{
ProjectFileHandler project = new ProjectFileHandler(null);
List<PrintItem> partFiles = project.ImportFromProjectArchive(fileNameToLoad);
if (partFiles != null)
{
foreach (PrintItem part in partFiles)
{
QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(part.Name, part.FileLocation)));
}
}
}
else
{
QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(Path.GetFileNameWithoutExtension(fileNameToLoad), Path.GetFullPath(fileNameToLoad))));
}
}
}
}