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

meerk40t/gui/propertypanels/wobbleproperty.py

@@ -4,12 +4,14 @@ from meerk40t.gui.wxutils import ScrolledPanel, StaticBoxSizer
 
 from ...core.units import Length
 from ..wxutils import TextCtrl, set_ctrl_value, wxCheckBox, wxComboBox
-from .attributes import ColorPanel, IdPanel, AutoHidePanel
+from .attributes import AutoHidePanel, ColorPanel, IdPanel
 
 _ = wx.GetTranslation
 
 
 class WobblePropertyPanel(ScrolledPanel):
+    name = _("Wobble")
+
     def __init__(self, *args, context=None, node=None, **kwds):
         # super().__init__(parent)
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
@@ -62,7 +64,9 @@ class WobblePropertyPanel(ScrolledPanel):
         main_sizer.Add(panel_id, 1, wx.EXPAND, 0)
         self.panels.append(panel_id)
 
-        panel_hide = AutoHidePanel(self, id=wx.ID_ANY, context=self.context, node=self.node)
+        panel_hide = AutoHidePanel(
+            self, id=wx.ID_ANY, context=self.context, node=self.node
+        )
         main_sizer.Add(panel_hide, 1, wx.EXPAND, 0)
         self.panels.append(panel_hide)
 

meerk40t/gui/spoolerpanel.py

@@ -103,6 +103,8 @@ class SpoolerPanel(wx.Panel):
         self.context.setting(int, "spooler_sash_position", 0)
         self.context.setting(bool, "spool_history_clear_on_start", False)
         self.context.setting(bool, "spool_ignore_helper_jobs", True)
+        self.context.setting(bool, "silent_mode", False)
+        self.context(f".silent {'on' if self.context.silent_mode else 'off'}\n")
 
         self.splitter = wx.SplitterWindow(self, id=wx.ID_ANY, style=wx.SP_LIVE_UPDATE)
         sty = wx.BORDER_SUNKEN
@@ -131,11 +133,20 @@ class SpoolerPanel(wx.Panel):
             )
         )
         self.button_stop.SetBitmapFocus(
-            icons8_emergency_stop_button.GetBitmap(resize=0.5 * get_default_icon_size(self.context))
+            icons8_emergency_stop_button.GetBitmap(
+                resize=0.5 * get_default_icon_size(self.context)
+            )
         )
         self.button_stop.SetBackgroundColour(self.context.themes.get("stop_bg"))
         self.button_stop.SetForegroundColour(self.context.themes.get("stop_fg"))
         self.button_stop.SetFocusColour(self.context.themes.get("stop_fg_focus"))
+        self.check_silent = wx.CheckBox(self.win_top, wx.ID_ANY)
+        self.check_silent.SetValue(self.context.silent_mode)
+        self.check_silent.SetToolTip(
+            _(
+                "If checked, the spooler will not emit any sound signals while processing jobs"
+            )
+        )
 
         self.list_job_spool = wxListCtrl(
             self.win_top,
@@ -145,9 +156,7 @@ class SpoolerPanel(wx.Panel):
             list_name="list_spoolerjobs",
         )
 
-        self.info_label = wxStaticText(
-            self.win_bottom, wx.ID_ANY, _("Completed jobs:")
-        )
+        self.info_label = wxStaticText(self.win_bottom, wx.ID_ANY, _("Completed jobs:"))
         self.button_clear_history = wxButton(
             self.win_bottom, wx.ID_ANY, _("Clear History")
         )
@@ -184,7 +193,7 @@ class SpoolerPanel(wx.Panel):
         self.Bind(
             wx.EVT_LIST_ITEM_RIGHT_CLICK, self.on_item_rightclick, self.list_job_spool
         )
-        # end wxGlade
+        self.Bind(wx.EVT_CHECKBOX, self.on_check_silent, self.check_silent)
         self._last_invokation = 0
         self.dirty = False
         self.update_buffer_size = False
@@ -298,6 +307,7 @@ class SpoolerPanel(wx.Panel):
         sizer_combo_cmds.Add(self.combo_device, 1, wx.ALIGN_CENTER_VERTICAL, 0)
         sizer_combo_cmds.Add(self.button_pause, 0, wx.EXPAND, 0)
         sizer_combo_cmds.Add(self.button_stop, 0, wx.EXPAND, 0)
+        sizer_combo_cmds.Add(self.check_silent, 0, wx.ALIGN_CENTER_VERTICAL, 0)
 
         sizer_top.Add(sizer_combo_cmds, 0, wx.EXPAND, 0)
         sizer_top.Add(self.list_job_spool, 4, wx.EXPAND, 0)
@@ -318,6 +328,10 @@ class SpoolerPanel(wx.Panel):
         self.Layout()
         # end wxGlade
 
+    def on_check_silent(self, event):
+        self.context.silent_mode = self.check_silent.GetValue()
+        self.context(f".silent {'on' if self.context.silent_mode else 'off'}\n")
+
     def on_sash_changed(self, event):
         position = self.splitter.GetSashPosition()
         self.context.spooler_sash_position = position
@@ -760,7 +774,10 @@ class SpoolerPanel(wx.Panel):
                         info_s = f"{spool_obj.steps_done}/{spool_obj.steps_total}"
                         if hasattr(spooler, "driver"):
                             if hasattr(spooler.driver, "get_internal_queue_status"):
-                                internal_current, internal_total = spooler.driver.get_internal_queue_status()
+                                (
+                                    internal_current,
+                                    internal_total,
+                                ) = spooler.driver.get_internal_queue_status()
                                 if internal_current != 0:
                                     info_s += f" ({internal_current}/{internal_total})"
                     except AttributeError:
@@ -1113,7 +1130,10 @@ class SpoolerPanel(wx.Panel):
                 info_s = f"{spool_obj.steps_done}/{spool_obj.steps_total}"
                 if hasattr(spooler, "driver"):
                     if hasattr(spooler.driver, "get_internal_queue_status"):
-                        internal_current, internal_total = spooler.driver.get_internal_queue_status()
+                        (
+                            internal_current,
+                            internal_total,
+                        ) = spooler.driver.get_internal_queue_status()
                         if internal_current != 0:
                             info_s += f" ({internal_current}/{internal_total})"
             except AttributeError:

meerk40t/gui/wxutils.py

@@ -1,6 +1,7 @@
 """
 Mixin functions for wxMeerk40t
 """
+
 import platform
 from typing import List
 
@@ -1250,6 +1251,9 @@ class StaticBoxSizer(wx.StaticBoxSizer):
     def SetLabel(self, label):
         self.sbox.SetLabel(label)
 
+    def GetLabel(self):
+        return self.sbox.GetLabel()
+
     def Refresh(self, *args):
         self.sbox.Refresh(*args)
 
@@ -1582,6 +1586,7 @@ class wxRadioBox(StaticBoxSizer):
     def Show(self, flag):
         for ctrl in self._children + self._labels:
             ctrl.Show(flag)
+        super().Show(flag)
 
     def Bind(self, event_type, routine):
         self.parent.Bind(event_type, routine, self)
@@ -1622,6 +1627,227 @@ class wxListBox(wx.ListBox):
         set_color_according_to_theme(self, "list_bg", "list_fg")
 
 
+class wxCheckListBox(StaticBoxSizer):
+    """
+    This class recreates the functionality of a wx.CheckListBox, as this class has issues to properly refresh in nested sizers
+
+    Known Limitations:
+    - This custom implementation may not fully replicate all native wx.CheckListBox behaviors.
+    - Keyboard navigation (e.g., arrow keys, space/enter to toggle) may not work as expected.
+    - Accessibility features such as screen reader support may be limited or unavailable.
+    - If your application requires full accessibility or native keyboard handling, consider using the native wx.CheckListBox where possible.
+    """
+
+    def __init__(
+        self,
+        parent=None,
+        id=None,
+        label=None,
+        choices=None,
+        majorDimension=0,
+        style=0,
+        *args,
+        **kwargs,
+    ):
+        self.parent = parent
+        self.choices = choices
+        self._children = []
+        self._tool_tip = None
+        self._help = None
+        super().__init__(
+            parent=parent, id=wx.ID_ANY, label=label, orientation=wx.VERTICAL
+        )
+        self.majorDimension = majorDimension
+        self.style = style
+        self._build_controls()
+
+    def _build_controls(self):
+        """
+        Build the controls for the CheckListBox.
+        This method is called during initialization to create the checkboxes.
+        """
+        if self.choices is None:
+            self.choices = []
+        if self.majorDimension == 0 or self.style == wx.RA_SPECIFY_ROWS:
+            self.majorDimension = 1000
+        container = None
+        for idx, c in enumerate(self.choices):
+            if idx % self.majorDimension == 0:
+                container = wx.BoxSizer(wx.HORIZONTAL)
+                self.Add(container, 0, wx.EXPAND, 0)
+            check_option = wx.CheckBox(self.parent, wx.ID_ANY, label=c)
+            container.Add(check_option, 1, wx.ALIGN_CENTER_VERTICAL, 0)
+            self._children.append(check_option)
+
+        if platform.system() == "Linux":
+
+            def on_mouse_over_check(ctrl):
+                def mouse(event=None):
+                    ctrl.SetToolTip(self._tool_tip)
+                    event.Skip()
+
+                return mouse
+
+            for ctrl in self._children:
+                ctrl.Bind(wx.EVT_MOTION, on_mouse_over_check(ctrl))
+
+        for ctrl in self._children:
+            ctrl.Bind(wx.EVT_CHECKBOX, self.on_check)
+            ctrl.Bind(wx.EVT_RIGHT_DOWN, self.on_right_click)
+
+        for ctrl in self._children:
+            set_color_according_to_theme(ctrl, "text_bg", "text_fg")
+
+    @property
+    def Children(self):
+        return self._children
+
+    def GetParent(self):
+        return self.parent
+
+    def SetToolTip(self, tooltip):
+        self._tool_tip = tooltip
+        for ctrl in self._children:
+            ctrl.SetToolTip(self._tool_tip)
+
+    def Disable(self):
+        self.Enable(False)
+
+    def EnableItem(self, n, flag):
+        if 0 <= n < len(self._children):
+            self._children[n].Enable(flag)
+
+    def Enable(self, flag):
+        for ctrl in self._children:
+            ctrl.Enable(flag)
+
+    def Hide(self):
+        self.Show(False)
+
+    def Show(self, flag):
+        for ctrl in self._children:
+            ctrl.Show(flag)
+        self.ShowItems(flag)
+
+    # def Bind(self, event_type, routine):
+    #     self.parent.Bind(event_type, routine, self)
+
+    def on_check(self, orgevent):
+        #
+        event = orgevent.Clone()
+        event.SetEventType(wx.wxEVT_CHECKLISTBOX)
+        event.SetId(self.Id)
+        event.SetEventObject(self)
+        # event.Int = self.GetSelection()
+        wx.PostEvent(self.parent, event)
+
+    def on_right_click(self, event):
+        menu = wx.Menu()
+        parent = self.parent
+        item = menu.Append(wx.ID_ANY, _("Check all"), "")
+        parent.Bind(
+            wx.EVT_MENU,
+            lambda e: self.SetCheckedItems(range(len(self._children))),
+            id=item.GetId(),
+        )
+        item = menu.Append(wx.ID_ANY, _("Uncheck all"), "")
+        parent.Bind(wx.EVT_MENU, lambda e: self.SetCheckedItems([]), id=item.GetId())
+        item = menu.Append(wx.ID_ANY, _("Invert selection"), "")
+        parent.Bind(
+            wx.EVT_MENU,
+            lambda e: self.SetCheckedItems(
+                [
+                    i
+                    for i in range(len(self._children))
+                    if not self._children[i].GetValue()
+                ]
+            ),
+            id=item.GetId(),
+        )
+        parent.PopupMenu(menu)
+        menu.Destroy()
+
+    def SetForegroundColour(self, wc):
+        for ctrl in self._children:
+            ctrl.SetForegroundColour(wc)
+
+    def SetBackgroundColour(self, wc):
+        for ctrl in self._children:
+            ctrl.SetBackgroundColour(wc)
+
+    def SetHelpText(self, help):
+        self._help = help
+
+    def GetHelpText(self):
+        return self._help
+
+    def Clear(self) -> None:
+        with wx.BusyCursor():
+            for child in self._children:
+                child.Destroy()
+        self._children.clear()
+        self.choices.clear()
+
+    def Check(self, item: int, check: bool = True) -> None:
+        """
+        Check or uncheck an item in the CheckListBox.
+        :param item: The index of the item to check or uncheck.
+        :param check: True to check, False to uncheck.
+        """
+        if 0 <= item < len(self._children):
+            self._children[item].SetValue(check)
+
+    def GetCheckItems(self) -> list:
+        """
+        Get a list of indices of checked items in the CheckListBox.
+        :return: A list of indices of checked items.
+        """
+        return [idx for idx, ctrl in enumerate(self._children) if ctrl.GetValue()]
+
+    def GetCheckedStrings(self) -> list:
+        """
+        Get a list of strings of checked items in the CheckListBox.
+        :return: A list of strings of checked items.
+        """
+        return [self.choices[idx] for idx in self.GetCheckItems()]
+
+    def GetSelections(self) -> list:
+        """
+        Get a list of indices of selected items in the CheckListBox.
+        :return: A list of indices of selected items.
+        """
+        return self.GetCheckItems()
+
+    def SetCheckedStrings(self, choices):
+        """
+        Set the checked items in the CheckListBox based on a list of strings.
+        :param choices: A list of strings to check.
+        """
+        for idx, choice in enumerate(self.choices):
+            if choice in choices:
+                self.Check(idx, True)
+            else:
+                self.Check(idx, False)
+
+    def SetCheckedItems(self, choices):
+        """
+        Set the checked items in the CheckListBox based on a list of indices.
+        :param choices: A list of indices to check.
+        """
+        for idx in range(len(self._children)):
+            self.Check(idx, idx in choices)
+
+    def Set(self, choices):
+        """
+        Set the choices for the CheckListBox.
+        :param choices: A list of strings to set as choices.
+        """
+        # print (f"Setting choices for {self.GetLabel()}: {choices}")
+        self.Clear()
+        self.choices = list(choices)
+        self._build_controls()
+
+
 ##############
 # GUI KEYSTROKE FUNCTIONS
 ##############

meerk40t/kernel/kernel.py

@@ -182,6 +182,7 @@ class Kernel(Settings):
 
         self.os_information = self._get_environment()
         self.show_aio_prompt = True
+        self.silent_mode = False
 
     def __str__(self):
         return f"Kernel({self.name}, {self.profile}, {self.version})"
@@ -2865,8 +2866,35 @@ class Kernel(Settings):
                 _("App: {name} {version}.").format(name=self.name, version=self.version)
             )
 
+        @self.console_command("silent", _("Set/unset silent mode"))
+        def set_silent(channel, _, remainder=None, **kwargs):
+            """
+            Set or unset silent mode. In silent mode no beeps will be played.
+            """
+            if remainder is None:
+                channel(
+                    _("Silent mode is currently {mode}.").format(
+                        mode="ON" if self.silent_mode else "OFF"
+                    )
+                )
+                return
+            if remainder.lower() not in ("on", "off"):
+                channel(_("Please specify 'on' or 'off' to set silent mode."))
+                return
+            if remainder.lower() == "on":
+                self.silent_mode = True
+            else:
+                self.silent_mode = False
+            if self.silent_mode:
+                channel(_("Silent mode is now ON."))
+            else:
+                channel(_("Silent mode is now OFF."))
+
         @self.console_command("beep", _("Perform beep"))
         def beep(channel, _, **kwargs):
+            if self.silent_mode:
+                channel(_("Silent mode is on, no beep will be played."))
+                return
             OS_NAME = self.os_information["OS_NAME"]
             system_sound = {
                 "Windows": r"c:\Windows\Media\Sounds\Alarm01.wav",

meerk40t/main.py

@@ -11,7 +11,7 @@ import os.path
 import sys
 
 APPLICATION_NAME = "MeerK40t"
-APPLICATION_VERSION = "0.9.7040"
+APPLICATION_VERSION = "0.9.7050"
 
 if not getattr(sys, "frozen", False):
     # If .git directory does not exist we are running from a package like pypi
@@ -229,19 +229,24 @@ def _exe(restarted, args):
     server_mode = False
     if command:
         for c in command:
-            server_mode = server_mode or any(substring in c for substring in ("lhyserver", "grblserver", "ruidacontrol", "grblcontrol", "webserver"))
-    nogui = (
-        (hasattr(kernel.args, "gui_suppress") and kernel.args.gui_suppress) or
-        (hasattr(kernel.args, "no_gui") and kernel.args.no_gui) 
+            server_mode = server_mode or any(
+                substring in c
+                for substring in (
+                    "lhyserver",
+                    "grblserver",
+                    "ruidacontrol",
+                    "grblcontrol",
+                    "webserver",
+                )
+            )
+    nogui = (hasattr(kernel.args, "gui_suppress") and kernel.args.gui_suppress) or (
+        hasattr(kernel.args, "no_gui") and kernel.args.no_gui
     )
     for idx, attrib in enumerate(("mktablength", "mktabpositions")):
         kernel.register(f"registered_mk_svg_parameters/tabs{idx}", attrib)
 
     require_partial_mode = False
-    if (
-        (not console or nogui) and
-        (auto or daemon or server_mode)
-    ):
+    if (not console or nogui) and (auto or daemon or server_mode):
         require_partial_mode = True
     # print (f"Auto: {auto}, Command: {command}, Console: {console}, daemon: {daemon}, nogui:{nogui}, Server: {server_mode} -> {require_partial_mode}")
     kernel(partial=require_partial_mode)

meerk40t/ruida/loader.py

@@ -15,9 +15,11 @@ def data_viewer(data, data_type):
 
     if not data:
         return ""
+    magic = determine_magic_via_histogram(data)
     return BlobNode.hex_view(
-        data=decode_bytes(data, determine_magic_via_histogram(data)),
+        data=decode_bytes(data, magic),
         data_type=data_type,
+        info = f', Magic={magic} (0x{magic:02x})'
     )
 
 

meerk40t/ruida/rdjob.py

@@ -256,6 +256,8 @@ def encode_relcoord(coord):
 
 
 def encode_color(color):
+    # Scewed on RDC 22.01
+    # Maybe 16bit color is used?
     return encode32(int(color))
 
 
@@ -488,6 +490,7 @@ class RDJob:
         self._stopped = True
         self.enabled = True
         self._estimate = 0
+        self.offset = 0
 
         self.scale = UNITS_PER_uM
 
@@ -598,7 +601,8 @@ class RDJob:
             command = self.buffer.pop(0)
         try:
             array = list(command)
-            self.process(array)
+            self.process(array, offset=self.offset)
+            self.offset += len(command)
         except IndexError as e:
             raise RuidaCommandError(
                 f"Could not process Ruida buffer, {self.buffer[:25]} with magic: {self.magic:02}"
@@ -701,7 +705,7 @@ class RDJob:
     def set_color(self, color):
         self.color = color
 
-    def process(self, array):
+    def process(self, array, offset=None):
         """
         Parses an individual unswizzled ruida command, updating the emulator state.
 
@@ -976,7 +980,7 @@ class RDJob:
                 b = (c >> 16) & 0xFF
                 c = Color(red=r, blue=b, green=g)
                 self.set_color(c.hex)
-                desc = f"{part}, Color {self.color}"
+                desc = f"Color Part {part}, {self.color}"
             elif array[1] == 0x10:
                 value = array[2]
                 desc = f"EnExIO Start {value}"
@@ -1012,12 +1016,44 @@ class RDJob:
         elif array[0] == 0xD8:
             if array[1] == 0x00:
                 desc = "Start Process"
-            if array[1] == 0x10:
+            elif array[1] == 0x10:
                 desc = "Ref Point Mode 2, Machine Zero/Absolute Position"
-            if array[1] == 0x11:
+            elif array[1] == 0x11:
                 desc = "Ref Point Mode 1, Anchor Point"
-            if array[1] == 0x12:
+            elif array[1] == 0x12:
                 desc = "Ref Point Mode 0, Current Position"
+        elif array[0] == 0xD9:
+            if array[1] == 0x00:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move X ({value}μm)"
+            elif array[1] == 0x01:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move Y ({value}μm)"
+            elif array[1] == 0x02:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move Z ({value}μm)"
+            elif array[1] == 0x03:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move U ({value}μm)"
+            elif array[1] == 0x0F:
+                opts = array[2]
+                value = abscoord(array[3:8])
+                desc = f"Rapid move Feed ({value}μm)"
+            elif array[1] == 0x10:
+                opts = array[2]
+                x = abscoord(array[3:8])
+                y = abscoord(array[8:13])
+                desc = f"Rapid move XY ({x}μm, {y}μm)"
+            elif array[1] == 0x30:
+                opts = array[2]
+                x = abscoord(array[3:7])
+                y = abscoord(array[8:13])
+                u = abscoord(array[13:18])
+                desc = f"Rapid move XYU ({x}μm, {y}μm, {u}μm)"
         elif array[0] == 0xDA:
             mem = parse_mem(array[2:4])
             if array[1] == 0x01:
@@ -1240,7 +1276,8 @@ class RDJob:
         else:
             desc = "Unknown Command!"
         if self.channel:
-            self.channel(f"-**-> {str(bytes(array).hex())}\t({desc})")
+            prefix = f"{offset:06x}" if offset is not None else ''
+            self.channel(f"{prefix}-**-> {str(bytes(array).hex())}\t({desc})")
 
     def unswizzle(self, data):
         return bytes([self.lut_unswizzle[b] for b in data])
@@ -1325,6 +1362,9 @@ class RDJob:
             color = current_settings.get("line_color", 0)
             frequency = current_settings.get("frequency")
 
+            if color == 0:
+                color = current_settings.get("color", color)
+
             self.speed_laser_1_part(part, speed)
             if frequency:
                 self.frequency_part(0, part, frequency)
@@ -1670,7 +1710,7 @@ class RDJob:
         self(LAYER_COLOR, encode_color(color), output=output)
 
     def layer_color_part(self, part, color, output=None):
-        self(LAYER_COLOR, encode_part(part), encode_color(color), output=output)
+        self(LAYER_COLOR_PART, encode_part(part), encode_color(color), output=output)
 
     def en_ex_io(self, value, output=None):
         """