mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-07 15:07:28 -06:00
updated variable names
This commit is contained in:
parent
4067f5216e
commit
fd3233dba5
1 changed files with 33 additions and 25 deletions
|
@ -1,3 +1,13 @@
|
||||||
|
# Cura PostProcessingPlugin
|
||||||
|
# Author: Mathias Lyngklip Kjeldgaard
|
||||||
|
# Date: July 31, 2019
|
||||||
|
# Modified: ---
|
||||||
|
|
||||||
|
# Description: This plugin displayes the remaining time on the LCD of the printer
|
||||||
|
# using the estimated print-time generated by Cura.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
from ..Script import Script
|
from ..Script import Script
|
||||||
|
|
||||||
|
@ -22,37 +32,36 @@ class DisplayRemainingTimeOnLCD(Script):
|
||||||
"TurnOn":
|
"TurnOn":
|
||||||
{
|
{
|
||||||
"label": "Enable",
|
"label": "Enable",
|
||||||
"description": "When enabled, It will write Time Left HHMMSS on the display",
|
"description": "When enabled, It will write Time Left: HHMMSS on the display",
|
||||||
"type": "bool",
|
"type": "bool",
|
||||||
"default_value": true
|
"default_value": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}"""
|
}"""
|
||||||
|
|
||||||
def execute(self, data):
|
def execute(self, data):
|
||||||
if self.getSettingValueByKey("TurnOn"):
|
if self.getSettingValueByKey("TurnOn"):
|
||||||
TotalTime = 0 # Var for total time
|
total_time = 0
|
||||||
TotalTimeString = "" # Var for the string we insert
|
total_time_string = ""
|
||||||
for layer in data:
|
for layer in data:
|
||||||
layer_index = data.index(layer)
|
layer_index = data.index(layer)
|
||||||
lines = layer.split("\n")
|
lines = layer.split("\n")
|
||||||
for line in lines:
|
for line in lines:
|
||||||
if line.startswith(";TIME:"):
|
if line.startswith(";TIME:"):
|
||||||
# At this point, we have found a line in the GCODE with ";TIME:"
|
# At this point, we have found a line in the GCODE with ";TIME:"
|
||||||
# which is the indication of TotalTime. Looks like: ";TIME:1337", where
|
# which is the indication of total_time. Looks like: ";TIME:1337", where
|
||||||
# 1337 is the total print time in seconds.
|
# 1337 is the total print time in seconds.
|
||||||
line_index = lines.index(line) # We take a hold of that line
|
line_index = lines.index(line) # We take a hold of that line
|
||||||
minString = re.split(":", line) # Then we split it, so we can get the number
|
split_string = re.split(":", line) # Then we split it, so we can get the number
|
||||||
|
|
||||||
StringMedTal = "{}".format(minString[1]) # Here we insert that number from the
|
string_with_numbers = "{}".format(split_string[1]) # Here we insert that number from the
|
||||||
# list into a string.
|
# list into a string.
|
||||||
|
total_time = int(string_with_numbers) # Only to contert it to a int.
|
||||||
|
|
||||||
TotalTime = int(StringMedTal) # Only to contert it to a int.
|
m, s = divmod(total_time, 60) # Math to calculate
|
||||||
|
|
||||||
m, s = divmod(TotalTime, 60) # Math to calculate
|
|
||||||
h, m = divmod(m, 60) # hours, minutes and seconds.
|
h, m = divmod(m, 60) # hours, minutes and seconds.
|
||||||
TotalTimeString = "{:d}h{:02d}m{:02d}s".format(h, m, s) # Now we put it into the string
|
total_time_string = "{:d}h{:02d}m{:02d}s".format(h, m, s) # Now we put it into the string
|
||||||
lines[line_index] = "M117 Time Left: {}".format(TotalTimeString) # And print that string instead of the original one
|
lines[line_index] = "M117 Time Left: {}".format(total_time_string) # And print that string instead of the original one
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -63,19 +72,18 @@ class DisplayRemainingTimeOnLCD(Script):
|
||||||
# This time represents the time the printer have printed. So with some math;
|
# This time represents the time the printer have printed. So with some math;
|
||||||
# totalTime - printTime = RemainingTime.
|
# totalTime - printTime = RemainingTime.
|
||||||
line_index = lines.index(line) # We get a hold of the line
|
line_index = lines.index(line) # We get a hold of the line
|
||||||
myList = re.split(":", line) # Again, we split at ":" so we can get the number
|
list_split = re.split(":", line) # Again, we split at ":" so we can get the number
|
||||||
StringMedTal = "{}".format(myList[1]) # Then we put that number from the list, into a string
|
string_with_numbers = "{}".format(list_split[1]) # Then we put that number from the list, into a string
|
||||||
|
|
||||||
currentTime = float(StringMedTal) # This time we convert to a float, as the line looks something like:
|
current_time = float(string_with_numbers) # This time we convert to a float, as the line looks something like:
|
||||||
# ;TIME_ELAPSED:1234.6789
|
# ;TIME_ELAPSED:1234.6789
|
||||||
# which is total time in seconds
|
# which is total time in seconds
|
||||||
|
|
||||||
timeLeft = TotalTime - currentTime # Here we calculate remaining time
|
time_left = total_time - current_time # Here we calculate remaining time
|
||||||
|
m1, s1 = divmod(time_left, 60) # And some math to get the total time in seconds into
|
||||||
m1, s1 = divmod(timeLeft, 60) # And some math to get the total time in seconds into
|
|
||||||
h1, m1 = divmod(m1, 60) # the right format. (HH,MM,SS)
|
h1, m1 = divmod(m1, 60) # the right format. (HH,MM,SS)
|
||||||
currentTimeString = "{:d}h{:2d}m{:2d}s".format(int(h1), int(m1), int(s1)) # Here we create the string holding our time
|
current_time_string = "{:d}h{:2d}m{:2d}s".format(int(h1), int(m1), int(s1)) # Here we create the string holding our time
|
||||||
lines[line_index] = "M117 Time Left: {}".format(currentTimeString) # And now insert that into the GCODE
|
lines[line_index] = "M117 Time Left: {}".format(current_time_string) # And now insert that into the GCODE
|
||||||
|
|
||||||
|
|
||||||
# Here we are OUT of the second for-loop
|
# Here we are OUT of the second for-loop
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue