meerk40t 0.9.7030__py2.py3-none-any.whl → 0.9.7040__py2.py3-none-any.whl

meerk40t/gui/navigationpanels.py

@@ -17,6 +17,13 @@ from meerk40t.gui.icons import (
     icon_corner4,
     icon_fence_closed,
     icon_fence_open,
+    icon_z_down,
+    icon_z_down_double,
+    icon_z_down_triple,
+    icon_z_home,
+    icon_z_up,
+    icon_z_up_double,
+    icon_z_up_triple,
     icons8_caret_down,
     icons8_caret_left,
     icons8_caret_right,
@@ -50,8 +57,8 @@ from meerk40t.gui.wxutils import (
     StaticBoxSizer,
     TextCtrl,
     dip_size,
-    wxStaticBitmap,
     wxBitmapButton,
+    wxStaticBitmap,
     wxStaticText,
 )
 from meerk40t.kernel import signal_listener
@@ -396,6 +403,169 @@ class TimerButtons:
         self.stop_timer(action=True)
 
 
+class ZMovePanel(wx.Panel):
+    Z_SMALL = 1
+    Z_MEDIUM = 10
+    Z_LARGE = 100
+    # define your “steps” once
+    _BUTTON_SPECS = [
+        ("up", Z_SMALL, icon_z_up),
+        ("up", Z_MEDIUM, icon_z_up_double),
+        ("up", Z_LARGE, icon_z_up_triple),
+        ("home", None, icon_z_home),
+        ("down", Z_SMALL, icon_z_down),
+        ("down", Z_MEDIUM, icon_z_down_double),
+        ("down", Z_LARGE, icon_z_down_triple),
+    ]
+
+    def __init__(self, *args, context=None, **kwds):
+        # begin wxGlade: ZMovePanel.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+        self.context = context
+        self.context.themes.set_window_colors(self)
+        self.SetHelpText("zmove")
+        self.icon_size = 15
+        self.resize_factor = 1
+        self.resolution = 1
+        self.buttons = {}
+        self.listening = False
+
+        for direction, step, icon in self._BUTTON_SPECS:
+            if direction == "home":
+                btnname = f"button_z_{direction}"
+            else:
+                btnname = f"button_z_{direction}_{step}"
+            btn = wx.StaticBitmap(self, wx.ID_ANY)
+            setattr(self, btnname, btn)
+            self.buttons[btnname] = (btn, direction, step, icon)
+
+        self.__set_properties()
+        self.__do_layout()
+        self.__do_logic()
+
+    def __do_logic(self):
+        self.timer = TimerButtons(self)
+        for btn, direction, step, icon in self.buttons.values():
+            if direction == "home":
+                btn.Bind(wx.EVT_LEFT_DOWN, self.z_home)
+                btn.Bind(wx.EVT_RIGHT_DOWN, self.z_focus)
+            else:
+                handler = (
+                    self.z_move_up(step)
+                    if direction == "up"
+                    else self.z_move_down(step)
+                )
+                self.timer.add_button(btn, handler)
+        self.set_timer_options()
+
+    def __set_properties(self):
+        for btn, direction, step, icon in self.buttons.values():
+            if direction == "home":
+                tip = _("Move the laser to the defined Z-Home-Position")
+            else:
+                mm = step * 0.1
+                # _("Move the laserhead down by {mm} mm")
+                # _("Move the laserhead up by {mm} mm")
+                if direction == "up":
+                    tip = _("Move the laser up by {mm}mm").format(mm=mm)
+                else:
+                    tip = _("Move the laser down by {mm}mm").format(mm=mm)
+            btn.SetToolTip(tip)
+
+    def __do_layout(self):
+        # begin wxGlade: ZMovePanel.__do_layout
+        self.navigation_sizer = wx.BoxSizer(wx.VERTICAL)
+        for name in self.buttons:
+            self.navigation_sizer.Add(self.buttons[name][0], 0, 0)
+        self.SetSizer(self.navigation_sizer)
+        self.navigation_sizer.Fit(self)
+        self.set_icons(iconsize=10)
+        self.Layout()
+
+    def z_home(self, event=None):
+        self.context("z_home\n")
+
+    def z_focus(self, event=None):
+        if self.context.kernel.has_command("z_focus"):
+            self.context("z_focus\n")
+
+    def z_move_down(self, distance):
+        def handler():
+            self.context(f"z_move -{distance*0.1:.2f}mm")
+
+        return handler
+
+    def z_move_up(self, distance):
+        def handler():
+            self.context(f"z_move {distance*0.1:.2f}mm")
+
+        return handler
+
+    def set_icons(self, iconsize=None, dimension=None):
+        # orgsize = iconsize
+        if iconsize is None and dimension is not None:
+            dim_x = int(dimension[0] / 3) - 8
+            dim_y = int(dimension[1] / 4) - 8
+            iconsize = max(10, min(dim_x, dim_y))
+        # This is a bug within wxPython! It seems to appear only here at very high scale factors under windows
+        bmp = icon_z_home.GetBitmap(resize=self.icon_size, resolution=self.resolution)
+        s = bmp.Size
+        self.button_z_home.SetBitmap(bmp)
+        t = self.button_z_home.GetBitmap().Size
+        # print(f"Was asking for {best_size}x{best_size}, got {s[0]}x{s[1]}, button has {t[0]}x{t[1]}")
+        scale_x = s[0] / t[0]
+        scale_y = s[1] / t[1]
+        self.resize_factor = (self.icon_size * scale_x, self.icon_size * scale_y)
+
+        self.icon_size = iconsize
+        # print(f"Icon-Size set to {self.icon_size}, requested was {orgsize}")
+        for btn, direction, step, icon in self.buttons.values():
+            bmp = icon.GetBitmap(resize=self.resize_factor, resolution=self.resolution)
+            btn.SetBitmap(bmp)
+        self.navigation_sizer.Layout()
+        self.Layout()
+
+    def on_update(self, origin, *args):
+        has_home = self.context.kernel.has_command("z_home")
+        # print (f"Has_home for {self.context.device.name}: {has_home}")
+        self.button_z_home.Show(has_home)
+        tip = _("Move the laser to the defined Z-Home-Position")
+        if self.context.kernel.has_command("z_focus"):
+            tip += "\n" + _("Right click: autofocus the Z-Axis")
+
+        self.button_z_home.SetToolTip(tip)
+
+        self.navigation_sizer.Show(self.button_z_home, has_home)
+        self.navigation_sizer.Layout()
+
+    def pane_show(self, *args):
+        self.listening = True
+        self.context.listen("button-repeat", self.on_button_repeat)
+        self.context.listen("activate;device", self.on_update)
+        self.on_update(None)
+
+    def pane_hide(self, *args):
+        if self.listening:
+            self.context.unlisten("button-repeat", self.on_button_repeat)
+            self.context.unlisten("activate;device", self.on_update)
+            self.listening = False
+
+    def set_timer_options(self):
+        interval = self.context.button_repeat
+        if interval is None:
+            interval = 0.5
+        interval = max(0, interval)
+        accelerate = self.context.button_accelerate
+        if accelerate is None:
+            accelerate = True
+        self.timer.interval = interval
+        self.timer.accelerate = accelerate
+
+    def on_button_repeat(self, origin, *args):
+        self.set_timer_options()
+
+
 class Drag(wx.Panel):
     def __init__(self, *args, context=None, **kwds):
         # begin wxGlade: Drag.__init__
@@ -545,9 +715,7 @@ class Drag(wx.Panel):
             self.button_align_first_position.GetBestSize()
         )
         self.button_align_trace_hull.SetToolTip(
-            _(
-                "Perform a convex hull trace of the selection"
-            )
+            _("Perform a convex hull trace of the selection")
         )
         self.button_align_trace_hull.SetSize(self.button_align_trace_hull.GetBestSize())
         self.button_align_trace_quick.SetToolTip(
@@ -920,7 +1088,7 @@ class Drag(wx.Panel):
 
 
 class Jog(wx.Panel):
-    def __init__(self, *args, context=None, **kwds):
+    def __init__(self, *args, context=None, suppress_z_controls=False, **kwds):
         # begin wxGlade: Jog.__init__
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
 
@@ -935,6 +1103,7 @@ class Jog(wx.Panel):
         self.icon_size = None
         self.resize_factor = None
         self.resolution = 5
+        self.suppress_z_controls = suppress_z_controls
         self.button_navigate_up_left = wxBitmapButton(self, wx.ID_ANY)
         self.button_navigate_up = wxBitmapButton(self, wx.ID_ANY)
         self.button_navigate_up_right = wxBitmapButton(self, wx.ID_ANY)
@@ -947,6 +1116,12 @@ class Jog(wx.Panel):
         self.button_navigate_unlock = wxBitmapButton(self, wx.ID_ANY)
         self.button_navigate_lock = wxBitmapButton(self, wx.ID_ANY)
         self.button_confine = wxBitmapButton(self, wx.ID_ANY)
+        self.z_axis = ZMovePanel(self, wx.ID_ANY, context=context)
+        zshow = (
+            getattr(self.context.device, "supports_z_axis", False)
+            and not self.suppress_z_controls
+        )
+        self.z_axis.Show(zshow)
         self.__set_properties()
         self.__do_layout()
         self.timer = TimerButtons(self)
@@ -965,7 +1140,9 @@ class Jog(wx.Panel):
         self.Bind(
             wx.EVT_BUTTON, self.on_button_navigate_home, self.button_navigate_home
         )
-        self.button_navigate_home.Bind(wx.EVT_MIDDLE_DOWN, self.on_button_navigate_jobstart)
+        self.button_navigate_home.Bind(
+            wx.EVT_MIDDLE_DOWN, self.on_button_navigate_jobstart
+        )
 
         self.button_navigate_home.Bind(
             wx.EVT_RIGHT_DOWN, self.on_button_navigate_physical_home
@@ -1026,6 +1203,7 @@ class Jog(wx.Panel):
 
     def __do_layout(self):
         # begin wxGlade: Jog.__do_layout
+        self.main_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.navigation_sizer = wx.BoxSizer(wx.VERTICAL)
         button_sizer = wx.FlexGridSizer(4, 3, 0, 0)
         button_sizer.Add(self.button_navigate_up_left, 0, 0, 0)
@@ -1041,15 +1219,19 @@ class Jog(wx.Panel):
         button_sizer.Add(self.button_confine, 0, 0, 0)
         button_sizer.Add(self.button_navigate_lock, 0, 0, 0)
         self.navigation_sizer.Add(button_sizer, 1, wx.ALIGN_CENTER_HORIZONTAL, 0)
-        self.SetSizer(self.navigation_sizer)
-        self.navigation_sizer.Fit(self)
+        self.main_sizer.Add(self.navigation_sizer, 0, wx.EXPAND)
+        self.main_sizer.Add(self.z_axis, 0, wx.EXPAND)
+        self.SetSizer(self.main_sizer)
+        self.main_sizer.Fit(self)
         self.Layout()
 
     def set_icons(self, iconsize=None, dimension=None):
+        cols = 4 if self.z_axis.IsShown() else 3
         if iconsize is None and dimension is not None:
-            dim_x = int(dimension[0] / 3) - 8
+            dim_x = int(dimension[0] / cols) - 8
             dim_y = int(dimension[1] / 4) - 8
             iconsize = max(15, min(dim_x, dim_y))
+            dimension = None
         self.icon_size = iconsize
         # This is a bug within wxPython! It seems to appear only here at very high scale factors under windows
         bmp = icons8_up_left.GetBitmap(
@@ -1116,6 +1298,11 @@ class Jog(wx.Panel):
         self.button_confine.SetBitmap(
             btn_icon.GetBitmap(resize=self.resize_factor, resolution=self.resolution)
         )
+        if self.z_axis.IsShown():
+            # Has 7 Buttons for our 4
+            self.z_axis.set_icons(
+                iconsize=int(round(4 / 7 * self.icon_size, 0)), dimension=dimension
+            )
         self.navigation_sizer.Layout()
         self.Layout()
 
@@ -1215,7 +1402,7 @@ class Jog(wx.Panel):
     def move_rel(self, dx, dy):
         nx, ny = get_movement(self.context, dx, dy)
         self.context(f".move_relative {nx} {ny}\n")
-    
+
     def on_button_navigate_jobstart(self, event):
         ops = self.context.elements.op_branch
         for op in ops.children:
@@ -1250,9 +1437,8 @@ class Jog(wx.Panel):
 
     def set_home_logic(self):
         tip = _("Send laser to home position")
-        if hasattr(self.context.device, "has_endstops"):
-            if self.context.device.has_endstops:
-                tip = _("Send laser to home position (right click: to physical home)")
+        if getattr(self.context.device, "has_endstops", False):
+            tip = _("Send laser to home position (right click: to physical home)")
         ops = self.context.elements.op_branch
         for op in ops.children:
             if op.type == "place point" and op.output:
@@ -1262,22 +1448,38 @@ class Jog(wx.Panel):
 
     def on_update(self, origin, *args):
         self.set_home_logic()
+        self.set_z_support()
+
+    def set_z_support(self):
+        show_z = (
+            getattr(self.context.device, "supports_z_axis", False)
+            and not self.suppress_z_controls
+        )
+        self.z_axis.Show(show_z)
+        if show_z:
+            self.z_axis.pane_show()
+        else:
+            self.z_axis.pane_hide()
+        self.set_icons(iconsize=None, dimension=self.GetClientSize())
+        self.main_sizer.Show(self.z_axis, show_z)
+        self.main_sizer.Layout()
 
     def pane_show(self):
         self.context.listen("activate;device", self.on_update)
         self.context.listen("button-repeat", self.on_button_repeat)
         self.set_home_logic()
+        self.set_z_support()
 
     def pane_hide(self):
         self.context.unlisten("activate;device", self.on_update)
         self.context.unlisten("button-repeat", self.on_button_repeat)
+        self.z_axis.pane_hide()
 
     def set_timer_options(self):
         interval = self.context.button_repeat
         if interval is None:
             interval = 0.5
-        if interval < 0:
-            interval = 0
+        interval = max(0, interval)
         accelerate = self.context.button_accelerate
         if accelerate is None:
             accelerate = True
@@ -1543,13 +1745,17 @@ class MovePanel(wx.Panel):
             # wrong device...
             return
         # New position...
-        p = self.context
-        units = p.units_name
-        xpos = Length(amount=pos[2], preferred_units=units)
-        ypos = Length(amount=pos[3], preferred_units=units)
-        self.label_pos.SetLabel(
-            f"{round(xpos.preferred, 6):.1f}{units}\n{round(ypos.preferred, 6):.1f}{units}"
-        )
+        try:
+            p = self.context
+            units = p.units_name
+            xpos = Length(amount=pos[2], preferred_units=units)
+            ypos = Length(amount=pos[3], preferred_units=units)
+            self.label_pos.SetLabel(
+                f"{round(xpos.preferred, 6):.1f}{units}\n{round(ypos.preferred, 6):.1f}{units}"
+            )
+        except (ValueError, RuntimeError):
+            # Already destroyed or invalid
+            return
         self.label_pos.Refresh()
         # button_info_sizer.Layout()
         # self.GetSizer().Layout()
@@ -2192,8 +2398,7 @@ class Transform(wx.Panel):
         interval = self.context.button_repeat
         if interval is None:
             interval = 0.5
-        if interval < 0:
-            interval = 0
+        interval = max(0, interval)
         accelerate = self.context.button_accelerate
         if accelerate is None:
             accelerate = True

meerk40t/gui/propertypanels/hatchproperty.py

@@ -11,6 +11,8 @@ _ = wx.GetTranslation
 
 
 class HatchPropertyPanel(ScrolledPanel):
+    name = _("Hatch")
+
     def __init__(self, *args, context=None, node=None, **kwds):
         # super().__init__(parent)
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL