From 4d0edf3c0bbf9c240985e6a01834d8cd05d505a1 Mon Sep 17 00:00:00 2001
From: alfrix <alfredomonclus@gmail.com>
Date: Sat, 12 Nov 2022 09:45:07 -0300
Subject: [PATCH] move: cleanup and move stuff out of screen_panel

---
 ks_includes/screen_panel.py | 15 ---------------
 panels/move.py              | 31 +++++++++++++++++++------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/ks_includes/screen_panel.py b/ks_includes/screen_panel.py
index 013b0967..ec6ff68a 100644
--- a/ks_includes/screen_panel.py
+++ b/ks_includes/screen_panel.py
@@ -4,8 +4,6 @@ import logging
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk
 
-from ks_includes.KlippyGcodes import KlippyGcodes
-
 
 class ScreenPanel:
 
@@ -37,7 +35,6 @@ class ScreenPanel:
         return
 
     def emergency_stop(self, widget):
-
         if self._config.get_main_config().getboolean('confirm_estop', False):
             self._screen._confirm_send_action(widget, _("Are you sure you want to run Emergency Stop?"),
                                               "printer.emergency_stop")
@@ -67,18 +64,6 @@ class ScreenPanel:
     def get_title(self):
         return self.title
 
-    def home(self, widget):
-        self._screen._ws.klippy.gcode_script(KlippyGcodes.HOME)
-
-    def homexy(self, widget):
-        self._screen._ws.klippy.gcode_script(KlippyGcodes.HOME_XY)
-
-    def z_tilt(self, widget):
-        self._screen._ws.klippy.gcode_script(KlippyGcodes.Z_TILT)
-
-    def quad_gantry_level(self, widget):
-        self._screen._ws.klippy.gcode_script(KlippyGcodes.QUAD_GANTRY_LEVEL)
-
     def menu_item_clicked(self, widget, panel, item):
         logging.info(f"### Creating panel {item['panel']} : {panel} {item}")
         if "items" in item:
diff --git a/panels/move.py b/panels/move.py
index 1e3f8956..28c345a5 100644
--- a/panels/move.py
+++ b/panels/move.py
@@ -7,10 +7,6 @@ from gi.repository import Gtk, Pango
 from ks_includes.KlippyGcodes import KlippyGcodes
 from ks_includes.screen_panel import ScreenPanel
 
-AXIS_X = "X"
-AXIS_Y = "Y"
-AXIS_Z = "Z"
-
 
 def create_panel(*args):
     return MovePanel(*args)
@@ -25,23 +21,35 @@ class MovePanel(ScreenPanel):
         self.settings = {}
         self.menu = ['move_menu']
 
+    def home(self, widget):
+        self._screen._ws.klippy.gcode_script(KlippyGcodes.HOME)
+
+    def homexy(self, widget):
+        self._screen._ws.klippy.gcode_script(KlippyGcodes.HOME_XY)
+
+    def z_tilt(self, widget):
+        self._screen._ws.klippy.gcode_script(KlippyGcodes.Z_TILT)
+
+    def quad_gantry_level(self, widget):
+        self._screen._ws.klippy.gcode_script(KlippyGcodes.QUAD_GANTRY_LEVEL)
+
     def initialize(self, panel_name):
         grid = self._gtk.HomogeneousGrid()
 
         self.labels['x+'] = self._gtk.ButtonImage("arrow-right", _("X+"), "color1")
-        self.labels['x+'].connect("clicked", self.move, AXIS_X, "+")
+        self.labels['x+'].connect("clicked", self.move, "X", "+")
         self.labels['x-'] = self._gtk.ButtonImage("arrow-left", _("X-"), "color1")
-        self.labels['x-'].connect("clicked", self.move, AXIS_X, "-")
+        self.labels['x-'].connect("clicked", self.move, "X", "-")
 
         self.labels['y+'] = self._gtk.ButtonImage("arrow-up", _("Y+"), "color2")
-        self.labels['y+'].connect("clicked", self.move, AXIS_Y, "+")
+        self.labels['y+'].connect("clicked", self.move, "Y", "+")
         self.labels['y-'] = self._gtk.ButtonImage("arrow-down", _("Y-"), "color2")
-        self.labels['y-'].connect("clicked", self.move, AXIS_Y, "-")
+        self.labels['y-'].connect("clicked", self.move, "Y", "-")
 
         self.labels['z+'] = self._gtk.ButtonImage("z-farther", _("Z+"), "color3")
-        self.labels['z+'].connect("clicked", self.move, AXIS_Z, "+")
+        self.labels['z+'].connect("clicked", self.move, "Z", "+")
         self.labels['z-'] = self._gtk.ButtonImage("z-closer", _("Z-"), "color3")
-        self.labels['z-'].connect("clicked", self.move, AXIS_Z, "-")
+        self.labels['z-'].connect("clicked", self.move, "Z", "-")
 
         self.labels['home'] = self._gtk.ButtonImage("home", _("Home All"), "color4")
         self.labels['home'].connect("clicked", self.home)
@@ -203,12 +211,11 @@ class MovePanel(ScreenPanel):
             direction = "-" if direction == "+" else "+"
 
         dist = f"{direction}{self.distance}"
-        config_key = "move_speed_z" if axis == AXIS_Z else "move_speed_xy"
+        config_key = "move_speed_z" if axis == "Z" else "move_speed_xy"
         printer_cfg = self._config.get_printer_config(self._screen.connected_printer)
         speed = None if printer_cfg is None else printer_cfg.getint(config_key, None)
         if speed is None:
             speed = self._config.get_config()['main'].getint(config_key, 20)
-
         speed = 60 * max(1, speed)
 
         self._screen._ws.klippy.gcode_script(f"{KlippyGcodes.MOVE_RELATIVE}\n{KlippyGcodes.MOVE} {axis}{dist} F{speed}")