From 0038e2d3e2bcaefea14ff8c3a90c8dfa428033b6 Mon Sep 17 00:00:00 2001 From: fortsnek9348 Date: Wed, 20 Apr 2022 17:02:03 +0100 Subject: [PATCH 1/3] Fix upgrade tab dot positioning. --- .../PartPreviewWindow/MainViewWidget.cs | 28 +++++++++++-------- Submodules/agg-sharp | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs index c0d74d045..935d32953 100644 --- a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs +++ b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs @@ -261,20 +261,26 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // Upgrade tab if (!ApplicationController.Instance.IsMatterControlPro()) { - tabControl.AddTab( - tab = new ChromeTab("Upgrade", "Upgrade".Localize(), tabControl, new UpgradeToProTabPage(theme), theme, hasClose: false) - { - MinimumSize = new Vector2(0, theme.TabButtonHeight), - Name = "Upgrade", - Padding = new BorderDouble(15, 0), - }); + tab = new ChromeTab("Upgrade", "Upgrade".Localize(), tabControl, new UpgradeToProTabPage(theme), theme, hasClose: false) + { + MinimumSize = new Vector2(0, theme.TabButtonHeight), + Name = "Upgrade", + Padding = new BorderDouble(15, 0), + }; + tabControl.AddTab(tab); + + ChromeTab upgradeTab = tab; tab.AfterDraw += (s, e) => { - var textWidget = tab.Descendants().FirstOrDefault(); - e.Graphics2D.Circle(Math.Max(textWidget.Width, tab.LocalBounds.Right - 25 * DeviceScale), - tab.LocalBounds.Bottom + tab.Height / 2 - 1 * DeviceScale, - 5 * DeviceScale, + var textWidget = upgradeTab.Descendants().FirstOrDefault(); + + var localLabelEndPosition = textWidget.TransformToScreenSpace(textWidget.Printer.GetSize()) - upgradeTab.TransformToScreenSpace(Vector2.Zero); + + double radius = 5 * DeviceScale; + e.Graphics2D.Circle(localLabelEndPosition.X + radius + 3 * DeviceScale, + upgradeTab.LocalBounds.Bottom + upgradeTab.Height / 2 - 1 * DeviceScale, + radius, theme.PrimaryAccentColor); }; } diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index ba51c5c12..1fca5e0a2 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit ba51c5c12e8efa9adac7ab8e511bb2880041b198 +Subproject commit 1fca5e0a2e913392761a3cb5fc6ab9f8abbc1c52 From 04b7f6da02962cf9619729f70a2a818cb77d4dc8 Mon Sep 17 00:00:00 2001 From: fortsnek9348 Date: Wed, 20 Apr 2022 21:18:58 +0100 Subject: [PATCH 2/3] Fix slice settings tests. --- .gitignore | 1 + MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs | 2 +- .../HardwareLevelingUITests.cs | 4 ++-- Tests/MatterControl.AutomationTests/SliceSettingsTests.cs | 6 +++--- .../MatterControl/MatterControlUtilities.cs | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f4531ab50..d29c2f4e1 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ MatterControl.userprefs # JetBrains Rider user configuration directory /.idea/ +/MainOutputDirectory.cs diff --git a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs index 2d7117635..080bbb20c 100644 --- a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs +++ b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs @@ -335,7 +335,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration hasClose: false, pointSize: theme.DefaultFontSize) { - Name = category.Name + " Tab", + Name = category.Name + " SliceSettingsTab", InactiveTabColor = Color.Transparent, ActiveTabColor = theme.BackgroundColor }); diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs index b48932686..ea1a1ca28 100644 --- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs +++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs @@ -18,7 +18,7 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.AddAndSelectPrinter("Airwolf 3D", "HD"); testRunner.SwitchToPrinterSettings(); - testRunner.ClickByName("Features Tab"); + testRunner.ClickByName("Features SliceSettingsTab"); testRunner.ClickByName("Slice Settings Overflow Menu"); testRunner.ClickByName("Advanced Menu Item"); Assert.IsFalse(testRunner.WaitForName("print_leveling_solution Row", .5), "Print leveling should not exist for an Airwolf HD"); @@ -27,7 +27,7 @@ namespace MatterHackers.MatterControl.Tests.Automation testRunner.AddAndSelectPrinter("3D Factory", "MendelMax 1.5"); testRunner.SwitchToPrinterSettings(); - testRunner.ClickByName("Features Tab"); + testRunner.ClickByName("Features SliceSettingsTab"); testRunner.ClickByName("Slice Settings Overflow Menu"); testRunner.ClickByName("Advanced Menu Item"); Assert.IsTrue(testRunner.WaitForName("print_leveling_solution Row"), "Print leveling should exist for a 3D Factory MendelMax"); diff --git a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs index 82aecee14..d92a5f152 100644 --- a/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs +++ b/Tests/MatterControl.AutomationTests/SliceSettingsTests.cs @@ -243,7 +243,7 @@ namespace MatterHackers.MatterControl.Tests.Automation .AddAndSelectPrinter("Airwolf 3D", "HD") // Navigate to Local Library .SwitchToPrinterSettings() - .ClickByName("Features Tab"); + .ClickByName("Features SliceSettingsTab"); var printer = testRunner.FirstPrinter(); @@ -262,7 +262,7 @@ namespace MatterHackers.MatterControl.Tests.Automation { using (var emulator = testRunner.LaunchAndConnectToPrinterEmulator()) { - testRunner.ClickByName("Features Tab"); + testRunner.ClickByName("Features SliceSettingsTab"); // only 1 hotend and 1 extruder Assert.IsTrue(testRunner.NameExists("Hotend 0")); @@ -399,7 +399,7 @@ namespace MatterHackers.MatterControl.Tests.Automation Assert.AreEqual(0, (int)emulator.CurrentExtruder.TargetTemperature); // Switch back to the general tab - testRunner.ClickByName("General Tab") + testRunner.ClickByName("General SliceSettingsTab") .SelectSliceSettingsField(SettingsKey.extruder_count) .Type("2") .Type("{Enter}"); diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs index 080e3b553..3cce49fca 100644 --- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs +++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs @@ -1326,7 +1326,7 @@ namespace MatterHackers.MatterControl.Tests.Automation var category = group.Category; // Click tab - testRunner.ClickByName(category.Name + " Tab"); + testRunner.ClickByName(category.Name + " SliceSettingsTab"); // Open the subGroup if required var foundWidget = testRunner.GetWidgetByName(group.Name + " Panel", out _, .1); From 071a6feb6bed9b2b5e1805e32059f8eaac5e7cff Mon Sep 17 00:00:00 2001 From: fortsnek9348 Date: Tue, 26 Apr 2022 22:32:36 +0100 Subject: [PATCH 3/3] Revert gitignore change. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index d29c2f4e1..f4531ab50 100644 --- a/.gitignore +++ b/.gitignore @@ -120,4 +120,3 @@ MatterControl.userprefs # JetBrains Rider user configuration directory /.idea/ -/MainOutputDirectory.cs