CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extrude panel: Support 5 extruders (#441)

Browse Source
This commit is contained in:
Alfredo Monclus 2022-01-17 03:13:16 -03:00 committed by GitHub
parent 86fc0f9988
commit 8dd5c64006
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ks_includes/KlippyGtk.py
View File

@ -330,4 +330,4 @@ class KlippyGtk:
def formatTemperatureString(self, temp, target):
if (target > temp-2 and target < temp+2) or round(target, 0) == 0:
return str(round(temp, 1)) + "°C" # °C →"
return str(round(temp)) + " → " + str(round(target)) + "°C"
return str(round(temp)) + " °C\n(" + str(round(target)) + ")"

26
panels/extrude.py
View File

@ -24,17 +24,6 @@ class ExtrudePanel(ScreenPanel):
grid = Gtk.Grid()
i = 0
self.current_extruder = self._printer.get_stat("toolhead", "extruder")
for extruder in self._printer.get_tools():
self.labels[extruder] = self._gtk.ButtonImage("extruder-%s" % i, _("Tool") + " %s" % str(i))
self.labels[extruder].connect("clicked", self.change_extruder, extruder)
if extruder == self.current_extruder:
self.labels[extruder].get_style_context().add_class("button_active")
if i <= 3:
grid.attach(self.labels[extruder], i, 0, 1, 1)
i += 1
self.labels['extrude'] = self._gtk.ButtonImage("extrude", _("Extrude"), "color4")
self.labels['extrude'].connect("clicked", self.extrude, "+")
self.labels['load'] = self._gtk.ButtonImage("arrow-down", _("Load"), "color3")
@ -49,8 +38,19 @@ class ExtrudePanel(ScreenPanel):
"panel": "temperature"
})
if i < 4:
grid.attach(self.labels['temperature'], 3, 0, 1, 1)
extgrid = Gtk.Grid()
self.current_extruder = self._printer.get_stat("toolhead", "extruder")
for i, extruder in enumerate(self._printer.get_tools()):
self.labels[extruder] = self._gtk.ButtonImage("extruder-%s" % i, _("Tool") + " %s" % str(i))
self.labels[extruder].connect("clicked", self.change_extruder, extruder)
if extruder == self.current_extruder:
self.labels[extruder].get_style_context().add_class("button_active")
if i < 5:
extgrid.attach(self.labels[extruder], i, 0, 1, 1)
if i < 3:
extgrid.attach(self.labels['temperature'], i+1, 0, 1, 1)
grid.attach(extgrid, 0, 0, 4, 1)
grid.attach(self.labels['extrude'], 0, 1, 1, 1)
grid.attach(self.labels['load'], 1, 1, 1, 1)
grid.attach(self.labels['unload'], 2, 1, 1, 1)