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

meerk40t/gui/wxmscene.py

@@ -99,7 +99,12 @@ class ContourDetectionDialog(wx.Dialog):
     def _init_ui(self, node):
         main_sizer = wx.BoxSizer(wx.VERTICAL)
         panel = ContourPanel(
-            self, wx.ID_ANY, context=self.context, node=node, simplified=True, direct_mode=True,
+            self,
+            wx.ID_ANY,
+            context=self.context,
+            node=node,
+            simplified=True,
+            direct_mode=True,
         )
         main_sizer.Add(panel, 1, wx.EXPAND, 0)
         buttons = self.CreateStdDialogButtonSizer(wx.OK)
@@ -158,7 +163,9 @@ class MeerK40tScenePanel(wx.Panel):
         # Save / Load the content of magnets
         from os.path import join
 
-        self._magnet_file = join(self.context.kernel.os_information["WORKDIR"], "magnets.cfg")
+        self._magnet_file = join(
+            self.context.kernel.os_information["WORKDIR"], "magnets.cfg"
+        )
         self.load_magnets()
         # Add a plugin routine to be called at the time of a full new start
         context.kernel.register(
@@ -872,14 +879,12 @@ class MeerK40tScenePanel(wx.Panel):
         @context.console_argument(
             "action", type=str, help=_("Action: clear or set / delete with coordinate")
         )
-        @context.console_argument(
-            "axis", type=str, help=_("Axis (X or Y)")
-        )
+        @context.console_argument("axis", type=str, help=_("Axis (X or Y)"))
         @context.console_argument("pos", type=str, help=_("Position for magnetline"))
         @context.console_command(
             "magnet",
             help=_("magnet <action> <axis> <position>"),
-            input_type="scene",
+            input_type=("scene", None),
         )
         def magnet_set(
             command,
@@ -892,10 +897,20 @@ class MeerK40tScenePanel(wx.Panel):
         ):
             def info(opt_msg):
                 channel(
-                    _("You need to provide the intended action:") + "\n" +
-                    _("clear x - clear y : will clear all magnets on the given axis") + "\n" +
-                    _("set x <pos> - set y <pos>: will set a magnet line on the given axis") + "\n" +
-                    _("delete x <pos> - delete y <pos>: will delete the magnet line on the given axis")
+                    _("You need to provide the intended action:")
+                    + "\n"
+                    + _("clear x - clear y : will clear all magnets on the given axis")
+                    + "\n"
+                    + _(
+                        "set x <pos> - set y <pos>: will set a magnet line on the given axis"
+                    )
+                    + "\n"
+                    + _(
+                        "delete x <pos> - delete y <pos>: will delete the magnet line on the given axis"
+                    )
+                    + _(
+                        "split x <count> - split y <count>: will generate <count> lines between the selection boundaries on the given axis"
+                    )
                 )
                 if opt_msg:
                     channel(opt_msg)
@@ -906,17 +921,33 @@ class MeerK40tScenePanel(wx.Panel):
             action = action.lower()
             axis = axis.upper()
             value = None
-            if pos:
-                try:
-                    rel_len = self.context.device.view.width if axis == "X" else self.context.device.view.height
-                    value = float(Length(pos, relative_length=rel_len))
-                except ValueError:
-                    info (f"Invalid length: {pos}")
+            if action == "split":
+                if pos:
+                    try:
+                        value = int(pos)
+                    except ValueError:
+                        info(f"Invalid count: {pos}")
+                        return
+
+                if value is None or value <= 0:
+                    info(_("You need to provide a number of splits"))
                     return
+            else:
+                if pos:
+                    try:
+                        rel_len = (
+                            self.context.device.view.width
+                            if axis == "X"
+                            else self.context.device.view.height
+                        )
+                        value = float(Length(pos, relative_length=rel_len))
+                    except ValueError:
+                        info(f"Invalid length: {pos}")
+                        return
 
-            if action != "clear" and value is None:
-                info(_("You need to provide a position"))
-                return
+                if action != "clear" and value is None:
+                    info(_("You need to provide a position"))
+                    return
 
             if action == "clear":
                 if axis == "X":
@@ -927,7 +958,43 @@ class MeerK40tScenePanel(wx.Panel):
                     self.magnet_y.clear()
                 self.save_magnets()
                 self.context.signal("refresh_scene", "Scene")
-                channel (_("Deleted {count} magnet lines on axis {axis}").format(axis=axis, count=count))
+                channel(
+                    _("Deleted {count} magnet lines on axis {axis}").format(
+                        axis=axis, count=count
+                    )
+                )
+            elif action == "split":
+                bb = self.context.elements.selected_area()
+                if bb is None:
+                    channel(_("Nothing selected"))
+                    return
+
+                min_v = bb[0] if axis == "X" else bb[1]
+                max_v = bb[2] if axis == "X" else bb[3]
+                count = value + 1
+                delta = (max_v - min_v) / count
+                mvalue = min_v
+                while mvalue + delta < max_v:
+                    mvalue += delta
+                    if axis == "X":
+                        if mvalue not in self.magnet_x:
+                            self.magnet_x.append(mvalue)
+                    else:
+                        if mvalue not in self.magnet_y:
+                            self.magnet_y.append(mvalue)
+                self.save_magnets()
+                channel(
+                    _(
+                        "Created {count} magnet lines on {axis}-axis between {min_len} and {max_len}"
+                    ).format(
+                        count=count,
+                        axis=axis,
+                        min_len=Length(min_v, digits=1).length_mm,
+                        max_len=Length(max_v, digits=1).length_mm,
+                    )
+                )
+                self.context.signal("refresh_scene", "Scene")
+
             elif action == "set":
                 done = False
                 if axis == "X":
@@ -941,7 +1008,11 @@ class MeerK40tScenePanel(wx.Panel):
                 self.save_magnets()
                 self.context.signal("refresh_scene", "Scene")
                 if done:
-                    channel(_("Magnetline appended at {pos} on axis {axis}").format(pos=pos, axis=axis))
+                    channel(
+                        _("Magnetline appended at {pos} on axis {axis}").format(
+                            pos=pos, axis=axis
+                        )
+                    )
                 else:
                     channel(_("Magnetline was already present"))
             elif action.startswith("del"):
@@ -957,7 +1028,11 @@ class MeerK40tScenePanel(wx.Panel):
                 self.save_magnets()
                 self.context.signal("refresh_scene", "Scene")
                 if done:
-                    channel(_("Magnetline removed at {pos} on axis {axis}").format(pos=pos, axis=axis))
+                    channel(
+                        _("Magnetline removed at {pos} on axis {axis}").format(
+                            pos=pos, axis=axis
+                        )
+                    )
                 else:
                     channel(_("Magnetline was not existing"))
 
@@ -1193,7 +1268,7 @@ class MeerK40tScenePanel(wx.Panel):
 
     @signal_listener("create_magnets")
     def listen_magnet_creation(self, origin, creation_list, *args):
-        for (info, value) in creation_list:
+        for info, value in creation_list:
             if info == "x":
                 self.toggle_x_magnet(value)
             else:
@@ -1292,11 +1367,17 @@ class MeerK40tScenePanel(wx.Panel):
 
         def recognize_background_contours(event=None):
             def image_from_bitmap(myBitmap):
+                img = myBitmap.ConvertToImage()
+                buf = img.GetData()
+                return Image.frombuffer(
+                    "RGB", tuple(myBitmap.GetSize()), bytes(buf), "raw", "RGB", 0, 1
+                )
                 wx_image = myBitmap.ConvertToImage()
                 myPilImage = Image.new(
                     "RGB", (wx_image.GetWidth(), wx_image.GetHeight())
                 )
-                myPilImage.frombytes(wx_image.GetData())
+                byte_data = bytes(wx_image.GetData())
+                myPilImage.frombytes(byte_data)
                 return myPilImage
 
             if not self.widget_scene.has_background:
@@ -1328,6 +1409,8 @@ class MeerK40tScenePanel(wx.Panel):
                 dpi=500,
             )
             # print (f"Node-Dimensions: {node.bbox()}")
+            # self.context.elements.elem_branch.add_node(node)
+
             dlg = ContourDetectionDialog(self, self.context, node)
             dlg.ShowModal()
             dlg.end_dialog()

meerk40t/gui/wxmtree.py

@@ -1379,11 +1379,13 @@ class ShadowTree:
         @param kwargs:
         @return:
         """
-        self.do_not_select = True
 
         item = node._item
         if item is None:
-            raise ValueError(f"Item was None for node {repr(node)}")
+            print(f"Item was None for node {repr(node)}")
+            return
+
+        self.do_not_select = True
         self.check_validity(item)
         # We might need to update the decorations for all parent objects
         informed = []

meerk40t/gui/wxutils.py

@@ -8,8 +8,8 @@ import wx
 import wx.lib.mixins.listctrl as listmix
 from wx.lib.scrolledpanel import ScrolledPanel as SP
 
-from meerk40t.svgelements import Matrix
 from meerk40t.core.units import ACCEPTED_ANGLE_UNITS, ACCEPTED_UNITS, Angle, Length
+from meerk40t.svgelements import Matrix
 
 _ = wx.GetTranslation
 
@@ -35,6 +35,7 @@ def get_matrix_scale(matrix):
         res = 1
     return res
 
+
 def get_matrix_full_scale(matrix):
     # We usually use the value_scale_x to establish a pixel size
     # by counteracting the scene matrix, linewidth = 1 / matrix.value_scale_x()
@@ -54,6 +55,7 @@ def get_matrix_full_scale(matrix):
         resy = 1
     return resx, resy
 
+
 def get_gc_scale(gc):
     gcmat = gc.GetTransform()
     mat_param = gcmat.Get()
@@ -67,6 +69,7 @@ def get_gc_scale(gc):
     )
     return get_matrix_scale(testmatrix)
 
+
 def get_gc_full_scale(gc):
     gcmat = gc.GetTransform()
     mat_param = gcmat.Get()
@@ -80,6 +83,7 @@ def get_gc_full_scale(gc):
     )
     return get_matrix_full_scale(testmatrix)
 
+
 def create_menu_for_choices(gui, choices: List[dict]) -> wx.Menu:
     """
     Creates a menu for a given choices table.
@@ -851,6 +855,7 @@ class TextCtrl(wx.TextCtrl):
                         self._action_routine()
                     finally:
                         self._event_generated = None
+
             return handler
 
         if not self._default_values:
@@ -858,15 +863,20 @@ class TextCtrl(wx.TextCtrl):
             return
         menu = wx.Menu()
         has_info = isinstance(self._default_values[0], (list, tuple))
-        item : wx.MenuItem = menu.Append(wx.ID_ANY, _("Default values..."), "")
+        item: wx.MenuItem = menu.Append(wx.ID_ANY, _("Default values..."), "")
         item.Enable(False)
         for info in self._default_values:
-            item = menu.Append(wx.ID_ANY, info[0] if has_info else info, info[1] if has_info else "")
-            self.Bind(wx.EVT_MENU, set_menu_value(info[0] if has_info else info), id=item.GetId())
+            item = menu.Append(
+                wx.ID_ANY, info[0] if has_info else info, info[1] if has_info else ""
+            )
+            self.Bind(
+                wx.EVT_MENU,
+                set_menu_value(info[0] if has_info else info),
+                id=item.GetId(),
+            )
         self.PopupMenu(menu)
         menu.Destroy()
 
-
     @property
     def warn_status(self):
         return self._warn_status
@@ -1012,6 +1022,7 @@ class wxCheckBox(wx.CheckBox):
         self._tool_tip = tooltip
         super().SetToolTip(self._tool_tip)
 
+
 class wxComboBox(wx.ComboBox):
     """
     This class wraps around wx.ComboBox and creates a series of mouse over tool tips to permit Linux tooltips that
@@ -1242,11 +1253,12 @@ class StaticBoxSizer(wx.StaticBoxSizer):
     def Refresh(self, *args):
         self.sbox.Refresh(*args)
 
-    def Enable(self, enable:bool=True):
+    def Enable(self, enable: bool = True):
         """Enable or disable the StaticBoxSizer and its children.
 
         Enables or disables all children of the sizer recursively.
         """
+
         def enem(wind, flag):
             for c in wind.GetChildren():
                 enem(c, flag)
@@ -1255,6 +1267,7 @@ class StaticBoxSizer(wx.StaticBoxSizer):
 
         enem(self.sbox, enable)
 
+
 class ScrolledPanel(SP):
     """
     We sometimes delete things fast enough that they call _SetupAfter when dead and crash.
@@ -1268,12 +1281,21 @@ class ScrolledPanel(SP):
         except RuntimeError:
             pass
 
+
 class wxListCtrl(wx.ListCtrl):
     """
     wxListCtrl will extend a regular ListCtrl by saving / restoring column widths
     """
+
     def __init__(
-        self, parent, ID=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.DefaultSize, style=0, context=None, list_name=None
+        self,
+        parent,
+        ID=wx.ID_ANY,
+        pos=wx.DefaultPosition,
+        size=wx.DefaultSize,
+        style=0,
+        context=None,
+        list_name=None,
     ):
         wx.ListCtrl.__init__(self, parent, ID, pos, size, style)
         self.context = context
@@ -1341,7 +1363,7 @@ class wxListCtrl(wx.ListCtrl):
         # print(f"{self.list_name}, cols={self.GetColumnCount()}, available={list_width}, used={total}")
         if total < list_width:
             col = self.GetColumnCount() - 1
-            if col < 0 :
+            if col < 0:
                 return False
             # print(f"Will adjust last column from {last} to {last + (list_width - total)}")
             try:
@@ -1365,10 +1387,26 @@ class EditableListCtrl(wxListCtrl, listmix.TextEditMixin):
 
     # ----------------------------------------------------------------------
     def __init__(
-        self, parent, ID=wx.ID_ANY, pos=wx.DefaultPosition, size=wx.DefaultSize, style=0, context=None, list_name=None,
+        self,
+        parent,
+        ID=wx.ID_ANY,
+        pos=wx.DefaultPosition,
+        size=wx.DefaultSize,
+        style=0,
+        context=None,
+        list_name=None,
     ):
         """Constructor"""
-        wxListCtrl.__init__(self, parent=parent, ID=ID, pos=pos, size=size, style=style, context=context, list_name=list_name)
+        wxListCtrl.__init__(
+            self,
+            parent=parent,
+            ID=ID,
+            pos=pos,
+            size=size,
+            style=style,
+            context=context,
+            list_name=list_name,
+        )
         listmix.TextEditMixin.__init__(self)
         set_color_according_to_theme(self, "list_bg", "list_fg")
 
@@ -1451,7 +1489,7 @@ class wxRadioBox(StaticBoxSizer):
         id=None,
         label=None,
         choices=None,
-        majorDimension = 0,
+        majorDimension=0,
         style=0,
         *args,
         **kwargs,
@@ -1462,8 +1500,10 @@ class wxRadioBox(StaticBoxSizer):
         self._labels = []
         self._tool_tip = None
         self._help = None
-        super().__init__(parent=parent, id=wx.ID_ANY, label=label, orientation=wx.VERTICAL)
-        if majorDimension == 0 or style==wx.RA_SPECIFY_ROWS:
+        super().__init__(
+            parent=parent, id=wx.ID_ANY, label=label, orientation=wx.VERTICAL
+        )
+        if majorDimension == 0 or style == wx.RA_SPECIFY_ROWS:
             majorDimension = 1000
         container = None
         for idx, c in enumerate(self.choices):
@@ -1486,6 +1526,7 @@ class wxRadioBox(StaticBoxSizer):
                     event.Skip()
 
                 return mouse
+
             for ctrl in self._children:
                 ctrl.Bind(wx.EVT_MOTION, on_mouse_over_check(ctrl))
 
@@ -1567,16 +1608,20 @@ class wxRadioBox(StaticBoxSizer):
 
     def GetHelpText(self):
         return self._help
+
+
 class wxStaticText(wx.StaticText):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         set_color_according_to_theme(self, "label_bg", "label_fg")
 
+
 class wxListBox(wx.ListBox):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         set_color_according_to_theme(self, "list_bg", "list_fg")
 
+
 ##############
 # GUI KEYSTROKE FUNCTIONS
 ##############
@@ -1752,8 +1797,8 @@ def set_ctrl_value(ctrl, value):
     try:
         cursor = ctrl.GetInsertionPoint()
         if ctrl.GetValue() != value:
-            ctrl.SetValue(value)
-            ctrl.SetInsertionPoint(min(len(value), cursor))
+            ctrl.SetValue(str(value))
+            ctrl.SetInsertionPoint(min(len(str(value)), cursor))
     except RuntimeError:
         # Control might already have been destroyed
         pass