From 991be45a85ebdad7a5b3a6ba4457d8f81fd18aae Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 13 Mar 2018 17:17:28 -0700 Subject: [PATCH 1/6] Made it more possible to do matter cad like operations on IVertexSource paths Made Braille Object have option for key chain hook Put ResolutionScalle into Vertex objects --- DesignTools/Operations/Align.cs | 101 ++++++++++++++++++- DesignTools/Operations/Object3DExtensions.cs | 42 ++++++-- DesignTools/Operations/SetCenter.cs | 42 +++++++- DesignTools/Primitives/TextObject3D.cs | 5 +- MatterControl.csproj | 4 + Submodules/agg-sharp | 2 +- TextCreator/Braille/BrailleCardObject3D.cs | 10 +- TextCreator/Braille/BrailleObject3D.cs | 39 +++++++ 8 files changed, 228 insertions(+), 17 deletions(-) diff --git a/DesignTools/Operations/Align.cs b/DesignTools/Operations/Align.cs index 3292dbc88..2d9ed83d4 100644 --- a/DesignTools/Operations/Align.cs +++ b/DesignTools/Operations/Align.cs @@ -28,6 +28,8 @@ either expressed or implied, of the FreeBSD Project. */ using System; +using MatterHackers.Agg.Transform; +using MatterHackers.Agg.VertexSource; using MatterHackers.DataConverters3D; using MatterHackers.VectorMath; @@ -63,6 +65,15 @@ namespace MatterHackers.MatterControl.DesignTools.Operations Top = 0x20, }; + [Flags] + public enum Side2D + { + Left = 0x01, + Right = 0x02, + Bottom = 0x10, + Top = 0x20, + }; + public class Align : Object3D { public Align() @@ -74,7 +85,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations { if (objectToAlign == objectToAlignTo) { - throw new Exception("You cannot align an object ot itself."); + throw new Exception("You cannot align an object to itself."); } } @@ -165,4 +176,92 @@ namespace MatterHackers.MatterControl.DesignTools.Operations return false; } } + + public class Align2D : VertexSourceApplyTransform + { + public Align2D() + { + } + + public Align2D(IVertexSource objectToAlign, Side2D boundingFacesToAlign, IVertexSource objectToAlignTo, Side2D boundingFacesToAlignTo, double offsetX = 0, double offsetY = 0, string name = "") + : this(objectToAlign, boundingFacesToAlign, GetPositionToAlignTo(objectToAlignTo, boundingFacesToAlignTo, new Vector2(offsetX, offsetY)), name) + { + if (objectToAlign == objectToAlignTo) + { + throw new Exception("You cannot align an object to itself."); + } + } + + public Align2D(IVertexSource objectToAlign, Side2D boundingFacesToAlign, double positionToAlignToX = 0, double positionToAlignToY = 0, string name = "") + : this(objectToAlign, boundingFacesToAlign, new Vector2(positionToAlignToX, positionToAlignToY), name) + { + } + + public Align2D(IVertexSource objectToAlign, Side2D boundingFacesToAlign, Vector2 positionToAlignTo, double offsetX, double offsetY, string name = "") + : this(objectToAlign, boundingFacesToAlign, positionToAlignTo + new Vector2(offsetX, offsetY), name) + { + } + + public Align2D(IVertexSource item, Side2D boundingFacesToAlign, Vector2 positionToAlignTo, string name = "") + { + var bounds = item.Bounds(); + + if (IsSet(boundingFacesToAlign, Side2D.Left, Side2D.Right)) + { + positionToAlignTo.X = positionToAlignTo.X - bounds.Left; + } + if (IsSet(boundingFacesToAlign, Side2D.Right, Side2D.Left)) + { + positionToAlignTo.X = positionToAlignTo.X - bounds.Left - (bounds.Right - bounds.Left); + } + if (IsSet(boundingFacesToAlign, Side2D.Bottom, Side2D.Top)) + { + positionToAlignTo.Y = positionToAlignTo.Y - bounds.Bottom; + } + if (IsSet(boundingFacesToAlign, Side2D.Top, Side2D.Bottom)) + { + positionToAlignTo.Y = positionToAlignTo.Y - bounds.Bottom - (bounds.Top - bounds.Bottom); + } + + Transform = Affine.NewTranslation(positionToAlignTo); + VertexSource = item; + } + + public static Vector2 GetPositionToAlignTo(IVertexSource objectToAlignTo, Side2D boundingFacesToAlignTo, Vector2 extraOffset) + { + Vector2 positionToAlignTo = new Vector2(); + if (IsSet(boundingFacesToAlignTo, Side2D.Left, Side2D.Right)) + { + positionToAlignTo.X = objectToAlignTo.Bounds().Left; + } + if (IsSet(boundingFacesToAlignTo, Side2D.Right, Side2D.Left)) + { + positionToAlignTo.X = objectToAlignTo.Bounds().Right; + } + if (IsSet(boundingFacesToAlignTo, Side2D.Bottom, Side2D.Top)) + { + positionToAlignTo.Y = objectToAlignTo.Bounds().Bottom; + } + if (IsSet(boundingFacesToAlignTo, Side2D.Top, Side2D.Bottom)) + { + positionToAlignTo.Y = objectToAlignTo.Bounds().Top; + } + + return positionToAlignTo + extraOffset; + } + + private static bool IsSet(Side2D variableToCheck, Side2D faceToCheckFor, Side2D faceToAssertNot) + { + if ((variableToCheck & faceToCheckFor) != 0) + { + if ((variableToCheck & faceToAssertNot) != 0) + { + throw new Exception("You cannot have both " + faceToCheckFor.ToString() + " and " + faceToAssertNot.ToString() + " set when calling Align. The are mutually exclusive."); + } + return true; + } + + return false; + } + } } \ No newline at end of file diff --git a/DesignTools/Operations/Object3DExtensions.cs b/DesignTools/Operations/Object3DExtensions.cs index 21291461d..103300ca7 100644 --- a/DesignTools/Operations/Object3DExtensions.cs +++ b/DesignTools/Operations/Object3DExtensions.cs @@ -27,20 +27,16 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ -using System; using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Threading; -using MatterHackers.Agg.Font; -using MatterHackers.Agg.Platform; +using ClipperLib; +using MatterHackers.Agg; +using MatterHackers.Agg.VertexSource; +using MatterHackers.DataConverters2D; using MatterHackers.DataConverters3D; using MatterHackers.DataConverters3D.UndoCommands; using MatterHackers.MatterControl.PartPreviewWindow.View3D; -using MatterHackers.PolygonMesh; -using MatterHackers.RenderOpenGl; using MatterHackers.VectorMath; -using Newtonsoft.Json; namespace MatterHackers.MatterControl.DesignTools.Operations { @@ -64,6 +60,26 @@ namespace MatterHackers.MatterControl.DesignTools.Operations return resultsA; } + private static VertexStorage CombinePaths(IVertexSource a, IVertexSource b, ClipType clipType) + { + List> aPolys = VertexSourceToClipperPolygons.CreatePolygons(a); + List> bPolys = VertexSourceToClipperPolygons.CreatePolygons(b); + + Clipper clipper = new Clipper(); + + clipper.AddPaths(aPolys, PolyType.ptSubject, true); + clipper.AddPaths(bPolys, PolyType.ptClip, true); + + List> intersectedPolys = new List>(); + clipper.Execute(clipType, intersectedPolys); + + VertexStorage output = VertexSourceToClipperPolygons.CreateVertexStorage(intersectedPolys); + + output.Add(0, 0, ShapePath.FlagsAndCommand.CommandStop); + + return output; + } + public static IObject3D Plus(this IObject3D a, IObject3D b) { var results = new Object3D(); @@ -74,6 +90,16 @@ namespace MatterHackers.MatterControl.DesignTools.Operations return results; } + public static IVertexSource Minus(this IVertexSource a, IVertexSource b) + { + return CombinePaths(a, b, ClipType.ctDifference); + } + + public static IVertexSource Plus(this IVertexSource a, IVertexSource b) + { + return CombinePaths(a, b, ClipType.ctUnion); + } + public static double XSize(this IObject3D item) { return item.GetAxisAlignedBoundingBox().XSize; diff --git a/DesignTools/Operations/SetCenter.cs b/DesignTools/Operations/SetCenter.cs index 58f449d43..f26e559d6 100644 --- a/DesignTools/Operations/SetCenter.cs +++ b/DesignTools/Operations/SetCenter.cs @@ -27,6 +27,8 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ +using MatterHackers.Agg.Transform; +using MatterHackers.Agg.VertexSource; using MatterHackers.DataConverters3D; using MatterHackers.VectorMath; @@ -40,7 +42,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations public SetCenter(IObject3D item, Vector3 position) { - Matrix *= Matrix4X4.CreateTranslation(position - item.GetCenter()); + Matrix = Matrix4X4.CreateTranslation(position - item.GetCenter()); Children.Add(item.Clone()); } @@ -67,8 +69,44 @@ namespace MatterHackers.MatterControl.DesignTools.Operations consideredOffset.Z = offset.Z - center.Z; } - Matrix *= Matrix4X4.CreateTranslation(consideredOffset); + Matrix = Matrix4X4.CreateTranslation(consideredOffset); Children.Add(item.Clone()); } } + + public class SetCenter2D : VertexSourceApplyTransform + { + public SetCenter2D() + { + } + + public SetCenter2D(IVertexSource item, Vector2 position) + { + Transform = Affine.NewTranslation(position - item.Bounds().Center); + VertexSource = item; + } + + public SetCenter2D(IVertexSource item, double x, double y) + : this(item, new Vector2(x, y)) + { + } + + public SetCenter2D(IVertexSource item, Vector2 offset, bool onX = true, bool onY = true) + { + var center = item.Bounds().Center; + + Vector2 consideredOffset = Vector2.Zero; // zero out anything we don't want + if (onX) + { + consideredOffset.X = offset.X - center.X; + } + if (onY) + { + consideredOffset.Y = offset.Y - center.Y; + } + + Transform = Affine.NewTranslation(consideredOffset); + VertexSource = item; + } + } } \ No newline at end of file diff --git a/DesignTools/Primitives/TextObject3D.cs b/DesignTools/Primitives/TextObject3D.cs index 4c4e30c1e..74636037f 100644 --- a/DesignTools/Primitives/TextObject3D.cs +++ b/DesignTools/Primitives/TextObject3D.cs @@ -108,7 +108,10 @@ namespace MatterHackers.MatterControl.DesignTools double pointsToMm = 0.352778; foreach (var letter in NameToWrite.ToCharArray()) { - var letterPrinter = new TypeFacePrinter(letter.ToString(), new StyledTypeFace(NamedTypeFaceCache.GetTypeFace(Font), PointSize)); + var letterPrinter = new TypeFacePrinter(letter.ToString(), new StyledTypeFace(NamedTypeFaceCache.GetTypeFace(Font), PointSize)) + { + ResolutionScale = 10 + }; var scalledLetterPrinter = new VertexSourceApplyTransform(letterPrinter, Affine.NewScaling(pointsToMm)); IObject3D letterObject = new Object3D() { diff --git a/MatterControl.csproj b/MatterControl.csproj index ec65b4fdb..207b04518 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -592,6 +592,10 @@ {9B062971-A88E-4A3D-B3C9-12B78D15FA66} clipper_library + + {94838988-523c-4b11-ad82-8b9b76f23a31} + DataConverters2D + {04667764-DC7B-4B95-AEF6-B4E6C87A54E9} DataConverters3D diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index d20563290..3598e1ff4 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit d20563290c8d881d02788b26e12a16cd969e88e2 +Subproject commit 3598e1ff4b365c81ca52243afebd37e6a8cb6c87 diff --git a/TextCreator/Braille/BrailleCardObject3D.cs b/TextCreator/Braille/BrailleCardObject3D.cs index 04ece6134..01c68aad8 100644 --- a/TextCreator/Braille/BrailleCardObject3D.cs +++ b/TextCreator/Braille/BrailleCardObject3D.cs @@ -95,13 +95,15 @@ namespace MatterHackers.MatterControl.DesignTools letterObject = new SetCenter(letterObject, brailleLetter.GetCenter(), true, false, false); this.Children.Add(letterObject); - // 10x bigger to make better rounding - var basePath = new RoundedRect(0, 0, 220, 340, 30); + var basePath = new RoundedRect(0, 0, 22, 34, 3) + { + ResolutionScale = 10 + }; IObject3D basePlate = new Object3D() { - Mesh = VertexSourceToMesh.Extrude(basePath, BaseHeight * 10), - Matrix = Matrix4X4.CreateScale(.1) * Matrix4X4.CreateRotationX(MathHelper.Tau / 4) + Mesh = VertexSourceToMesh.Extrude(basePath, BaseHeight), + Matrix = Matrix4X4.CreateRotationX(MathHelper.Tau / 4) }; basePlate = new Align(basePlate, Face.Bottom | Face.Back, brailleLetter, Face.Bottom | Face.Back); diff --git a/TextCreator/Braille/BrailleObject3D.cs b/TextCreator/Braille/BrailleObject3D.cs index d203e3d28..d9f91882a 100644 --- a/TextCreator/Braille/BrailleObject3D.cs +++ b/TextCreator/Braille/BrailleObject3D.cs @@ -77,6 +77,8 @@ namespace MatterHackers.MatterControl.DesignTools public bool RenderAsBraille { get; set; } = true; + public bool AddHook { get; set; } + static TypeFace typeFace = TypeFace.LoadFrom(AggContext.StaticData.ReadAllText(Path.Combine("Fonts", "Braille.svg"))); @@ -200,6 +202,43 @@ namespace MatterHackers.MatterControl.DesignTools basePlate.Matrix *= Matrix4X4.CreateRotationX(MathHelper.Tau / 4); + // add an optional chain hook + if (AddHook) + { + // x 10 to make it smoother + double edgeWidth = 2; + double height = basePlate.ZSize(); + IVertexSource leftSideObject = new RoundedRect(0, 0, height / 2, height, 0) + { + ResolutionScale = 10 + }; + + IVertexSource cicleObject = new Ellipse(0, 0, height / 2, height / 2) + { + ResolutionScale = 10 + }; + + cicleObject = new Align2D(cicleObject, Side2D.Left | Side2D.Bottom, leftSideObject, Side2D.Left | Side2D.Bottom, -.01); + IVertexSource holeObject = new Ellipse(0, 0, height / 2 - edgeWidth, height / 2 - edgeWidth) + { + ResolutionScale = 10 + }; + holeObject = new SetCenter2D(holeObject, cicleObject.Bounds().Center); + + IVertexSource hookPath = leftSideObject.Plus(cicleObject); + hookPath = hookPath.Minus(holeObject); + + IObject3D chainHook = new Object3D() + { + Mesh = VertexSourceToMesh.Extrude(hookPath, BaseHeight), + Matrix = Matrix4X4.CreateRotationX(MathHelper.Tau / 4) + }; + + chainHook = new Align(chainHook, Face.Left | Face.Bottom | Face.Back, basePlate, Face.Right | Face.Bottom | Face.Back, -.01); + + this.Children.Add(chainHook); + } + // add the object that is the dots this.Children.Add(textObject); textObject.Matrix *= Matrix4X4.CreateRotationX(MathHelper.Tau / 4); From 731b5e15e54935c6de295bf3ff5ab8d2621963d7 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 13 Mar 2018 17:18:21 -0700 Subject: [PATCH 2/6] Revise About page - Issue MatterHackers/MCCentral#2896 Update Help -> About --- AboutPage/AboutPage.cs | 133 ++++-- SetupWizard/DialogPage.cs | 2 +- StaticData/Icons/fa-link_16.png | Bin 0 -> 299 bytes StaticData/License/agg-sharp.txt | 23 + StaticData/License/clipper.txt | 32 ++ StaticData/License/license.json | 18 + StaticData/License/matterslice.txt | 661 +++++++++++++++++++++++++++++ StaticData/License/opentk.txt | 52 +++ 8 files changed, 884 insertions(+), 37 deletions(-) create mode 100644 StaticData/Icons/fa-link_16.png create mode 100644 StaticData/License/agg-sharp.txt create mode 100644 StaticData/License/clipper.txt create mode 100644 StaticData/License/license.json create mode 100644 StaticData/License/matterslice.txt create mode 100644 StaticData/License/opentk.txt diff --git a/AboutPage/AboutPage.cs b/AboutPage/AboutPage.cs index 51b7334ce..acc38b4a6 100644 --- a/AboutPage/AboutPage.cs +++ b/AboutPage/AboutPage.cs @@ -27,14 +27,19 @@ of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ +using System; +using System.Collections.Generic; using System.IO; +using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; using MatterHackers.Agg.UI; using MatterHackers.Localizations; +using MatterHackers.MatterControl.ConfigurationPage; using MatterHackers.MatterControl.ContactForm; using MatterHackers.MatterControl.CustomWidgets; using MatterHackers.VectorMath; +using Newtonsoft.Json; namespace MatterHackers.MatterControl { @@ -113,52 +118,69 @@ namespace MatterHackers.MatterControl HAnchor = HAnchor.Center }); - var infoRow = new FlowLayoutWidget(FlowDirection.TopToBottom) - { - HAnchor = HAnchor.Center |HAnchor.Fit, - Margin = new BorderDouble(top: 20) - }; - contentRow.AddChild(infoRow); - - infoRow.AddChild( - new TextWidget("MatterControl is made possible by the team at MatterHackers and".Localize(), textColor: theme.Colors.PrimaryTextColor, pointSize: theme.FontSize10)); + contentRow.AddChild( + new WrappedTextWidget( + "MatterControl is made possible by the team at MatterHackers and other open source software".Localize() + ":", + pointSize: theme.DefaultFontSize, + textColor: theme.Colors.PrimaryTextColor) + { + HAnchor = HAnchor.Stretch, + Margin = new BorderDouble(0, 15) + }); var originalFontSize = theme.LinkButtonFactory.fontSize; - theme.LinkButtonFactory.fontSize = theme.FontSize10; + theme.LinkButtonFactory.fontSize = theme.DefaultFontSize; - var ossLink = theme.LinkButtonFactory.Generate("other open source software".Localize()); - ossLink.Margin = new BorderDouble(left: 3, top: 3); - ossLink.Cursor = Cursors.Hand; - ossLink.Click += (s, e) => UiThread.RunOnIdle(() => + var licensePanel = new FlowLayoutWidget(FlowDirection.TopToBottom) { - // Show attributes - }); - infoRow.AddChild(ossLink); - - //contentRow.AddChild( - // new ImageWidget( - // AggContext.StaticData.LoadIcon(Path.Combine("..", "Images", "mh-logo.png"), 250, 250)) - // { - // HAnchor = HAnchor.Center, - // Margin = new BorderDouble(0, 25) - // }); - - contentRow.AddChild(new VerticalSpacer()); - - var button = new TextButton("Send Feedback", theme) - { - HAnchor = HAnchor.Center, - VAnchor = VAnchor.Absolute, - BackgroundColor = theme.MinimalShade, - Margin = new BorderDouble(bottom: 20) + HAnchor = HAnchor.Stretch, + VAnchor = VAnchor.Fit, + Margin = new BorderDouble(bottom: 15) }; - button.Click += (s, e) => UiThread.RunOnIdle(() => + + var data = JsonConvert.DeserializeObject>(AggContext.StaticData.ReadAllText(Path.Combine("License", "license.json"))); + + var linkIcon = AggContext.StaticData.LoadIcon("fa-link_16.png", 16, 16, IconColor.Theme); + + foreach (var item in data.OrderBy(i => i.Name)) + { + var linkButton = new IconButton(linkIcon, theme); + linkButton.Click += (s, e) => UiThread.RunOnIdle(() => + { + ApplicationController.Instance.LaunchBrowser(item.Url); + }); + + var section = new SectionWidget(item.Title ?? item.Name, new LazyLicenseText(item.Name, theme), theme, linkButton, expanded: false) + { + HAnchor = HAnchor.Stretch + }; + licensePanel.AddChild(section); + } + + var scrollable = new ScrollableWidget(autoScroll: true) + { + HAnchor = HAnchor.Stretch, + VAnchor = VAnchor.Stretch, + Margin = new BorderDouble(bottom: 10), + Border = new BorderDouble(top: 1), + BorderColor = new Color(theme.Colors.SecondaryTextColor, 50) + }; + scrollable.ScrollArea.HAnchor = HAnchor.Stretch; + scrollable.AddChild(licensePanel); + contentRow.AddChild( scrollable); + + var feedbackButton = new TextButton("Send Feedback", theme) + { + BackgroundColor = theme.SlightShade, + HAnchor = HAnchor.Absolute, + }; + feedbackButton.Click += (s, e) => UiThread.RunOnIdle(() => { ContactFormWindow.Open(); }); - contentRow.AddChild(button); + this.AddPageAction(feedbackButton); var siteLink = theme.LinkButtonFactory.Generate("www.matterhackers.com"); siteLink.HAnchor = HAnchor.Center; @@ -186,5 +208,44 @@ namespace MatterHackers.MatterControl theme.LinkButtonFactory.fontSize = originalFontSize; } + + private class LazyLicenseText : GuiWidget + { + private string sourceName; + private ThemeConfig theme; + + public LazyLicenseText(string sourceName, ThemeConfig theme) + { + this.sourceName = sourceName; + this.theme = theme; + + this.HAnchor = HAnchor.Stretch; + this.VAnchor = VAnchor.Fit; + this.MinimumSize = new Vector2(0, 10); + } + + public override void OnLoad(EventArgs args) + { + string filePath = Path.Combine("License", $"{sourceName}.txt"); + if (AggContext.StaticData.FileExists(filePath)) + { + string content = AggContext.StaticData.ReadAllText(filePath); + + this.AddChild(new WrappedTextWidget(content, theme.DefaultFontSize, textColor: theme.Colors.PrimaryTextColor) + { + HAnchor = HAnchor.Stretch + }); + } + + base.OnLoad(args); + } + } + + private class LibraryLicense + { + public string Url { get; set; } + public string Name { get; set; } + public string Title { get; set; } + } } } \ No newline at end of file diff --git a/SetupWizard/DialogPage.cs b/SetupWizard/DialogPage.cs index fc578f018..501b3a200 100644 --- a/SetupWizard/DialogPage.cs +++ b/SetupWizard/DialogPage.cs @@ -146,7 +146,7 @@ namespace MatterHackers.MatterControl set => headerLabel.Text = value; } - public void AddPageAction(Button button) + public void AddPageAction(GuiWidget button) { button.Margin = new BorderDouble(right: ApplicationController.Instance.Theme.ButtonSpacing.Left); footerRow.AddChild(button); diff --git a/StaticData/Icons/fa-link_16.png b/StaticData/Icons/fa-link_16.png new file mode 100644 index 0000000000000000000000000000000000000000..839292e9301de6a641e1bdc7a189b003c251ed88 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr z;4JWnEM{QfI|Ravq8eTe3=9mCC9V-A!TD(=<%vb93~dIow%h94C& zr!p`wtnhSk46*RPd&!WC$xxv6VMptY8yOqB6e<`F-o8=Mru)sVyMj+pU$HFCNhkGt z{e%V|qo~)-{SFCgiIYAA&rA~Y-4b|8NIJPyG4I79@l985BxkQ#_~ObHhfOh$qE0dB z&fBs0#sisfX;JwFk1UT_D0;6vSY5cZ*MB2#NX-#ut!oNLdvgsAiM~wP+tK#w*lfpB y*V&|c*1b(-|I2C4y`nQO>1C(%pLnMij2BoH44J;>$TBc6FnGH9xvX25uJs literal 0 HcmV?d00001 diff --git a/StaticData/License/agg-sharp.txt b/StaticData/License/agg-sharp.txt new file mode 100644 index 000000000..e1332d5d6 --- /dev/null +++ b/StaticData/License/agg-sharp.txt @@ -0,0 +1,23 @@ +Copyright (c) 2014, MatterHackers, Inc. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, this + list of conditions and the following disclaimer in the documentation and/or + other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/StaticData/License/clipper.txt b/StaticData/License/clipper.txt new file mode 100644 index 000000000..1dd713cf8 --- /dev/null +++ b/StaticData/License/clipper.txt @@ -0,0 +1,32 @@ +/******************************************************************************* +* * +* Author : Angus Johnson * +* Version : 6.2.1 * +* Date : 31 October 2014 * +* Website : http://www.angusj.com * +* Copyright : Angus Johnson 2010-2014 * +* * +* License: * +* Use, modification & distribution is subject to Boost Software License Ver 1. * +* http://www.boost.org/LICENSE_1_0.txt * +* * +* Attributions: * +* The code in this library is an extension of Bala Vatti's clipping algorithm: * +* "A generic solution to polygon clipping" * +* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. * +* http://portal.acm.org/citation.cfm?id=129906 * +* * +* Computer graphics and geometric modeling: implementation and algorithms * +* By Max K. Agoston * +* Springer; 1 edition (January 4, 2005) * +* http://books.google.com/books?q=vatti+clipping+agoston * +* * +* See also: * +* "Polygon Offsetting by Computing Winding Numbers" * +* Paper no. DETC2005-85513 pp. 565-575 * +* ASME 2005 International Design Engineering Technical Conferences * +* and Computers and Information in Engineering Conference (IDETC/CIE2005) * +* September 24-28, 2005 , Long Beach, California, USA * +* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf * +* * +*******************************************************************************/ \ No newline at end of file diff --git a/StaticData/License/license.json b/StaticData/License/license.json new file mode 100644 index 000000000..fcf75bb14 --- /dev/null +++ b/StaticData/License/license.json @@ -0,0 +1,18 @@ +[ + { + "Name": "Clipper", + "Url": "https://sourceforge.net/projects/polyclipping/?source=directory" + }, + { + "Name": "MatterSlice", + "Url": "https://github.com/MatterHackers/MatterSlice" + }, + { + "Name": "OpenTK", + "Url": "https://github.com/opentk/opentk" + }, + { + "Name": "agg-sharp", + "Url": "https://github.com/MatterHackers/agg-sharp" + }, +] \ No newline at end of file diff --git a/StaticData/License/matterslice.txt b/StaticData/License/matterslice.txt new file mode 100644 index 000000000..e73e55b56 --- /dev/null +++ b/StaticData/License/matterslice.txt @@ -0,0 +1,661 @@ +GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file diff --git a/StaticData/License/opentk.txt b/StaticData/License/opentk.txt new file mode 100644 index 000000000..8dbd30700 --- /dev/null +++ b/StaticData/License/opentk.txt @@ -0,0 +1,52 @@ +The Open Toolkit library license + +Copyright (c) 2006 - 2014 Stefanos Apostolopoulos for the Open Toolkit library. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + + +Third parties + + +OpenTK.Platform.Windows and OpenTK.Platform.X11 include portions of the Mono class library. These portions are covered by the following license: + +Copyright (c) 2004 Novell, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + +OpenTK.Compatibility includes portions of the Tao Framework library (Tao.OpenGl, Tao.OpenAl and Tao.Platform.Windows.SimpleOpenGlControl). These portions are covered by the following license: + +Copyright �2003-2007 Tao Framework Team +http://www.taoframework.com +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + +OpenTK.Half offers Half-to-Single and Single-to-Half conversions based on OpenEXR source code, which is covered by the following license: + +Copyright (c) 2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: +* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. +* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. +* Neither the name of Industrial Light & Magic nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From 8cf1be9c24c63583412da38041becdd83de47b39 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 13 Mar 2018 21:02:02 -0700 Subject: [PATCH 3/6] Update tab pointers on removal - Issue MatterHackers/MCCentral#2853 Revise Tab logic to prevent this anomaly --- PartPreviewWindow/Tabs.cs | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/PartPreviewWindow/Tabs.cs b/PartPreviewWindow/Tabs.cs index ff4053079..09241180c 100644 --- a/PartPreviewWindow/Tabs.cs +++ b/PartPreviewWindow/Tabs.cs @@ -117,14 +117,23 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - internal void RemoveTab(ITab tab) + internal virtual void RemoveTab(ITab tab) { _allTabs.Remove(tab); TabBar.ActionArea.RemoveChild(tab as GuiWidget); this.TabContainer.RemoveChild(tab.TabContent); - ActiveTab = _allTabs.LastOrDefault(); + if (tab is ChromeTab chromeTab) + { + // Activate next or last tab + ActiveTab = chromeTab.NextTab ?? _allTabs.LastOrDefault(); + } + else + { + // Activate last tab + ActiveTab = _allTabs.LastOrDefault(); + } } private ITab _activeTab; @@ -228,6 +237,28 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } + internal override void RemoveTab(ITab tab) + { + base.RemoveTab(tab); + + // Update pointers - collapse out removed tab + if (tab is ChromeTab removedTab) + { + var tabA = removedTab.PreviousTab; + var tabB = removedTab.NextTab; + + if (tabA != null) + { + tabA.NextTab = tabB; + } + + if (tabB != null) + { + tabB.PreviousTab = tabA; + } + } + } + private async void ChromeTab_CloseClicked(object sender, EventArgs e) { if (sender is ITab tab From 9d66980bd209e5ff544beca0c561bbc0de64846f Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 14 Mar 2018 09:02:05 -0700 Subject: [PATCH 4/6] Latest agg-sharp - StoreStream --- Submodules/agg-sharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 3598e1ff4..f72d0f967 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 3598e1ff4b365c81ca52243afebd37e6a8cb6c87 +Subproject commit f72d0f967b8de4511265ba3d45e178144c4dbca6 From 4b94c63ec4b7bdda3dbf5647f2d0b0e0b42b462a Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Tue, 13 Mar 2018 18:20:27 -0700 Subject: [PATCH 5/6] Made the hole littler --- TextCreator/Braille/BrailleObject3D.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TextCreator/Braille/BrailleObject3D.cs b/TextCreator/Braille/BrailleObject3D.cs index d9f91882a..1c971797a 100644 --- a/TextCreator/Braille/BrailleObject3D.cs +++ b/TextCreator/Braille/BrailleObject3D.cs @@ -206,7 +206,7 @@ namespace MatterHackers.MatterControl.DesignTools if (AddHook) { // x 10 to make it smoother - double edgeWidth = 2; + double edgeWidth = 3; double height = basePlate.ZSize(); IVertexSource leftSideObject = new RoundedRect(0, 0, height / 2, height, 0) { From eae2f773e6eb70a377fc7d52bfa766a6473631b2 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Wed, 14 Mar 2018 15:00:10 -0700 Subject: [PATCH 6/6] Put in clean nozzle page Added IVertexSource get weighted center refactoring --- .../PrintLeveling/InstructionsPage.cs | 15 +++++------ .../PrintLeveling/LevelWizard3Point.cs | 8 +++++- .../PrintLeveling/LevelWizard7PointRadial.cs | 7 ++++- .../PrintLeveling/LevelWizardMesh.cs | 7 ++++- .../PrintLeveling/LevelingStrings.cs | 21 +++++++-------- .../PrintLeveling/PrintLevelPages.cs | 24 ++++++++++++++++++ .../PrintLeveling/ProbeCalibrationWizard.cs | 3 +++ CustomWidgets/DockingTabControl.cs | 2 +- DesignTools/Operations/Align.cs | 10 ++++---- DesignTools/Operations/SetCenter.cs | 4 +-- .../Io/MacroProcessingStream.cs | 2 +- .../SlicerMapping/MappingClasses.cs | 1 + .../SlicerMapping/SliceEngineMapping.cs | 1 + StaticData/Images/Macros/clean_nozzle.png | Bin 0 -> 53923 bytes StaticData/SliceSettings/Layouts.txt | 1 + StaticData/SliceSettings/Properties.json | 8 ++++++ Submodules/agg-sharp | 2 +- TextCreator/Braille/BrailleObject3D.cs | 2 +- 18 files changed, 83 insertions(+), 35 deletions(-) create mode 100644 StaticData/Images/Macros/clean_nozzle.png diff --git a/ConfigurationPage/PrintLeveling/InstructionsPage.cs b/ConfigurationPage/PrintLeveling/InstructionsPage.cs index d0f9ead83..968bb02c4 100644 --- a/ConfigurationPage/PrintLeveling/InstructionsPage.cs +++ b/ConfigurationPage/PrintLeveling/InstructionsPage.cs @@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl topToBottomControls = new FlowLayoutWidget(FlowDirection.TopToBottom); topToBottomControls.Padding = new BorderDouble(3); - topToBottomControls.HAnchor |= HAnchor.Left; + topToBottomControls.HAnchor = HAnchor.Stretch; topToBottomControls.VAnchor |= VAnchor.Top; AddTextField(instructionsText, 10); @@ -61,15 +61,12 @@ namespace MatterHackers.MatterControl GuiWidget spacer = new GuiWidget(10, pixelsFromLast); topToBottomControls.AddChild(spacer); - EnglishTextWrapping wrapper = new EnglishTextWrapping(12); - string wrappedInstructions = wrapper.InsertCRs(instructionsText, 400); - string wrappedInstructionsTabsToSpaces = wrappedInstructions.Replace("\t", " "); + string wrappedInstructionsTabsToSpaces = instructionsText.Replace("\t", " "); - topToBottomControls.AddChild( - new TextWidget(wrappedInstructionsTabsToSpaces, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 12 * GuiWidget.DeviceScale) - { - HAnchor = HAnchor.Left - }); + topToBottomControls.AddChild(new WrappedTextWidget(wrappedInstructionsTabsToSpaces) + { + HAnchor = HAnchor.Stretch + }); } } } \ No newline at end of file diff --git a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs index 95db5aa40..a386cc2de 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard3Point.cs @@ -63,6 +63,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling printLevelWizard.AddPage(new FirstPageInstructions(printer, levelingStrings.OverviewText, levelingStrings.WelcomeText(3, 3))); + bool useZProbe = printer.Settings.Helpers.UseZProbe(); + if (!useZProbe) + { + printLevelWizard.AddPage(new CleanExtruderInstructionPage(printer, "Check Nozzle".Localize(), levelingStrings.CleanExtruder)); + } + // To make sure the bed is at the correct temp, put in a filament selection page. bool hasHeatedBed = printer.Settings.GetValue(SettingsKey.has_heated_bed); if (hasHeatedBed) @@ -70,7 +76,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling string filamentSelectionPage = "{0}\n\n{1}".FormatWith(levelingStrings.materialPageInstructions1, levelingStrings.materialPageInstructions2); printLevelWizard.AddPage(new SelectMaterialPage(printer, levelingStrings.materialStepText, filamentSelectionPage)); } - bool useZProbe = printer.Settings.Helpers.UseZProbe(); + printLevelWizard.AddPage(new HomePrinterPage(printer, printLevelWizard, levelingStrings.HomingPageStepText, levelingStrings.HomingPageInstructions(useZProbe), diff --git a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs index 085177f0d..9cdacd8bf 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs @@ -117,6 +117,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling printLevelWizard.AddPage(new FirstPageInstructions(printer, levelingStrings.OverviewText, levelingStrings.WelcomeText(numberOfRadialSamples + 1, 5))); + bool useZProbe = printer.Settings.Helpers.UseZProbe(); + if (!useZProbe) + { + printLevelWizard.AddPage(new CleanExtruderInstructionPage(printer, "Check Nozzle".Localize(), levelingStrings.CleanExtruder)); + } + // To make sure the bed is at the correct temp, put in a filament selection page. bool hasHeatedBed = printer.Settings.GetValue(SettingsKey.has_heated_bed); if (hasHeatedBed) @@ -124,7 +130,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling string filamentSelectionPage = "{0}\n\n{1}".FormatWith(levelingStrings.materialPageInstructions1, levelingStrings.materialPageInstructions2); printLevelWizard.AddPage(new SelectMaterialPage(printer, levelingStrings.materialStepText, filamentSelectionPage)); } - bool useZProbe = printer.Settings.Helpers.UseZProbe(); printLevelWizard.AddPage(new HomePrinterPage(printer, printLevelWizard, levelingStrings.HomingPageStepText, levelingStrings.HomingPageInstructions(useZProbe), diff --git a/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs b/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs index 3d7d7a35e..2bfa21b5f 100644 --- a/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs +++ b/ConfigurationPage/PrintLeveling/LevelWizardMesh.cs @@ -174,6 +174,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling printLevelWizard.AddPage(new FirstPageInstructions(printer, levelingStrings.OverviewText, levelingStrings.WelcomeText(probeCount, 5))); + bool useZProbe = printer.Settings.Helpers.UseZProbe(); + if (!useZProbe) + { + printLevelWizard.AddPage(new CleanExtruderInstructionPage(printer, "Check Nozzle".Localize(), levelingStrings.CleanExtruder)); + } + var printerSettings = printer.Settings; // To make sure the bed is at the correct temp, put in a filament selection page. @@ -183,7 +189,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling string filamentSelectionPage = "{0}\n\n{1}".FormatWith(levelingStrings.materialPageInstructions1, levelingStrings.materialPageInstructions2); printLevelWizard.AddPage(new SelectMaterialPage(printer, levelingStrings.materialStepText, filamentSelectionPage)); } - bool useZProbe = printer.Settings.Helpers.UseZProbe(); printLevelWizard.AddPage(new HomePrinterPage(printer, printLevelWizard, levelingStrings.HomingPageStepText, levelingStrings.HomingPageInstructions(useZProbe), diff --git a/ConfigurationPage/PrintLeveling/LevelingStrings.cs b/ConfigurationPage/PrintLeveling/LevelingStrings.cs index fbafed4b9..83735563b 100644 --- a/ConfigurationPage/PrintLeveling/LevelingStrings.cs +++ b/ConfigurationPage/PrintLeveling/LevelingStrings.cs @@ -64,8 +64,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling private string sampelAtPoints = "Sample the bed at {0} points".Localize(); private string turnOnLeveling = "Turn auto leveling on".Localize(); private string timeToDone = "We should be done in less than {0} minutes.".Localize(); - private string cleanExtruder = "Note: Be sure the tip of the extruder is clean and the bed is clear.".Localize(); - private string clickNext = "Click 'Next' to continue.".Localize(); + public string CleanExtruder => "Be sure the tip of the extruder is clean and the bed is clear.".Localize(); + public string ClickNext => "Click 'Next' to continue.".Localize(); PrinterSettings printerSettings; public LevelingStrings(PrinterSettings printerSettings) @@ -114,7 +114,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling } else { - return "{0}\n\n{1}:\n\n\t• {2}\n\n{3}\n\n{4}".FormatWith(homingLine1, homingLine1b, homingLine2, homingLine3, clickNext); + return "{0}\n\n{1}:\n\n\t• {2}\n\n{3}\n\n{4}".FormatWith(homingLine1, homingLine1b, homingLine2, homingLine3, ClickNext); } } @@ -153,14 +153,13 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling public string CalibrateProbeWelcomText() { - return "{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}\n\n{5}\n\n{6}".FormatWith( + return "{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}\n\n{5}".FormatWith( this.probeWelcomeLine1, this.homeThePrinter, "Probe the bed at the center".Localize(), "Manually measure the extruder at the center".Localize(), this.WelcomeLine7(1), - this.cleanExtruder, - this.clickNext); + this.ClickNext); } public string WelcomeText(int numberOfSteps, int numberOfMinutes) @@ -172,7 +171,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling if (printerSettings.GetValue(SettingsKey.has_heated_bed)) { - return "{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\t• {4}\n\t• {5}\n\n{6}\n\n{7}\n\n{8}".FormatWith( + return "{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\t• {4}\n\t• {5}\n\n{6}\n\n{7}".FormatWith( this.welcomeLine1, this.selectMaterial, this.homeThePrinter, @@ -180,19 +179,17 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling this.WelcomeLine5(numberOfSteps), this.turnOnLeveling, this.WelcomeLine7(numberOfMinutes), - this.cleanExtruder, - this.clickNext); + this.ClickNext); } else { - return "{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}\n\n{5}\n\n{6}".FormatWith( + return "{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}\n\n{5}".FormatWith( this.welcomeLine1, this.homeThePrinter, this.WelcomeLine5(numberOfSteps), this.turnOnLeveling, this.WelcomeLine7(numberOfMinutes), - this.cleanExtruder, - this.clickNext); + this.ClickNext); } } diff --git a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs index 87f0f4e30..d86b02093 100644 --- a/ConfigurationPage/PrintLeveling/PrintLevelPages.cs +++ b/ConfigurationPage/PrintLeveling/PrintLevelPages.cs @@ -29,10 +29,13 @@ either expressed or implied, of the FreeBSD Project. using MatterControl.Printing; using MatterHackers.Agg; +using MatterHackers.Agg.Font; +using MatterHackers.Agg.Image; using MatterHackers.Agg.UI; using MatterHackers.GCodeVisualizer; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrinterCommunication; +using MatterHackers.MatterControl.PrinterCommunication.Io; using MatterHackers.MatterControl.SlicerConfiguration; using MatterHackers.VectorMath; using System; @@ -49,6 +52,27 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling } } + public class CleanExtruderInstructionPage : InstructionsPage + { + public CleanExtruderInstructionPage(PrinterConfig printer, string title, string body) + : base(printer, title, body) + { + ImageBuffer imageBuffer = MacroProcessingStream.LoadImageAsset(printer.Settings.GetValue("clean_nozzle_image")); + + var levelingStrings = new LevelingStrings(printer.Settings); + + GuiWidget spacer = new GuiWidget(10, 10); + topToBottomControls.AddChild(spacer); + + topToBottomControls.AddChild(new ImageWidget(imageBuffer) + { + HAnchor = HAnchor.Center + }); + + AddTextField(levelingStrings.ClickNext, 10); + } + } + public class SelectMaterialPage : InstructionsPage { public SelectMaterialPage(PrinterConfig printer, string pageDescription, string instructionsText) diff --git a/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs b/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs index a80112c33..a375d5bd8 100644 --- a/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs +++ b/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs @@ -32,6 +32,7 @@ using MatterHackers.Agg; using MatterHackers.Agg.UI; using MatterHackers.Localizations; using MatterHackers.MatterControl.PrinterCommunication; +using MatterHackers.MatterControl.PrinterCommunication.Io; using MatterHackers.MatterControl.SlicerConfiguration; using MatterHackers.MeshVisualizer; using MatterHackers.VectorMath; @@ -71,6 +72,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling printLevelWizard.AddPage(new FirstPageInstructions(printer, "Probe Calibration Overview".Localize(), levelingStrings.CalibrateProbeWelcomText())); + printLevelWizard.AddPage(new CleanExtruderInstructionPage(printer, "Check Nozzle".Localize(), levelingStrings.CleanExtruder)); + bool useZProbe = printer.Settings.Helpers.UseZProbe(); printLevelWizard.AddPage(new HomePrinterPage(printer, printLevelWizard, levelingStrings.HomingPageStepText, diff --git a/CustomWidgets/DockingTabControl.cs b/CustomWidgets/DockingTabControl.cs index 5a739f04b..abbfa5de2 100644 --- a/CustomWidgets/DockingTabControl.cs +++ b/CustomWidgets/DockingTabControl.cs @@ -237,7 +237,7 @@ namespace MatterHackers.MatterControl.CustomWidgets printer, Affine.NewRotation(MathHelper.DegreesToRadians(-90))); - var textBounds = rotatedLabel.Bounds(); + var textBounds = rotatedLabel.GetBounds(); var bounds = new RectangleDouble(printer.TypeFaceStyle.DescentInPixels, textBounds.Bottom, printer.TypeFaceStyle.AscentInPixels, textBounds.Top); rotatedLabel.Transform = ((Affine)rotatedLabel.Transform) * Affine.NewTranslation(new Vector2(-printer.TypeFaceStyle.DescentInPixels, -bounds.Bottom)); diff --git a/DesignTools/Operations/Align.cs b/DesignTools/Operations/Align.cs index 2d9ed83d4..85c37e1b5 100644 --- a/DesignTools/Operations/Align.cs +++ b/DesignTools/Operations/Align.cs @@ -204,7 +204,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations public Align2D(IVertexSource item, Side2D boundingFacesToAlign, Vector2 positionToAlignTo, string name = "") { - var bounds = item.Bounds(); + var bounds = item.GetBounds(); if (IsSet(boundingFacesToAlign, Side2D.Left, Side2D.Right)) { @@ -232,19 +232,19 @@ namespace MatterHackers.MatterControl.DesignTools.Operations Vector2 positionToAlignTo = new Vector2(); if (IsSet(boundingFacesToAlignTo, Side2D.Left, Side2D.Right)) { - positionToAlignTo.X = objectToAlignTo.Bounds().Left; + positionToAlignTo.X = objectToAlignTo.GetBounds().Left; } if (IsSet(boundingFacesToAlignTo, Side2D.Right, Side2D.Left)) { - positionToAlignTo.X = objectToAlignTo.Bounds().Right; + positionToAlignTo.X = objectToAlignTo.GetBounds().Right; } if (IsSet(boundingFacesToAlignTo, Side2D.Bottom, Side2D.Top)) { - positionToAlignTo.Y = objectToAlignTo.Bounds().Bottom; + positionToAlignTo.Y = objectToAlignTo.GetBounds().Bottom; } if (IsSet(boundingFacesToAlignTo, Side2D.Top, Side2D.Bottom)) { - positionToAlignTo.Y = objectToAlignTo.Bounds().Top; + positionToAlignTo.Y = objectToAlignTo.GetBounds().Top; } return positionToAlignTo + extraOffset; diff --git a/DesignTools/Operations/SetCenter.cs b/DesignTools/Operations/SetCenter.cs index f26e559d6..0ee111df0 100644 --- a/DesignTools/Operations/SetCenter.cs +++ b/DesignTools/Operations/SetCenter.cs @@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations public SetCenter2D(IVertexSource item, Vector2 position) { - Transform = Affine.NewTranslation(position - item.Bounds().Center); + Transform = Affine.NewTranslation(position - item.GetBounds().Center); VertexSource = item; } @@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations public SetCenter2D(IVertexSource item, Vector2 offset, bool onX = true, bool onY = true) { - var center = item.Bounds().Center; + var center = item.GetBounds().Center; Vector2 consideredOffset = Vector2.Zero; // zero out anything we don't want if (onX) diff --git a/PrinterCommunication/Io/MacroProcessingStream.cs b/PrinterCommunication/Io/MacroProcessingStream.cs index 09bd47d2f..94be81ca4 100644 --- a/PrinterCommunication/Io/MacroProcessingStream.cs +++ b/PrinterCommunication/Io/MacroProcessingStream.cs @@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io commandsToRepeat.Clear(); } - public ImageBuffer LoadImageAsset(string uri) + public static ImageBuffer LoadImageAsset(string uri) { string filePath = Path.Combine("Images", "Macros", uri); bool imageOnDisk = false; diff --git a/SlicerConfiguration/SlicerMapping/MappingClasses.cs b/SlicerConfiguration/SlicerMapping/MappingClasses.cs index b60ebfd15..78e4a112f 100644 --- a/SlicerConfiguration/SlicerMapping/MappingClasses.cs +++ b/SlicerConfiguration/SlicerMapping/MappingClasses.cs @@ -67,6 +67,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new AsPercentOfReferenceOrDirect("unload_filament_length_over_six", "", "unload_filament_length", 1.0/6.0, false), new ScaledSingleNumber("load_filament_speed", "load_filament_speed", 60), new MappedSetting("trim_image", "trim_image"), + new MappedSetting("clean_nozzle_image", "clean_nozzle_image"), new MappedSetting("insert_image", "insert_image"), new MappedSetting("running_clean_image", "running_clean_image"), }; diff --git a/SlicerConfiguration/SlicerMapping/SliceEngineMapping.cs b/SlicerConfiguration/SlicerMapping/SliceEngineMapping.cs index 4bdddd50c..695bee686 100644 --- a/SlicerConfiguration/SlicerMapping/SliceEngineMapping.cs +++ b/SlicerConfiguration/SlicerMapping/SliceEngineMapping.cs @@ -107,6 +107,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration SettingsKey.ip_port, "load_filament_length", "trim_image", + "clean_nozzle_image", "insert_image", "running_clean_image", "unload_filament_length", diff --git a/StaticData/Images/Macros/clean_nozzle.png b/StaticData/Images/Macros/clean_nozzle.png new file mode 100644 index 0000000000000000000000000000000000000000..be75b9080b2038eda2e5a981b82463ab2079ed4f GIT binary patch literal 53923 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 literal 0 HcmV?d00001 diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index 28a44ee37..a63de5c43 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -169,6 +169,7 @@ Printer z_probe_z_offset z_servo_depolyed_angle z_servo_retracted_angle + clean_nozzle_image Hardware Hardware has_fan diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index 095681271..9b4384bab 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -78,6 +78,14 @@ "ShowIfSet": "!sla_printer", "DefaultValue": "100%" }, + { + "SlicerConfigName": "clean_nozzle_image", + "PresentationName": "Clean Nozzle Image", + "HelpText": "The image to show when explaining leveling and calibration.", + "DataEditType": "WIDE_STRING", + "ShowIfSet": "!sla_printer", + "DefaultValue": "clean_nozzle.png" + }, { "SlicerConfigName": "trim_image", "PresentationName": "Trim Image", diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index f72d0f967..b1de779ab 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit f72d0f967b8de4511265ba3d45e178144c4dbca6 +Subproject commit b1de779ab7eef1c5a29ec4bb5a2198ae7385197e diff --git a/TextCreator/Braille/BrailleObject3D.cs b/TextCreator/Braille/BrailleObject3D.cs index 1c971797a..21546ac3d 100644 --- a/TextCreator/Braille/BrailleObject3D.cs +++ b/TextCreator/Braille/BrailleObject3D.cs @@ -223,7 +223,7 @@ namespace MatterHackers.MatterControl.DesignTools { ResolutionScale = 10 }; - holeObject = new SetCenter2D(holeObject, cicleObject.Bounds().Center); + holeObject = new SetCenter2D(holeObject, cicleObject.GetBounds().Center); IVertexSource hookPath = leftSideObject.Plus(cicleObject); hookPath = hookPath.Minus(holeObject);