From 619d2b63cc09d3b46330ec7bb52ccfb2f15d154a Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 1 Apr 2022 16:07:07 -0700 Subject: [PATCH 1/2] Made the calibration cubes have instructions Description Object can have clickable links Markdown widget keeps its size correctly Printer connection switches to disconnected when com port lost Fixed material temp --- .../Primitives/DescriptionObject3D.cs | 29 +++++++++++++++--- .../PrinterCommunication/PrinterConnection.cs | 2 +- .../Utilities/MarkdigAgg/MarkdownWidget.cs | 9 +++++- ...56.png => 3705231141807988552-256x256.png} | Bin .../Materials/BASF/PRO1 Tough PLA.material | 2 +- .../SampleParts/Retraction Cubes.mcx | Bin 0 -> 9143 bytes .../SampleParts/Retraction Cubes.stl | Bin 2484 -> 0 bytes 7 files changed, 34 insertions(+), 8 deletions(-) rename StaticData/Images/Thumbnails/{11417487296858350101-256x256.png => 3705231141807988552-256x256.png} (100%) create mode 100644 StaticData/OEMSettings/SampleParts/Retraction Cubes.mcx delete mode 100644 StaticData/OEMSettings/SampleParts/Retraction Cubes.stl diff --git a/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs b/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs index dc6a9184d..ad05e31c5 100644 --- a/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs +++ b/MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs @@ -34,6 +34,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using Markdig.Agg; +using Markdig.Renderers.Agg.Inlines; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; @@ -268,6 +269,8 @@ namespace MatterHackers.MatterControl.DesignTools if (markdownWidget.Markdown != description) { markdownWidget.Markdown = description; + + FixSelectableBasedOnLinks(markdownWidget); } markdownWidget.Width = width; @@ -298,6 +301,24 @@ namespace MatterHackers.MatterControl.DesignTools graphics2DOpenGL.RenderTransformedPath(transform, new Ellipse(0, 0, 5, 5), theme.PrimaryAccentColor, false); } + private void FixSelectableBasedOnLinks(MarkdownWidget markdownWidget) + { + if (markdownWidget.Descendants().Any()) + { + foreach (var child in markdownWidget.Children) + { + child.Selectable = true; + } + } + else + { + foreach (var child in markdownWidget.Children) + { + child.Selectable = false; + } + } + } + public AxisAlignedBoundingBox GetEditorWorldspaceAABB(Object3DControlsLayer layer) { return AxisAlignedBoundingBox.Empty(); @@ -328,17 +349,15 @@ namespace MatterHackers.MatterControl.DesignTools markdownWidget.Markdown = Description; markdownWidget.Width = width; markdownWidget.ScrollArea.VAnchor = VAnchor.Fit | VAnchor.Center; - foreach (var child in markdownWidget.Children) - { - child.Selectable = false; - } + + FixSelectableBasedOnLinks(markdownWidget); controlLayer.GuiSurface.AddChild(markdownWidget); controlLayer.GuiSurface.AfterDraw += GuiSurface_AfterDraw; markdownWidget.MouseDown += MarkdownWidget_MouseDown; markdownWidget.MouseMove += MarkdownWidget_MouseMove; markdownWidget.MouseUp += MarkdownWidget_MouseUp; - markdownWidget.KeyDown += MarkdownWidget_KeyDown; ; + markdownWidget.KeyDown += MarkdownWidget_KeyDown; } } diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs index adc7d87d2..3898c7df7 100644 --- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs +++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs @@ -1757,7 +1757,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec } Console.WriteLine("Exiting ReadFromPrinter method: " + CommunicationState.ToString()); - if (CommunicationState == CommunicationStates.Connected) + if (CommunicationState != CommunicationStates.Disconnecting) { // we are in an error condition where we have lost the com port CommunicationState = CommunicationStates.Disconnected; diff --git a/MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs b/MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs index 6eecdfee1..b42dddcbe 100644 --- a/MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs +++ b/MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs @@ -94,7 +94,14 @@ namespace Markdig.Agg this.AddChild(contentPanel); } - public void LoadUri(Uri uri, HelpArticle sourceArticle = null) + public override void OnSizeChanged(EventArgs e) + { + contentPanel.Height = contentPanel.Height - 1; + + base.OnSizeChanged(e); + } + + public void LoadUri(Uri uri, HelpArticle sourceArticle = null) { try { diff --git a/StaticData/Images/Thumbnails/11417487296858350101-256x256.png b/StaticData/Images/Thumbnails/3705231141807988552-256x256.png similarity index 100% rename from StaticData/Images/Thumbnails/11417487296858350101-256x256.png rename to StaticData/Images/Thumbnails/3705231141807988552-256x256.png diff --git a/StaticData/Materials/BASF/PRO1 Tough PLA.material b/StaticData/Materials/BASF/PRO1 Tough PLA.material index c8b998bfe..1ca21a9ad 100644 --- a/StaticData/Materials/BASF/PRO1 Tough PLA.material +++ b/StaticData/Materials/BASF/PRO1 Tough PLA.material @@ -22,7 +22,7 @@ "max_fan_speed_layer_time": "60", "min_fan_speed": "60", "min_fan_speed_layer_time": "180", - "temperature": "220" + "temperature": "215" } ], "OemLayer": null, diff --git a/StaticData/OEMSettings/SampleParts/Retraction Cubes.mcx b/StaticData/OEMSettings/SampleParts/Retraction Cubes.mcx new file mode 100644 index 0000000000000000000000000000000000000000..d54d6bc77ba57ef3cb29d78aeb0ff8ce14ea4abf GIT binary patch literal 9143 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 JE}9OI-2mXBm0th= From 0177cbfbffe55c95b8929f63e4bbd4d95225106f Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sat, 2 Apr 2022 12:33:11 -0700 Subject: [PATCH 2/2] Updating materials garolite settings --- StaticData/Materials/General/Nylon.material | 2 +- StaticData/Materials/Taulman/230 Nylon.material | 2 +- StaticData/Materials/Taulman/645 Nylon.material | 2 +- StaticData/Materials/Taulman/680 Nylon.material | 2 +- StaticData/Materials/Taulman/Bridge Nylon.material | 2 +- StaticData/Materials/_MatterHackers/NylonG.material | 2 +- StaticData/Materials/_MatterHackers/NylonK.material | 2 +- StaticData/Materials/_MatterHackers/NylonX.material | 2 +- StaticData/Materials/_MatterHackers/PRO Series/Nylon.material | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/StaticData/Materials/General/Nylon.material b/StaticData/Materials/General/Nylon.material index 7a2327d07..1f2894051 100644 --- a/StaticData/Materials/General/Nylon.material +++ b/StaticData/Materials/General/Nylon.material @@ -7,7 +7,7 @@ "bed_temperature": "70", "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "NC", - "bed_temperature_garolite": "NC", + "bed_temperature_garolite": "75", "bed_temperature_glass": "85", "bed_temperature_kapton": "70", "bed_temperature_pei": "NC", diff --git a/StaticData/Materials/Taulman/230 Nylon.material b/StaticData/Materials/Taulman/230 Nylon.material index 676198024..17b029a09 100644 --- a/StaticData/Materials/Taulman/230 Nylon.material +++ b/StaticData/Materials/Taulman/230 Nylon.material @@ -7,7 +7,7 @@ "bed_temperature": "70", "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "NC", - "bed_temperature_garolite": "NC", + "bed_temperature_garolite": "75", "bed_temperature_glass": "85", "bed_temperature_kapton": "70", "bed_temperature_pei": "NC", diff --git a/StaticData/Materials/Taulman/645 Nylon.material b/StaticData/Materials/Taulman/645 Nylon.material index cd5ac237f..7e106413d 100644 --- a/StaticData/Materials/Taulman/645 Nylon.material +++ b/StaticData/Materials/Taulman/645 Nylon.material @@ -7,7 +7,7 @@ "bed_temperature": "70", "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "NC", - "bed_temperature_garolite": "NC", + "bed_temperature_garolite": "75", "bed_temperature_glass": "85", "bed_temperature_kapton": "70", "bed_temperature_pei": "NC", diff --git a/StaticData/Materials/Taulman/680 Nylon.material b/StaticData/Materials/Taulman/680 Nylon.material index 3bd8fead2..a3be5c9d8 100644 --- a/StaticData/Materials/Taulman/680 Nylon.material +++ b/StaticData/Materials/Taulman/680 Nylon.material @@ -7,7 +7,7 @@ "bed_temperature": "70", "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "NC", - "bed_temperature_garolite": "NC", + "bed_temperature_garolite": "75", "bed_temperature_glass": "85", "bed_temperature_kapton": "70", "bed_temperature_pei": "NC", diff --git a/StaticData/Materials/Taulman/Bridge Nylon.material b/StaticData/Materials/Taulman/Bridge Nylon.material index ea3e256c1..06a4e4fdf 100644 --- a/StaticData/Materials/Taulman/Bridge Nylon.material +++ b/StaticData/Materials/Taulman/Bridge Nylon.material @@ -7,7 +7,7 @@ "bed_temperature": "70", "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "NC", - "bed_temperature_garolite": "NC", + "bed_temperature_garolite": "70", "bed_temperature_glass": "85", "bed_temperature_kapton": "70", "bed_temperature_pei": "NC", diff --git a/StaticData/Materials/_MatterHackers/NylonG.material b/StaticData/Materials/_MatterHackers/NylonG.material index a21473c4d..4d0f7af97 100644 --- a/StaticData/Materials/_MatterHackers/NylonG.material +++ b/StaticData/Materials/_MatterHackers/NylonG.material @@ -7,7 +7,7 @@ "bed_temperature": "70", "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "NC", - "bed_temperature_garolite": "NC", + "bed_temperature_garolite": "75", "bed_temperature_glass": "85", "bed_temperature_kapton": "70", "bed_temperature_pei": "NC", diff --git a/StaticData/Materials/_MatterHackers/NylonK.material b/StaticData/Materials/_MatterHackers/NylonK.material index 4233d7cf7..e64fadcaf 100644 --- a/StaticData/Materials/_MatterHackers/NylonK.material +++ b/StaticData/Materials/_MatterHackers/NylonK.material @@ -7,7 +7,7 @@ "bed_temperature": "70", "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "NC", - "bed_temperature_garolite": "NC", + "bed_temperature_garolite": "75", "bed_temperature_glass": "85", "bed_temperature_kapton": "70", "bed_temperature_pei": "NC", diff --git a/StaticData/Materials/_MatterHackers/NylonX.material b/StaticData/Materials/_MatterHackers/NylonX.material index 46fe3aa92..f3e7e4e59 100644 --- a/StaticData/Materials/_MatterHackers/NylonX.material +++ b/StaticData/Materials/_MatterHackers/NylonX.material @@ -7,7 +7,7 @@ "bed_temperature": "70", "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "NC", - "bed_temperature_garolite": "NC", + "bed_temperature_garolite": "75", "bed_temperature_glass": "85", "bed_temperature_kapton": "70", "bed_temperature_pei": "NC", diff --git a/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material b/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material index 1f74895b8..120e655b6 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material @@ -7,7 +7,7 @@ "bed_temperature": "70", "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "NC", - "bed_temperature_garolite": "NC", + "bed_temperature_garolite": "75", "bed_temperature_glass": "85", "bed_temperature_kapton": "70", "bed_temperature_pei": "NC",