From 82ff8b5d64cb9f63ee432f35bf282905edca9a40 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 26 Apr 2018 15:51:34 -0700 Subject: [PATCH] Make sure we are on move 10 when the control is set at startup Removing dead code --- CustomWidgets/PrintingWindow/ZAxisControls.cs | 95 ------------------- MatterControl.csproj | 1 - PrinterControls/JogControls.cs | 1 + Submodules/agg-sharp | 2 +- 4 files changed, 2 insertions(+), 97 deletions(-) delete mode 100644 CustomWidgets/PrintingWindow/ZAxisControls.cs diff --git a/CustomWidgets/PrintingWindow/ZAxisControls.cs b/CustomWidgets/PrintingWindow/ZAxisControls.cs deleted file mode 100644 index c43472514..000000000 --- a/CustomWidgets/PrintingWindow/ZAxisControls.cs +++ /dev/null @@ -1,95 +0,0 @@ -/* -Copyright (c) 2017, Lars Brubaker, John Lewin -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. -2. 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 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. - -The views and conclusions contained in the software and documentation are those -of the authors and should not be interpreted as representing official policies, -either expressed or implied, of the FreeBSD Project. -*/ - -using System; -using MatterHackers.Agg; -using MatterHackers.Agg.UI; -using MatterHackers.MatterControl.PrinterCommunication; -using MatterHackers.MatterControl.PrinterControls; -using MatterHackers.MatterControl.SlicerConfiguration; -using static MatterHackers.MatterControl.JogControls; - -namespace MatterHackers.MatterControl.CustomWidgets -{ - public class ZAxisControls : FlowLayoutWidget - { - public ZAxisControls(PrinterConfig printer, ThemeConfig theme, bool smallScreen) : - base(FlowDirection.TopToBottom) - { - this.AddChild(new TextWidget("Z+", pointSize: smallScreen ? 12 : 15, textColor: theme.Colors.PrimaryTextColor) - { - AutoExpandBoundsToText = true, - HAnchor = HAnchor.Center, - Margin = new BorderDouble(bottom: 8) - }); - - this.AddChild(CreateZMoveButton(printer, .1, smallScreen, theme)); - - this.AddChild(CreateZMoveButton(printer, .02, smallScreen, theme)); - - this.AddChild(new ZTuningWidget(printer.Settings, theme) - { - HAnchor = HAnchor.Center | HAnchor.Fit, - Margin = 10 - }); - - this.AddChild(CreateZMoveButton(printer, -.02, smallScreen, theme)); - - this.AddChild(CreateZMoveButton(printer, -.1, smallScreen, theme)); - - this.AddChild(new TextWidget("Z-", pointSize: smallScreen ? 12 : 15, textColor: theme.Colors.PrimaryTextColor) - { - AutoExpandBoundsToText = true, - HAnchor = HAnchor.Center, - Margin = new BorderDouble(top: 9), - }); - - //this.BackgroundColor = new Color(200, 0, 0, 30); - - this.Margin = new BorderDouble(0); - this.Margin = 0; - this.Padding = 3; - this.VAnchor = VAnchor.Fit | VAnchor.Top; - } - - private MoveButton CreateZMoveButton(PrinterConfig printer, double moveAmount, bool smallScreen, ThemeConfig theme) - { - var button = theme.CreateMoveButton(printer, $"{Math.Abs(moveAmount):0.00} mm", PrinterConnection.Axis.Z, printer.Settings.ZSpeed()); - button.MoveAmount = moveAmount; - button.HAnchor = HAnchor.MaxFitOrStretch; - button.VAnchor = VAnchor.Fit; - button.Margin = new BorderDouble(0, 1); - button.Padding = new BorderDouble(15, 7); - if (smallScreen) button.Height = 45; else button.Height = 55; - button.BackgroundColor = theme.Colors.PrimaryAccentColor; - - return button; - } - } -} \ No newline at end of file diff --git a/MatterControl.csproj b/MatterControl.csproj index 08a55955b..d34497aa1 100644 --- a/MatterControl.csproj +++ b/MatterControl.csproj @@ -177,7 +177,6 @@ - diff --git a/PrinterControls/JogControls.cs b/PrinterControls/JogControls.cs index de28e4bc6..5128deef9 100644 --- a/PrinterControls/JogControls.cs +++ b/PrinterControls/JogControls.cs @@ -155,6 +155,7 @@ namespace MatterHackers.MatterControl moveRadioButtons.AddChild(tooBigForBabyStepping); tenButton.Checked = true; + SetXYZMoveAmount(10); moveRadioButtons.Margin = new BorderDouble(0, 3); setMoveDistanceControl.AddChild(moveRadioButtons); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 8eae9ecc8..44b1f77ab 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 8eae9ecc845c22222380d6e149c0c4dd97521a04 +Subproject commit 44b1f77abed3748b62ac082d190a6e2df4df2fe6