diff --git a/CustomWidgets/PrintingWindow.cs b/CustomWidgets/PrintingWindow.cs index bccbe1a44..df4f554e0 100644 --- a/CustomWidgets/PrintingWindow.cs +++ b/CustomWidgets/PrintingWindow.cs @@ -64,12 +64,12 @@ namespace MatterHackers.MatterControl.CustomWidgets public override void UpdateTemperatures() { double targetValue = PrinterConnectionAndCommunication.Instance.TargetBedTemperature; - double actualValue = PrinterConnectionAndCommunication.Instance.ActualBedTemperature; + double actualValue = Math.Max(0, PrinterConnectionAndCommunication.Instance.ActualBedTemperature); progressBar.RatioComplete = targetValue != 0 ? actualValue / targetValue : 1; - this.actualTemp.Text = $"{actualValue:0.#}°"; - this.targetTemp.Text = $"{targetValue:0.#}°"; + this.actualTemp.Text = $"{actualValue:0}".PadLeft(3, (char)0x2007) + "°"; // put in padding spaces to make it at least 3 characters + this.targetTemp.Text = $"{targetValue:0}".PadLeft(3, (char)0x2007) + "°"; // put in padding spaces to make it at least 3 characters } } @@ -91,12 +91,12 @@ namespace MatterHackers.MatterControl.CustomWidgets public override void UpdateTemperatures() { double targetValue = PrinterConnectionAndCommunication.Instance.GetTargetExtruderTemperature(extruderIndex); - double actualValue = PrinterConnectionAndCommunication.Instance.GetActualExtruderTemperature(extruderIndex); + double actualValue = Math.Max(0, PrinterConnectionAndCommunication.Instance.GetActualExtruderTemperature(extruderIndex)); progressBar.RatioComplete = targetValue != 0 ? actualValue / targetValue : 1; - this.actualTemp.Text = $"{actualValue:0.#}°"; - this.targetTemp.Text = $"{targetValue:0.#}°"; + this.actualTemp.Text = $"{actualValue:0}".PadLeft(3, (char)0x2007) + "°"; // put in padding spaces to make it at least 3 characters + this.targetTemp.Text = $"{targetValue:0}".PadLeft(3, (char)0x2007) + "°"; // put in padding spaces to make it at least 3 characters } } diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 2554b06f1..5f1a8da09 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 2554b06f10df85926c35ec018d450f2a4cece199 +Subproject commit 5f1a8da0909640654d4faf953d5efd73d121ea82 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 5ce6224fe..5456a59e4 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 5ce6224fed7caf5d6c2faf5d409f758c80c46118 +Subproject commit 5456a59e4c2b96d858be28f9b60baa7a45466f0c