From caffdfbbf2240e548d30e55e7bb0636b4e1691d7 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 22 Dec 2017 10:01:19 -0800 Subject: [PATCH] Restore correct GCode2D overflow menu - Add test for expected overflow menus - Issue MatterHackers/MCCentral#2489 GCode2D shows mesh/model overflow menu --- PartPreviewWindow/PrinterTabPage.cs | 3 ++- .../MatterControlTests.cs | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/PartPreviewWindow/PrinterTabPage.cs b/PartPreviewWindow/PrinterTabPage.cs index e2f8cf7d1..d81daab4b 100644 --- a/PartPreviewWindow/PrinterTabPage.cs +++ b/PartPreviewWindow/PrinterTabPage.cs @@ -402,7 +402,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow protected override GuiWidget GetViewControls3DOverflowMenu() { - if (gcode3DWidget.Visible) + if (gcode3DWidget.Visible + || gcode2DWidget.Visible) { return this.ShowGCodeOverflowMenu(); } diff --git a/Tests/MatterControl.AutomationTests/MatterControlTests.cs b/Tests/MatterControl.AutomationTests/MatterControlTests.cs index a3477a242..82f85fc11 100644 --- a/Tests/MatterControl.AutomationTests/MatterControlTests.cs +++ b/Tests/MatterControl.AutomationTests/MatterControlTests.cs @@ -55,5 +55,28 @@ namespace MatterHackers.MatterControl.Tests.Automation Assert.Less(stopWatch.ElapsedMilliseconds, 2000, "Elapsed thumbnail generation for Rook.amf should be less than 2 seconds for expected orthographic mode"); }); } + + [Test] + public async Task View3DOverflowMenus() + { + await MatterControlUtilities.RunTest(testRunner => + { + testRunner.AddAndSelectPrinter("Airwolf 3D", "HD"); + + testRunner.ClickByName("Model View Button"); + testRunner.ClickByName("View3D Overflow Menu"); + Assert.IsTrue(testRunner.WaitForName("Overhang-Menu Menu Item"), "Model overflow menu should have Overhang item"); + + testRunner.ClickByName("Layers3D Button"); + testRunner.ClickByName("View3D Overflow Menu"); + Assert.IsTrue(testRunner.WaitForName("Sync To Print Menu Item"), "GCode3D overflow menu should have sync-to-print item"); + + testRunner.ClickByName("Layers2D Button"); + testRunner.ClickByName("View3D Overflow Menu"); + Assert.IsTrue(testRunner.WaitForName("Sync To Print Menu Item"), "GCode2D overflow menu should have sync-to-print item"); + + return Task.CompletedTask; + }); + } } } \ No newline at end of file