Merge pull request #5010 from larsbrubaker/master

main

Author: larsbrubaker

MatterControlLib/CustomWidgets/ExportPrintItemPage.cs

@@ -53,7 +53,7 @@ public class ExportPrintItemPage : DialogPage
 		public ExportPrintItemPage(IEnumerable<ILibraryItem> libraryItems, bool centerOnBed, PrinterConfig printer)
 		{
 			this.WindowTitle = "Export File".Localize();
-			var exportWholeBed = libraryItems.First().Name == printer.Bed.Scene.Name;
+			var exportWholeBed = libraryItems.First().Name == printer?.Bed.Scene.Name;
 			if (exportWholeBed)
 			{
 				this.HeaderText = "Export bed to".Localize() + ":";

MatterControlLib/DesignTools/Operations/MirrorObject3D_2.cs

@@ -97,6 +97,8 @@ public override Task Rebuild()
 
 							transformedMesh.ReverseFaces();
 
+							transformedMesh.CalculateNormals();
+
 							var newMesh = new Object3D()
 							{
 								Mesh = transformedMesh

MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrintPopupMenu.cs

@@ -223,7 +223,7 @@ public PrintPopupMenu(PrinterConfig printer, ThemeConfig theme)
 						},
 						Icon = StaticData.Instance.LoadIcon("cube_export.png", 16, 16, theme.InvertIcons),
 						ButtonEnabled = exportPlugin.Enabled,
-						ButtonName = "Export Gcode Button",
+						ButtonName = "Export GCode Button",
 						ButtonAction = (widget) =>
 						{
 							this.CloseMenu();

StaticData/Tests/temp/2020-11-25T06-57-34/Test0/MatterControl.db

@@ -42,26 +42,66 @@ await MatterControlUtilities.RunTest(testRunner =>
 					.ClickByName("Export Menu Item")
 					.WaitForName("Export Item Window");
 
+				string gcodeOutputPath = MatterControlUtilities.PathToExportGcodeFolder;
+				Directory.CreateDirectory(gcodeOutputPath);
+				string fullPathToGcodeFile = Path.Combine(gcodeOutputPath, "Batman");
+
 				testRunner.ClickByName("Machine File (G-Code) Button")
 					.ClickByName("Export Button")
-					.Delay();
-
-				string gcodeOutputPath = MatterControlUtilities.PathToExportGcodeFolder;
+					.Delay()
+					.Type(fullPathToGcodeFile)
+					.Type("{Enter}")
+					.WaitFor(() => File.Exists(fullPathToGcodeFile + ".gcode"), 10);
 
-				Directory.CreateDirectory(gcodeOutputPath);
+				Assert.IsTrue(File.Exists(fullPathToGcodeFile + ".gcode"), "Exported file not found");
 
-				string fullPathToGcodeFile = Path.Combine(gcodeOutputPath, "Batman");
-				testRunner.Type(fullPathToGcodeFile);
-				testRunner.Type("{Enter}");
+				// add an item to the bed
+				fullPathToGcodeFile = Path.Combine(gcodeOutputPath, "Cube");
+				testRunner.AddItemToBedplate()
+					.ClickByName("PrintPopupMenu")
+					.ClickByName("Export GCode Button")
+					.Type(fullPathToGcodeFile)
+					.Type("{Enter}");
 
 				testRunner.WaitFor(() => File.Exists(fullPathToGcodeFile + ".gcode"), 10);
-
 				Assert.IsTrue(File.Exists(fullPathToGcodeFile + ".gcode"), "Exported file not found");
 
 				return Task.FromResult(0);
 			});
 		}
 
+		[Test]
+		public async Task ExportDesignTabAsSTL()
+		{
+			await MatterControlUtilities.RunTest(testRunner =>
+			{
+				testRunner.WaitForFirstDraw();
+
+				// save from design tab
+				var gcodeOutputPath = MatterControlUtilities.PathToExportGcodeFolder;
+				var fullPathToGcodeFile = Path.Combine(gcodeOutputPath, "Cube2");
+				Directory.CreateDirectory(gcodeOutputPath);
+				testRunner.EnsureWelcomePageClosed()
+					.ClickByName("Create New")
+					.AddItemToBedplate()					
+					.ClickByName("Bed Options Menu")
+					.ClickByName("Export Menu Item")
+					.WaitForName("Export Item Window");
+
+				testRunner.ClickByName("STL File Button")
+					.ClickByName("Export Button")
+					.Delay()
+					.Type(fullPathToGcodeFile)
+					.Type("{Enter}")
+					.WaitFor(() => File.Exists(fullPathToGcodeFile + ".stl"), 10);
+
+				testRunner.WaitFor(() => File.Exists(fullPathToGcodeFile + ".stl"), 10);
+				Assert.IsTrue(File.Exists(fullPathToGcodeFile + ".stl"), "Exported file not found");
+
+				return Task.FromResult(0);
+			});
+		}
+
 		[Test]
 		public async Task ExportStreamG92HandlingTest()
 		{

StaticData/Tests/temp/2020-11-25T06-57-49/Test0/MatterControl.db

@@ -1060,7 +1060,7 @@ public static AutomationRunner ExportPrintAndLoadGCode(this AutomationRunner tes
 					.OpenPrintPopupMenu();
 			}
 
-			testRunner.ClickByName("Export Gcode Button");
+			testRunner.ClickByName("Export GCode Button");
 
 			// wait for the export to finish
 			throw new NotImplementedException();