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

Made the numbers padded with a FIGURE SPACE.

Browse source
This commit is contained in:
Lars Brubaker 2017-02-24 13:29:10 -08:00
parent 19b5938c76
commit 382d8cd690
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
CustomWidgets/PrintingWindow.cs
View file

@ -64,12 +64,14 @@ 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}°";
var actual = $"{actualValue:0}";
this.actualTemp.Text = actual.PadLeft(Math.Max(0, 4 - actual.Length), ' ') + "°"; // put in padding spaces to make it at least 3 characters
var target = $"{targetValue:0}";
this.targetTemp.Text = target.PadLeft(Math.Max(0, 4 - target.Length), ' ') + "°"; // put in padding spaces to make it at least 3 characters
}
}
@ -91,12 +93,14 @@ 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}°";
var actual = $"{actualValue:0}";
this.actualTemp.Text = actual.PadLeft(Math.Max(0, 4 - actual.Length), ' ') + "°"; // put in padding spaces to make it at least 3 characters
var target = $"{targetValue:0}";
this.targetTemp.Text = target.PadLeft(Math.Max(0, 4 - target.Length), ' ') + "°"; // put in padding spaces to make it at least 3 characters
}
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 5ce6224fed7caf5d6c2faf5d409f758c80c46118
Subproject commit 5456a59e4c2b96d858be28f9b60baa7a45466f0c