nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5294 from larsbrubaker/main

Browse source 
Made the calibration cubes have instructions
This commit is contained in:
Lars Brubaker 2022-04-02 12:56:53 -07:00 • committed by GitHub
commit 5b438d20c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
MatterControlLib/DesignTools/Primitives/DescriptionObject3D.cs
View file

@ -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<TextLinkX>().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;
}
}

2
MatterControlLib/PrinterCommunication/PrinterConnection.cs
View file

@ -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;

9
MatterControlLib/Utilities/MarkdigAgg/MarkdownWidget.cs
View file

@ -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
{

0
StaticData/Images/Thumbnails/11417487296858350101-256x256.png → StaticData/Images/Thumbnails/3705231141807988552-256x256.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

2
StaticData/Materials/BASF/PRO1 Tough PLA.material
View file

@ -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,

2
StaticData/Materials/General/Nylon.material
View file

@ -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",

2
StaticData/Materials/Taulman/230 Nylon.material
View file

@ -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",

2
StaticData/Materials/Taulman/645 Nylon.material
View file

@ -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",

2
StaticData/Materials/Taulman/680 Nylon.material
View file

@ -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",

2
StaticData/Materials/Taulman/Bridge Nylon.material
View file

@ -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",

2
StaticData/Materials/_MatterHackers/NylonG.material
View file

@ -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",

2
StaticData/Materials/_MatterHackers/NylonK.material
View file

@ -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",

2
StaticData/Materials/_MatterHackers/NylonX.material
View file

@ -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",

2
StaticData/Materials/_MatterHackers/PRO Series/Nylon.material
View file

@ -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",

BIN
StaticData/OEMSettings/SampleParts/Retraction Cubes.mcx Normal file
View file

Binary file not shown.

BIN
StaticData/OEMSettings/SampleParts/Retraction Cubes.stl
View file

Binary file not shown.