From 007f7468f06fdd4ee17ffc7991f78e44691d1bac Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 23 Jun 2017 17:00:44 -0700 Subject: [PATCH] Made line chopping only happen when printing. --- PrinterCommunication/Io/BabyStepsStream.cs | 4 ++-- PrinterCommunication/PrinterConnection.cs | 4 ++-- StaticData/Translations/Master.txt | 3 +++ Submodules/agg-sharp | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/PrinterCommunication/Io/BabyStepsStream.cs b/PrinterCommunication/Io/BabyStepsStream.cs index 84a13c29b..3911f1b1b 100644 --- a/PrinterCommunication/Io/BabyStepsStream.cs +++ b/PrinterCommunication/Io/BabyStepsStream.cs @@ -42,7 +42,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io private OffsetStream offsetStream; private EventHandler unregisterEvents; - public BabyStepsStream(GCodeStream internalStream) + public BabyStepsStream(GCodeStream internalStream, double startingMaxLength = 1) : base(null) { ActiveSliceSettings.SettingChanged.RegisterEvent((s, e) => @@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io }, ref unregisterEvents); - maxLengthStream = new MaxLengthStream(internalStream, 1); + maxLengthStream = new MaxLengthStream(internalStream, startingMaxLength); offsetStream = new OffsetStream(maxLengthStream, new Vector3(0, 0, ActiveSliceSettings.Instance.GetValue(SettingsKey.baby_step_z_offset))); base.internalStream = offsetStream; } diff --git a/PrinterCommunication/PrinterConnection.cs b/PrinterCommunication/PrinterConnection.cs index a45de1dcc..42591d354 100644 --- a/PrinterCommunication/PrinterConnection.cs +++ b/PrinterCommunication/PrinterConnection.cs @@ -2118,7 +2118,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication // If the serial port isn't available (i.e. the specified port name wasn't found in GetPortNames()) or the serial // port is already opened in another instance or process, then report the connection problem back to the user connectionFailureMessage = (serialPortIsAlreadyOpen ? - this.ComPort + " in use".Localize() : + this.ComPort + " " + "in use".Localize() : "Port not found".Localize()); OnConnectionFailed(null); @@ -2298,7 +2298,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication relativeToAbsoluteStream3 = new RelativeToAbsoluteStream(queuedCommandStream2); printLevelingStream4 = new PrintLevelingStream(relativeToAbsoluteStream3, true); waitForTempStream5 = new WaitForTempStream(printLevelingStream4); - babyStepsStream6 = new BabyStepsStream(waitForTempStream5); + babyStepsStream6 = new BabyStepsStream(waitForTempStream5, gcodeFilename == null ? 2000 : 1); if (activePrintTask != null) { // make sure we are in the position we were when we stopped printing diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 1b5122916..02f0b108d 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -4249,3 +4249,6 @@ Translated:Start Threshold: English:End Threshold: Translated:End Threshold: +English:Firmware Version: {0} +Translated:Firmware Version: {0} + diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index b6d5406f8..706ded619 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit b6d5406f869a83f8b6ddc6c47cc8b290bdb2e892 +Subproject commit 706ded619b4dd739dcedba938cbd647bb06bf977