meerk40t 0.9.2000__py2.py3-none-any.whl → 0.9.3001__py2.py3-none-any.whl

meerk40t/balormk/balor_params.py

@@ -13,19 +13,17 @@ FLOAT_PARAMETERS = (
     "delay_laser_on",
     "delay_laser_off",
     "delay_polygon",
-    "wobble_speed",
 )
 INT_PARAMETERS = ("pulse_width",)
 
 BOOL_PARAMETERS = (
-    "wobble_enabled",
     "timing_enabled",
     "rapid_enabled",
     "pulse_width_enabled",
 )
 
 
-STRING_PARAMETERS = ("wobble_type", "wobble_radius", "wobble_interval")
+STRING_PARAMETERS = ()
 
 
 class Parameters:
@@ -96,46 +94,6 @@ class Parameters:
     def timing_enabled(self, value):
         self.settings["timing_enabled"] = value
 
-    @property
-    def wobble_enabled(self):
-        return self.settings.get("wobble_enabled", False)
-
-    @wobble_enabled.setter
-    def wobble_enabled(self, value):
-        self.settings["wobble_enabled"] = value
-
-    @property
-    def wobble_radius(self):
-        return self.settings.get("wobble_radius", "1.5mm")
-
-    @wobble_radius.setter
-    def wobble_radius(self, value):
-        self.settings["wobble_radius"] = value
-
-    @property
-    def wobble_speed(self):
-        return self.settings.get("wobble_speed", 50.0)
-
-    @wobble_speed.setter
-    def wobble_speed(self, value):
-        self.settings["wobble_speed"] = value
-
-    @property
-    def wobble_interval(self):
-        return self.settings.get("wobble_interval", "0.3mm")
-
-    @wobble_interval.setter
-    def wobble_interval(self, value):
-        self.settings["wobble_interval"] = value
-
-    @property
-    def wobble_type(self):
-        return self.settings.get("wobble_type", "circle")
-
-    @wobble_type.setter
-    def wobble_type(self, value):
-        self.settings["wobble_type"] = value
-
     @property
     def speed(self):
         return self.settings.get("speed", 100.0)

meerk40t/balormk/controller.py

@@ -12,7 +12,6 @@ from copy import copy
 
 from meerk40t.balormk.mock_connection import MockConnection
 from meerk40t.balormk.usb_connection import USBConnection
-from meerk40t.fill.fills import Wobble
 
 DRIVER_STATE_RAPID = 0
 DRIVER_STATE_LIGHT = 1
@@ -273,7 +272,6 @@ class GalvoController:
         self._delay_poly = None
         self._delay_end = None
 
-        self._wobble = None
         self._port_bits = 0
         self._machine_index = 0
 
@@ -627,40 +625,6 @@ class GalvoController:
             self.list_laser_off_delay(self.service.delay_laser_off)
             self.list_polygon_delay(self.service.delay_polygon)
 
-    def set_wobble(self, settings):
-        """
-        Set the wobble parameters and mark modifications routines.
-
-        @param settings: The dict setting to extract parameters from.
-        @return:
-        """
-        if settings is None:
-            self._wobble = None
-            return
-        wobble_enabled = str(settings.get("wobble_enabled", False)).lower() == "true"
-        if not wobble_enabled:
-            self._wobble = None
-            return
-        wobble_radius = settings.get("wobble_radius", "1.5mm")
-        wobble_r, _ = self.service.view.position(wobble_radius, 0, vector=True)
-        wobble_interval = settings.get("wobble_interval", "0.3mm")
-        wobble_speed = settings.get("wobble_speed", 50.0)
-        wobble_type = settings.get("wobble_type", "circle")
-        wobble_interval, _ = self.service.view.position(wobble_interval, 0, vector=True)
-        algorithm = self.service.lookup(f"wobble/{wobble_type}")
-        if self._wobble is None:
-            self._wobble = Wobble(
-                algorithm=algorithm,
-                radius=wobble_r,
-                speed=wobble_speed,
-                interval=wobble_interval,
-            )
-        else:
-            # set our parameterizations
-            self._wobble.algorithm = algorithm
-            self._wobble.radius = wobble_r
-            self._wobble.speed = wobble_speed
-
     #######################
     # PLOTLIKE SHORTCUTS
     #######################
@@ -673,11 +637,7 @@ class GalvoController:
             return
         if self._mark_speed is not None:
             self.list_mark_speed(self._mark_speed)
-        if self._wobble:
-            for wx, wy in self._wobble(self._last_x, self._last_y, x, y):
-                self.list_mark(wx, wy)
-        else:
-            self.list_mark(x, y)
+        self.list_mark(x, y)
 
     def goto(self, x, y, long=None, short=None, distance_limit=None):
         if x == self._last_x and y == self._last_y:

meerk40t/balormk/device.py

@@ -15,12 +15,13 @@ from meerk40t.core.laserjob import LaserJob
 from meerk40t.core.spoolers import Spooler
 from meerk40t.core.units import Angle, Length
 from meerk40t.core.view import View
+from meerk40t.device.mixins import Status
 from meerk40t.kernel import CommandSyntaxError, Service, signal_listener
 from meerk40t.svgelements import Path, Point
 from meerk40t.tools.geomstr import Geomstr
 
 
-class BalorDevice(Service):
+class BalorDevice(Service, Status):
     """
     The BalorDevice is a MeerK40t service for the device type. It should be the main method of interacting with
     the rest of meerk40t. It defines how the scene should look and contains a spooler which meerk40t will give jobs
@@ -29,6 +30,7 @@ class BalorDevice(Service):
 
     def __init__(self, kernel, path, *args, choices=None, **kwargs):
         Service.__init__(self, kernel, path)
+        Status.__init__(self)
         self.name = "balor"
         self.extension = "lmc"
         self.job = None
@@ -1791,35 +1793,27 @@ class BalorDevice(Service):
             """
             if data is None:
                 data = list(self.elements.elems(emphasized=True))
-            pts = []
+            g = Geomstr()
             for e in data:
-                if e.type == "elem image":
+                if hasattr(e, "as_image"):
                     bounds = e.bounds
-                    pts += [
-                        (bounds[0], bounds[1]),
-                        (bounds[0], bounds[3]),
-                        (bounds[2], bounds[1]),
-                        (bounds[2], bounds[3]),
-                    ]
+                    g.append(
+                        Geomstr.rect(
+                            bounds[0],
+                            bounds[1],
+                            bounds[2] - bounds[0],
+                            bounds[3] - bounds[1],
+                        )
+                    )
                 elif e.type == "elem text":
                     continue  # We can't outline text.
                 else:
-                    try:
-                        path = abs(Path(e.shape))
-                    except AttributeError:
-                        try:
-                            path = abs(e.path)
-                        except AttributeError:
-                            continue
-                    pts += [q for q in path.as_points()]
-            hull = [p for p in Point.convex_hull(pts)]
+                    g.append(e.as_geometry())
+            hull = Geomstr.hull(g)
             if len(hull) == 0:
                 channel(_("No elements bounds to trace."))
                 return
-            hull.append(hull[0])  # loop
-            hull = list(map(complex, hull))
-            geometry = Geomstr.lines(*hull)
-            return "geometry", geometry
+            return "geometry", hull
 
         def ant_points(points, steps):
             points = list(points)

meerk40t/balormk/driver.py

@@ -102,7 +102,7 @@ class BalorDriver:
         """
         Required.
 
-        Sets a laser parameter this could be speed, power, wobble, number_of_unicorns, or any unknown parameters for
+        Sets a laser parameter this could be speed, power, number_of_unicorns, or any unknown parameters for
         yet to be written drivers.
 
         @param key:
@@ -186,7 +186,6 @@ class BalorDriver:
         con.program_mode()
         self._list_bits = con._port_bits
         last_on = None
-        con.set_wobble(None)
         queue = self.queue
         self.queue = list()
         for q in queue:
@@ -198,7 +197,6 @@ class BalorDriver:
                 except KeyError:
                     self.value_penbox = None
             con.set_settings(settings)
-            con.set_wobble(settings)
             # LOOP CHECKS
             if self._aborting:
                 con.abort()
@@ -323,7 +321,6 @@ class BalorDriver:
                                 except KeyError:
                                     self.value_penbox = None
                             con.set_settings(settings)
-                            con.set_wobble(settings)
                         elif on & (
                             PLOT_RAPID | PLOT_JOG
                         ):  # Plot planner requests position change.
@@ -533,6 +530,7 @@ class BalorDriver:
             return
         self.paused = True
         self.connection.pause()
+        self.service.signal("pause")
 
     def resume(self):
         """
@@ -545,6 +543,7 @@ class BalorDriver:
         """
         self.paused = False
         self.connection.resume()
+        self.service.signal("pause")
 
     def reset(self):
         """
@@ -554,6 +553,7 @@ class BalorDriver:
         """
         self.paused = False
         self.connection.abort()
+        self.service.signal("pause")
 
     def dwell(self, time_in_ms):
         """

meerk40t/balormk/gui/balorconfig.py

@@ -4,7 +4,7 @@ from meerk40t.device.gui.defaultactions import DefaultActionPanel
 from meerk40t.device.gui.formatterpanel import FormatterPanel
 from meerk40t.device.gui.warningpanel import WarningPanel
 from meerk40t.gui.choicepropertypanel import ChoicePropertyPanel
-from meerk40t.gui.icons import icons8_administrative_tools_50
+from meerk40t.gui.icons import icons8_administrative_tools
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.kernel import signal_listener
 
@@ -16,7 +16,7 @@ class BalorConfiguration(MWindow):
         super().__init__(420, 570, *args, **kwds)
         self.context = self.context.device
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_administrative_tools_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_administrative_tools.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_(_("Balor-Configuration")))
 

meerk40t/balormk/gui/balorcontroller.py

@@ -2,7 +2,11 @@ import threading
 
 import wx
 
-from meerk40t.gui.icons import icons8_connected_50, icons8_disconnected_50
+from meerk40t.gui.icons import (
+    get_default_icon_size,
+    icons8_connected,
+    icons8_disconnected,
+)
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import dip_size
 from meerk40t.kernel import signal_listener
@@ -58,7 +62,9 @@ class BalorControllerPanel(wx.ScrolledWindow):
             _("Force connection/disconnection from the device.")
         )
         self.button_device_connect.SetBitmap(
-            icons8_disconnected_50.GetBitmap(use_theme=False)
+            icons8_disconnected.GetBitmap(
+                use_theme=False, resize=get_default_icon_size()
+            )
         )
         # end wxGlade
 
@@ -89,14 +95,16 @@ class BalorControllerPanel(wx.ScrolledWindow):
     def set_button_connected(self):
         self.button_device_connect.SetBackgroundColour("#00ff00")
         self.button_device_connect.SetBitmap(
-            icons8_connected_50.GetBitmap(use_theme=False)
+            icons8_connected.GetBitmap(use_theme=False, resize=get_default_icon_size())
         )
         self.button_device_connect.Enable()
 
     def set_button_disconnected(self):
         self.button_device_connect.SetBackgroundColour("#dfdf00")
         self.button_device_connect.SetBitmap(
-            icons8_disconnected_50.GetBitmap(use_theme=False)
+            icons8_disconnected.GetBitmap(
+                use_theme=False, resize=get_default_icon_size()
+            )
         )
         self.button_device_connect.Enable()
 
@@ -161,7 +169,7 @@ class BalorController(MWindow):
         self.add_module_delegate(self.panel)
         self.SetTitle(_("Balor-Controller"))
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_connected_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_connected.GetBitmap())
         self.SetIcon(_icon)
         self.Layout()
 

meerk40t/balormk/gui/baloroperationproperties.py

@@ -92,52 +92,6 @@ class BalorOperationPanel(ScrolledPanel):
                 "label": _("Polygon Delay"),
                 "tip": _("Delay amount between different points in the path travel."),
             },
-            {
-                "attr": "wobble_enabled",
-                "object": params,
-                "default": False,
-                "type": bool,
-                "label": _("Enable Wobble"),
-                "tip": _("Enable wobble for this particular cut"),
-            },
-            {
-                "attr": "wobble_radius",
-                "object": params,
-                "default": "1.5mm",
-                "type": Length,
-                "conditional": (params, "wobble_enabled"),
-                "label": _("Radius of wobble"),
-                "tip": _("Radius of the wobble for this cut, if wobble is enabled."),
-            },
-            {
-                "attr": "wobble_interval",
-                "object": params,
-                "default": "0.2mm",
-                "type": Length,
-                "conditional": (params, "wobble_enabled"),
-                "label": _("Wobble Sampling Interval"),
-                "tip": _("Sample interval for the wobble of this cut"),
-            },
-            {
-                "attr": "wobble_speed",
-                "object": params,
-                "default": 50.0,
-                "type": float,
-                "conditional": (params, "wobble_enabled"),
-                "label": _("Wobble Speed Multiplier"),
-                "tip": _("Wobble rotation speed multiplier"),
-            },
-            {
-                "attr": "wobble_type",
-                "object": params,
-                "default": "circle",
-                "type": str,
-                "style": "combo",
-                "choices": list(self.context.match("wobble", suffix=True)),
-                "conditional": (params, "wobble_enabled"),
-                "label": _("Wobble Pattern Type"),
-                "tip": _("Pattern type for the given wobble."),
-            },
         ]
 
         self.panel = ChoicePropertyPanel(

meerk40t/balormk/gui/gui.py

@@ -8,13 +8,13 @@ def plugin(service, lifecycle):
         import wx  # pylint: disable=unused-import
 
         from meerk40t.gui.icons import (
-            icons8_center_of_gravity_50,
-            icons8_computer_support_50,
-            icons8_connected_50,
-            icons8_flash_off_50,
-            icons8_light_off_50,
-            icons8_light_on_50,
-            icons8_quick_mode_on_50,
+            icons8_center_of_gravity,
+            icons8_computer_support,
+            icons8_connected,
+            icons8_flash_off,
+            icons8_flash_on,
+            icons8_light_off,
+            icons8_light_on,
         )
 
         from .balorconfig import BalorConfiguration
@@ -33,7 +33,7 @@ def plugin(service, lifecycle):
             "button/control/Controller",
             {
                 "label": _("Controller"),
-                "icon": icons8_connected_50,
+                "icon": icons8_connected,
                 "tip": _("Opens Controller Window"),
                 "action": lambda e: service("window toggle Controller\n"),
             },
@@ -42,7 +42,7 @@ def plugin(service, lifecycle):
             "button/device/Configuration",
             {
                 "label": _("Config"),
-                "icon": icons8_computer_support_50,
+                "icon": icons8_computer_support,
                 "tip": _("Opens device-specific configuration window"),
                 "action": lambda v: service("window toggle Configuration\n"),
             },
@@ -57,20 +57,20 @@ def plugin(service, lifecycle):
             "button/control/Light_On",
             {
                 "label": _("Galvo Light"),
-                "icon": icons8_light_on_50,
+                "icon": icons8_light_on,
                 "tip": _("Runs outline on selection"),
                 "identifier": "light_default",
                 "multi": [
                     {
                         "identifier": "live-full",
                         "label": _("Live Full"),
-                        "icon": icons8_computer_support_50,
+                        "icon": icons8_computer_support,
                         "action": lambda e: service("full-light\n"),
                     },
                     {
                         "identifier": "live-regmark",
                         "label": _("Regmarks"),
-                        "icon": icons8_computer_support_50,
+                        "icon": icons8_computer_support,
                         "action": lambda e: service("regmark-light\n"),
                     },
                     {
@@ -81,7 +81,7 @@ def plugin(service, lifecycle):
                     {
                         "identifier": "live-hull",
                         "label": _("Live Hull"),
-                        "icon": icons8_computer_support_50,
+                        "icon": icons8_computer_support,
                         "action": lambda e: service("hull-light\n"),
                     },
                     {
@@ -107,7 +107,7 @@ def plugin(service, lifecycle):
                 ],
                 "toggle": {
                     "label": _("Stop Tracing..."),
-                    "icon": icons8_light_off_50,
+                    "icon": icons8_light_off,
                     "tip": _("Turn light off"),
                     "action": lambda v: service("stop\n"),
                     "signal": "light_simulate",
@@ -118,13 +118,13 @@ def plugin(service, lifecycle):
             "button/control/Redlight",
             {
                 "label": _("Red Dot On"),
-                "icon": icons8_quick_mode_on_50,
+                "icon": icons8_flash_on,
                 "tip": _("Turn Redlight On"),
                 "action": lambda v: service("red on\n"),
                 "toggle": {
                     "label": _("Red Dot Off"),
                     "action": lambda v: service("red off\n"),
-                    "icon": icons8_flash_off_50,
+                    "icon": icons8_flash_off,
                 },
             },
         )
@@ -132,7 +132,7 @@ def plugin(service, lifecycle):
             "button/control/Center",
             {
                 "label": _("Center"),
-                "icon": icons8_center_of_gravity_50,
+                "icon": icons8_center_of_gravity,
                 "tip": _("Center selection on laserbed"),
                 "action": lambda v: service("align bed group xy center center\n"),
             },

meerk40t/camera/gui/camerapanel.py

@@ -4,10 +4,11 @@ import wx
 from wx import aui
 
 from meerk40t.gui.icons import (
-    icons8_camera_50,
-    icons8_connected_50,
-    icons8_detective_50,
-    icons8_picture_in_picture_alternative_50,
+    get_default_icon_size,
+    icons8_camera,
+    icons8_connected,
+    icons8_detective,
+    icons8_image_in_frame,
 )
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.scene.sceneconst import (
@@ -75,13 +76,17 @@ class CameraPanel(wx.Panel, Job):
 
         if not pane:
             self.button_update = wx.BitmapButton(
-                self, wx.ID_ANY, icons8_camera_50.GetBitmap()
+                self, wx.ID_ANY, icons8_camera.GetBitmap(resize=get_default_icon_size())
             )
             self.button_export = wx.BitmapButton(
-                self, wx.ID_ANY, icons8_picture_in_picture_alternative_50.GetBitmap()
+                self,
+                wx.ID_ANY,
+                icons8_image_in_frame.GetBitmap(resize=get_default_icon_size()),
             )
             self.button_reconnect = wx.BitmapButton(
-                self, wx.ID_ANY, icons8_connected_50.GetBitmap()
+                self,
+                wx.ID_ANY,
+                icons8_connected.GetBitmap(resize=get_default_icon_size()),
             )
             self.check_fisheye = wx.CheckBox(self, wx.ID_ANY, _("Correct Fisheye"))
             self.check_perspective = wx.CheckBox(
@@ -96,7 +101,9 @@ class CameraPanel(wx.Panel, Job):
                 style=wx.SL_AUTOTICKS | wx.SL_HORIZONTAL | wx.SL_LABELS,
             )
             self.button_detect = wx.BitmapButton(
-                self, wx.ID_ANY, icons8_detective_50.GetBitmap()
+                self,
+                wx.ID_ANY,
+                icons8_detective.GetBitmap(resize=get_default_icon_size()),
             )
             scene_name = f"Camera{self.index}"
         else:
@@ -725,7 +732,7 @@ class CameraInterface(MWindow):
         # ==========
 
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_camera_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_camera.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("CameraInterface {index}").format(index=index))
         self.Layout()
@@ -800,7 +807,7 @@ class CameraInterface(MWindow):
             "button/preparation/Camera",
             {
                 "label": _("Camera"),
-                "icon": icons8_camera_50,
+                "icon": icons8_camera,
                 "tip": _("Opens Camera Window"),
                 "identifier": "camera_id",
                 "action": camera_click(),
@@ -1072,7 +1079,7 @@ class CameraURI(MWindow):
 
         self.panel = CameraURIPanel(self, wx.ID_ANY, context=self.context, index=index)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_camera_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_camera.GetBitmap())
         self.SetIcon(_icon)
         # begin wxGlade: CameraURI.__set_properties
         self.SetTitle(_("URI Manager"))

meerk40t/core/cutcode/rastercut.py

@@ -28,7 +28,9 @@ class RasterCut(CutObject):
         CutObject.__init__(
             self, settings=settings, passes=passes, parent=parent, color=color
         )
-        assert image.mode in ("L", "1")
+        if image.mode not in ("L", "1"):
+            image = image.convert("L")
+        # assert image.mode in ("L", "1")
         self.first = True  # Raster cuts are always first within themselves.
         self.image = image
         self.offset_x = offset_x