We can now load at least some amfs into the 3d view.
This commit is contained in:
larsbrubaker
parent
6cacb2bafd
commit
f2c728d3b6
3 changed files with 34 additions and 6 deletions
|
|
@ -205,6 +205,7 @@ Global
|
|||
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{74F6BB6C-9D02-4512-A59A-21940E35C532}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -223,6 +224,7 @@ Global
|
|||
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{7E61A5BD-E78F-4B80-88C9-3821B4FA062E}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -294,6 +296,7 @@ Global
|
|||
{F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|x64.ActiveCfg = Debug|x86
|
||||
{F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|x64.Build.0 = Debug|x86
|
||||
{F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug|x86.Build.0 = Debug|x86
|
||||
{F1653F20-D47D-4F29-8C55-3C835542AF5F}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
|
|
@ -333,6 +336,7 @@ Global
|
|||
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{F67AE800-B0C7-42A8-836F-597B4E74591C}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -368,6 +372,7 @@ Global
|
|||
{990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{990A9AD3-B6A4-407B-9DFC-9C722AF7C9B9}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -386,6 +391,7 @@ Global
|
|||
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{A737BC76-165B-46C6-82B7-8871C7C92942}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -402,6 +408,7 @@ Global
|
|||
{CA96058C-1A37-465D-A357-D6D695B13D25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{CA96058C-1A37-465D-A357-D6D695B13D25}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{CA96058C-1A37-465D-A357-D6D695B13D25}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{CA96058C-1A37-465D-A357-D6D695B13D25}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{CA96058C-1A37-465D-A357-D6D695B13D25}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{CA96058C-1A37-465D-A357-D6D695B13D25}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{CA96058C-1A37-465D-A357-D6D695B13D25}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -420,6 +427,7 @@ Global
|
|||
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{036BCCBA-52D8-457C-84AE-8821F209FE4A}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -438,6 +446,7 @@ Global
|
|||
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{9B062971-A88E-4A3D-B3C9-12B78D15FA66}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -456,6 +465,7 @@ Global
|
|||
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{DF6845CD-64C6-4263-8357-DA8066855739}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -542,6 +552,7 @@ Global
|
|||
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{C46CA728-DD2F-4DD1-971A-AAA89D9DFF95}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -558,6 +569,7 @@ Global
|
|||
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{3DF4CB3D-9A03-4256-9A81-70523AAD828B}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -625,6 +637,7 @@ Global
|
|||
{DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{DA4A9C04-C54A-4571-B6B0-957C7E6E868B}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
@ -657,6 +670,7 @@ Global
|
|||
{6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug64|Any CPU.ActiveCfg = Debug64|x64
|
||||
{6782BF37-8139-4DC6-885E-98D22D1FB258}.Debug64|Any CPU.Build.0 = Debug64|x64
|
||||
|
|
|
|||
|
|
@ -193,7 +193,9 @@ namespace MatterHackers.MatterControl.PrintLibrary
|
|||
foreach (string file in fileDropEventArgs.DroppedFiles)
|
||||
{
|
||||
string extension = Path.GetExtension(file).ToUpper();
|
||||
if (extension == ".STL" || extension == ".GCODE")
|
||||
if (extension == ".STL"
|
||||
|| extension == ".AMF"
|
||||
|| extension == ".GCODE")
|
||||
{
|
||||
fileDropEventArgs.AcceptDrop = true;
|
||||
}
|
||||
|
|
@ -206,7 +208,9 @@ namespace MatterHackers.MatterControl.PrintLibrary
|
|||
foreach (string file in fileDropEventArgs.DroppedFiles)
|
||||
{
|
||||
string extension = Path.GetExtension(file).ToUpper();
|
||||
if (extension == ".STL" || extension == ".GCODE")
|
||||
if (extension == ".STL"
|
||||
|| extension == ".AMF"
|
||||
|| extension == ".GCODE")
|
||||
{
|
||||
fileDropEventArgs.AcceptDrop = true;
|
||||
}
|
||||
|
|
@ -219,7 +223,9 @@ namespace MatterHackers.MatterControl.PrintLibrary
|
|||
foreach (string droppedFileName in fileDropEventArgs.DroppedFiles)
|
||||
{
|
||||
string extension = Path.GetExtension(droppedFileName).ToUpper();
|
||||
if (extension == ".STL" || extension == ".GCODE")
|
||||
if (extension == ".STL"
|
||||
|| extension == ".AMF"
|
||||
|| extension == ".GCODE")
|
||||
{
|
||||
PrintItem printItem = new PrintItem();
|
||||
printItem.Name = Path.GetFileNameWithoutExtension(droppedFileName);
|
||||
|
|
|
|||
|
|
@ -227,7 +227,10 @@ namespace MatterHackers.MatterControl.PrintQueue
|
|||
foreach (string file in fileDropEventArgs.DroppedFiles)
|
||||
{
|
||||
string extension = Path.GetExtension(file).ToUpper();
|
||||
if (extension == ".STL" || extension == ".GCODE" || extension == ".ZIP")
|
||||
if (extension == ".STL"
|
||||
|| extension == ".AMF"
|
||||
|| extension == ".GCODE"
|
||||
|| extension == ".ZIP")
|
||||
{
|
||||
fileDropEventArgs.AcceptDrop = true;
|
||||
}
|
||||
|
|
@ -240,7 +243,10 @@ namespace MatterHackers.MatterControl.PrintQueue
|
|||
foreach (string file in fileDropEventArgs.DroppedFiles)
|
||||
{
|
||||
string extension = Path.GetExtension(file).ToUpper();
|
||||
if (extension == ".STL" || extension == ".GCODE" || extension == ".ZIP")
|
||||
if (extension == ".STL"
|
||||
|| extension == ".AMF"
|
||||
|| extension == ".GCODE"
|
||||
|| extension == ".ZIP")
|
||||
{
|
||||
fileDropEventArgs.AcceptDrop = true;
|
||||
}
|
||||
|
|
@ -253,7 +259,9 @@ namespace MatterHackers.MatterControl.PrintQueue
|
|||
foreach (string droppedFileName in fileDropEventArgs.DroppedFiles)
|
||||
{
|
||||
string extension = Path.GetExtension(droppedFileName).ToUpper();
|
||||
if (extension == ".STL" || extension == ".GCODE")
|
||||
if (extension == ".STL"
|
||||
|| extension == ".AMF"
|
||||
|| extension == ".GCODE")
|
||||
{
|
||||
QueueData.Instance.AddItem(new PrintItemWrapper(new PrintItem(Path.GetFileNameWithoutExtension(droppedFileName), Path.GetFullPath(droppedFileName))));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue