meerk40t 0.9.7051__py2.py3-none-any.whl → 0.9.7910__py2.py3-none-any.whl

meerk40t/balormk/controller.py

@@ -288,7 +288,7 @@ class GalvoController:
         self._list_executing = False
         self._number_of_list_packets = 0
         self.paused = False
-        self._signal_updates = self.service.setting(bool, "signal_updates", True)
+        self.service.setting(bool, "signal_updates", True)
 
     def define_pins(self):
         self._light_bit = self.service.setting(int, "light_pin", 8)
@@ -1090,7 +1090,7 @@ class GalvoController:
         x = int(x)
         y = int(y)
         self._list_write(listJumpTo, x, y, angle, distance)
-        if self._signal_updates:
+        if self.service.signal_updates:
             view = self.service.view
             l_x, l_y = view.iposition(self._last_x, self._last_y)
             n_x, n_y = view.iposition(x, y)
@@ -1125,7 +1125,7 @@ class GalvoController:
         y = int(y)
         self._list_write(listMarkTo, x, y, angle, distance)
 
-        if self._signal_updates:
+        if self.service.signal_updates:
             view = self.service.view
             l_x, l_y = view.iposition(self._last_x, self._last_y)
             n_x, n_y = view.iposition(x, y)

meerk40t/balormk/device.py

@@ -893,6 +893,13 @@ class BalorDevice(Service, Status):
         name = self.label.replace(" ", "-")
         return name.replace("/", "-")
 
+    @property
+    def supports_pwm(self):
+        """
+        Returns whether this device supports PWM.
+        """
+        return True
+
     def service_attach(self, *args, **kwargs):
         self.realize()
 

meerk40t/balormk/driver.py

@@ -57,6 +57,7 @@ class BalorDriver:
         self.plot_planner.settings_then_jog = True
         self._aborting = False
         self._list_bits = None
+        self.service.setting(bool, "signal_updates", True)
 
     def __repr__(self):
         return f"BalorDriver({self.name})"
@@ -552,11 +553,12 @@ class BalorDriver:
         if self.native_y < 0:
             self.native_y = 0
         self.connection.set_xy(self.native_x, self.native_y)
-        new_current = self.service.current
-        self.service.signal(
-            "driver;position",
-            (old_current[0], old_current[1], new_current[0], new_current[1]),
-        )
+        if self.service.signal_updates:
+            new_current = self.service.current
+            self.service.signal(
+                "driver;position",
+                (old_current[0], old_current[1], new_current[0], new_current[1]),
+            )
 
     def move_rel(self, dx, dy):
         """
@@ -581,11 +583,12 @@ class BalorDriver:
         if self.native_y < 0:
             self.native_y = 0
         self.connection.set_xy(self.native_x, self.native_y)
-        new_current = self.service.current
-        self.service.signal(
-            "driver;position",
-            (old_current[0], old_current[1], new_current[0], new_current[1]),
-        )
+        if self.service.signal_updates:
+            new_current = self.service.current
+            self.service.signal(
+                "driver;position",
+                (old_current[0], old_current[1], new_current[0], new_current[1]),
+            )
 
     def home(self):
         """
@@ -718,7 +721,7 @@ class BalorDriver:
         self.connection.abort()
         self.service.signal("pause")
 
-    def dwell(self, time_in_ms):
+    def dwell(self, time_in_ms, settings=None):
         """
         Requests that the laser fire in place for the given time period. This could be done in a series of commands,
         move to a location, turn laser on, wait, turn laser off. However, some drivers have specific laser-in-place
@@ -727,14 +730,20 @@ class BalorDriver:
         @param time_in_ms:
         @return:
         """
-        self.pulse(time_in_ms)
+        if settings is not None and "power" in settings:
+            power = settings.get("power")
+        else:
+            power = None
+        self.pulse(time_in_ms, power=power)
 
-    def pulse(self, pulse_time):
+    def pulse(self, pulse_time, power=None):
         self.service.laser_status = "active"
         con = self.connection
         con.program_mode()
         con.frequency(self.service.default_frequency)
-        con.power(self.service.default_power)
+        if power is None:
+            power = self.service.default_power
+        con.power(power)
         if self.service.pulse_width_enabled:
             con.list_fiber_ylpm_pulse_width(self.service.default_pulse_width)
         dwell_time = pulse_time * 100  # Dwell time in ms units in 10 us

meerk40t/balormk/galvo_commands.py

@@ -299,12 +299,15 @@ def plugin(service, lifecycle):
         action="store_true",
         help=_("override one second laser fire pulse duration"),
     )
+    @service.console_option("power", "p", type=str, help=_("Power level"))
     @service.console_argument("time", type=float, help=_("laser fire pulse duration"))
     @service.console_command(
         "pulse",
         help=_("pulse <time>: Pulse the laser in place."),
     )
-    def pulse(command, channel, _, time=None, idonotlovemyhouse=False, **kwargs):
+    def pulse(
+        command, channel, _, time=None, power=None, idonotlovemyhouse=False, **kwargs
+    ):
         if time is None:
             channel(_("Must specify a pulse time in milliseconds."))
             return
@@ -319,9 +322,21 @@ def plugin(service, lifecycle):
                     return
             except IndexError:
                 return
+        if power:
+            try:
+                if power.endswith("%"):
+                    power = float(power[:-1]) * 10
+                else:
+                    power = float(power)
+            except ValueError:
+                channel(_("Invalid power value: {power}").format(power=power))
+                return
         if service.spooler.is_idle:
-            service.spooler.command("pulse", time)
-            channel(_("Pulse laser for {time} milliseconds").format(time=time))
+            service.spooler.command("pulse", time, power)
+            channel(
+                _("Pulse laser for {time} milliseconds").format(time=time)
+                + f"[{power}]"
+            )
         else:
             channel(_("Pulse laser failed: Busy"))
         return

meerk40t/balormk/gui/balorconfig.py

@@ -235,3 +235,9 @@ class BalorConfiguration(MWindow):
     @staticmethod
     def helptext():
         return _("Display and edit device configuration")
+
+    @signal_listener("activate;device")
+    def on_device_changes(self, *args):
+        # Device activated, make sure we are still fine...
+        if self.context.device.name != 'balor':
+            wx.CallAfter(self.Close)

meerk40t/balormk/livelightjob.py

@@ -41,11 +41,12 @@ class LiveLightJob:
         self._travel_speed = travel_speed
         self._jump_delay = jump_delay
 
+        self._signal_mode = True
         # Kernel Job definition
         self.redlight_lock = threading.RLock()
         self.redlight_job = Job(
             self.jobevent,
-            interval=0.1,
+            # interval=0.1,
             job_name=f"redlight_{self.mode}_{time.perf_counter():3f}",
             run_main=False,
         )
@@ -177,20 +178,24 @@ class LiveLightJob:
                 con._goto_speed = self.service.redlight_speed
             con.light_mode()
 
+        # print (f"Redlight job {self.label} running...")
         if self.stopped or self._connection is None:
             return
         con = self._connection
-        if self.changed:
-            # print ("Something changed")
-            with self.redlight_lock:
-                if self.update_method is not None:
-                    self.update_method()
-                # print (f"We are having now {len(self.points)} points")
-                self.changed = False
-            init_red(con)
-
-        # Now draw the stuff
-        self.trace_redlight(con)
+        while not self.stopped:
+            if self.changed:
+                # print ("Something changed")
+                with self.redlight_lock:
+                    if self.update_method is not None:
+                        self.update_method()
+                        # print (f"We are having now {len(self.points)} points")
+                        # for i, e in enumerate(self.points):
+                        #     print (f"Point {i}: {e}")
+                    self.changed = False
+                init_red(con)
+
+            # Now draw the stuff
+            self.trace_redlight(con)
 
     def trace_redlight(self, con):
         """Trace the redlight path.
@@ -206,6 +211,9 @@ class LiveLightJob:
         delay_dark = self.service.delay_jump_long
         delay_between = self.service.delay_jump_short
         move = True
+        # We need to jump back to the first point
+        first = True
+        first_x, first_y = None, None
         for i, e in enumerate(self.points):
             if self.stopped or self.changed:
                 # Abort due to stoppage or change, no sense to continue
@@ -227,11 +235,16 @@ class LiveLightJob:
                 # Fix them.
                 x &= 0xFFFF
                 y &= 0xFFFF
+            if first:
+                first_x, first_y = x, y
+                first = False
             if move:
                 con.dark(x, y, long=delay_dark, short=delay_dark)
                 move = False
                 continue
             con.light(x, y, long=delay_between, short=delay_between)
+        if first_x is not None and first_y is not None:
+            con.dark(first_x, first_y, long=delay_dark, short=delay_dark)
         con.light_off()
         con.write_port()
 
@@ -243,7 +256,13 @@ class LiveLightJob:
         """
         if not self.listen:
             return
-        for method in ("emphasized", "modified_by_tool", "updating", "view;realized"):
+        for method in (
+            "emphasized",
+            "modified_by_tool",
+            "updating",
+            "view;realized",
+            "update_group_labels",
+        ):
             if start:
                 self.service.listen(method, self.on_emphasis_changed)
             else:
@@ -265,6 +284,8 @@ class LiveLightJob:
         self._connection = driver.connection
         self._connection.rapid_mode()
         self._connection.light_mode()
+        self._signal_mode = driver.service.signal_updates
+        driver.service.signal_updates = False
         self.update()
         self.service.kernel.schedule(self.redlight_job)
 
@@ -283,6 +304,7 @@ class LiveLightJob:
         self.redlight_job.cancel()
         self.service.kernel.unschedule(self.redlight_job)
         self.setup_listen(False)
+        driver.service.signal_updates = self._signal_mode
         if self._connection is not None:
             self._connection.abort()
             if self.service.redlight_preferred:
@@ -458,7 +480,7 @@ class LiveLightJob:
         geometry.transform(rotate)
         self.points = list(
             geometry.as_equal_interpolated_points(
-                distance=self.quantization, expand_lines=True
+                distance=self.quantization,  # expand_lines=True
             )
         )
         # print (f"Interpolation delivered: {len(self.points)} segments")

meerk40t/camera/camera.py

@@ -38,6 +38,7 @@ class Camera(Service):
         self.camera_thread = None
         self.max_tries_connect = 10
         self.max_tries_frame = 10
+        self.setting(str, "desc", "")
         self.setting(int, "width", 640)
         self.setting(int, "height", 480)
         self.setting(bool, "correction_fisheye", False)

meerk40t/camera/gui/camerapanel.py

@@ -19,7 +19,13 @@ from meerk40t.gui.scene.sceneconst import (
 )
 from meerk40t.gui.scene.scenepanel import ScenePanel
 from meerk40t.gui.scene.widget import Widget
-from meerk40t.gui.wxutils import TextCtrl, wxButton, wxBitmapButton, wxCheckBox, wxListCtrl
+from meerk40t.gui.wxutils import (
+    TextCtrl,
+    wxBitmapButton,
+    wxButton,
+    wxCheckBox,
+    wxListCtrl,
+)
 from meerk40t.kernel import Job, signal_listener
 from meerk40t.svgelements import Color
 
@@ -28,23 +34,32 @@ _ = wx.GetTranslation
 CORNER_SIZE = 25
 
 
+def _get_camera_attribute(kernel, camera, attribute, default=None):
+    if isinstance(camera, int):
+        camera = f"camera/{camera}"
+    label = kernel.read_persistent(str, camera, attribute, default)
+    return label or default
+
+
 def register_panel_camera(window, context):
     for index in range(5):
         panel = CameraPanel(
             window, wx.ID_ANY, context=context, gui=window, index=index, pane=True
         )
+        label = _("Camera {index}").format(index=index)
         pane = (
             aui.AuiPaneInfo()
             .Left()
             .MinSize(200, 150)
             .FloatingSize(640, 480)
-            .Caption(_("Camera {index}").format(index=index))
+            .Caption(label)
             .Name(f"camera{index}")
             .CaptionVisible(not context.pane_lock)
             .Hide()
         )
         pane.dock_proportion = 200
         pane.control = panel
+        panel.pane_aui = pane
         pane.submenu = "_60_" + _("Camera")
         pane.helptext = _("Show camera capture panel")
         window.on_pane_create(pane)
@@ -64,6 +79,7 @@ class CameraPanel(wx.Panel, Job):
         self.index = index
         self.cam_device_link = {}
         self.pane = pane
+        self.pane_aui = None
 
         if pane:
             job_name = f"CamPane{self.index}"
@@ -83,12 +99,16 @@ class CameraPanel(wx.Panel, Job):
 
         if not pane:
             self.button_update = wxBitmapButton(
-                self, wx.ID_ANY, icons8_camera.GetBitmap(resize=get_default_icon_size(self.context))
+                self,
+                wx.ID_ANY,
+                icons8_camera.GetBitmap(resize=get_default_icon_size(self.context)),
             )
             self.button_export = wxBitmapButton(
                 self,
                 wx.ID_ANY,
-                icons8_image_in_frame.GetBitmap(resize=get_default_icon_size(self.context)),
+                icons8_image_in_frame.GetBitmap(
+                    resize=get_default_icon_size(self.context)
+                ),
             )
             self.button_reconnect = wxBitmapButton(
                 self,
@@ -224,6 +244,29 @@ class CameraPanel(wx.Panel, Job):
         self.camera.listen("camera;stopped", self.on_camera_stop)
         self.camera.gui = self
         self.camera("camera focus -5% -5% 105% 105%\n")
+        label = _get_camera_attribute(
+            self.context.kernel,
+            self.index,
+            "desc",
+            _("Camera {index}").format(index=self.index),
+        )
+        if self.pane and self.pane_aui is not None:
+            # If this is a pane, we set the title of the pane.
+            # print (f"Setting pane title to {label}")
+            self.pane_aui.Caption(label)
+            self.pane_aui.caption = label
+        else:
+            self.GetParent().SetTitle(label)
+
+    @property
+    def caption(self):
+        # Property to get the caption of the corresponding pane menu item
+        return _get_camera_attribute(
+            self.context.kernel,
+            self.index,
+            "desc",
+            _("Camera {index}").format(index=self.index),
+        )
 
     def pane_hide(self, *args):
         self.camera(f"camera{self.index} stop\n")
@@ -407,6 +450,7 @@ class CameraPanel(wx.Panel, Job):
         self.camera(f"camera{self.index} --uri {str(uri)} stop start\n")
         self.frame_bitmap = None
 
+
 class CamInterfaceWidget(Widget):
     def __init__(self, scene, camera):
         Widget.__init__(self, scene, all=True)
@@ -436,6 +480,7 @@ class CamInterfaceWidget(Widget):
 
     def event(self, window_pos=None, space_pos=None, event_type=None, **kwargs):
         if event_type == "rightdown":
+
             def set_resolution(width, height):
                 def handler(*args):
                     self.cam.set_resolution(this_w, this_h)
@@ -477,9 +522,27 @@ class CamInterfaceWidget(Widget):
             def set_device_link(devlabel):
                 if devlabel:
                     self.cam.cam_device_link[self.cam.index] = devlabel
-                else: # Empty or None
+                else:  # Empty or None
                     self.cam.cam_device_link.pop(self.cam.index, None)
 
+            def change_label(event=None):
+                """
+                Change the label of the camera.
+                """
+                dialog = wx.TextEntryDialog(
+                    self.cam,
+                    _("Enter a new label for the camera:"),
+                    _("Change camera label"),
+                    str(self.cam.camera.desc or ""),
+                )
+                if dialog.ShowModal() == wx.ID_OK:
+                    new_label = dialog.GetValue().strip()
+                    if new_label:
+                        self.cam.context(
+                            f'camera{self.cam.index} label "{new_label}"\n'
+                        )
+                dialog.Destroy()
+
             menu = wx.Menu()
 
             item = menu.Append(wx.ID_ANY, _("Update Background"), "")
@@ -519,7 +582,9 @@ class CamInterfaceWidget(Widget):
             def has_live_job():
                 we_have_a_job = False
                 try:
-                    obj = self.cam.context.kernel.jobs[f"timer.updatebg{self.cam.index}"]
+                    obj = self.cam.context.kernel.jobs[
+                        f"timer.updatebg{self.cam.index}"
+                    ]
                     if obj is not None:
                         we_have_a_job = True
                 except KeyError:
@@ -539,15 +604,19 @@ class CamInterfaceWidget(Widget):
             def set_link(devlabel):
                 def handler(event):
                     set_device_link(devlabel)
+
                 return handler
 
             def unset_link(devlabel):
                 def handler(event):
                     set_device_link("")
+
                 return handler
 
             link = get_device_link()
-            item = submenu.Append(wx.ID_ANY, _("Device independent"), kind=wx.ITEM_RADIO)
+            item = submenu.Append(
+                wx.ID_ANY, _("Device independent"), kind=wx.ITEM_RADIO
+            )
             if link == "":
                 item.Check(True)
                 self.cam.Bind(wx.EVT_MENU, unset_link(""), id=item.GetId())
@@ -587,17 +656,18 @@ class CamInterfaceWidget(Widget):
                 cam_w, cam_h = self.cam.camera.get_resolution()
                 resmen = wx.Menu()
                 for res_w, res_h, res_desc in self.cam.available_resolutions:
-                    item = resmen.Append(wx.ID_ANY, f"{res_w}x{res_h} - {res_desc}", kind=wx.ITEM_RADIO)
+                    item = resmen.Append(
+                        wx.ID_ANY, f"{res_w}x{res_h} - {res_desc}", kind=wx.ITEM_RADIO
+                    )
                     if res_h == cam_h and res_w == cam_w:
                         item.Check(True)
                     self.cam.Bind(
                         wx.EVT_MENU,
                         set_resolution(res_w, res_h),
                         id=item.GetId(),
-                     )
+                    )
                 menu.AppendSubMenu(resmen, _("Set camera resolution..."))
 
-
             item = menu.Append(wx.ID_ANY, _("Open CameraInterface"), "")
             self.cam.Bind(
                 wx.EVT_MENU,
@@ -733,6 +803,13 @@ class CamInterfaceWidget(Widget):
                 _("Manage URIs"),
                 sub_menu,
             )
+            menu.AppendSeparator()
+            item = menu.Append(wx.ID_ANY, _("Change Label"), "")
+            self.cam.Bind(
+                wx.EVT_MENU,
+                change_label,
+                id=item.GetId(),
+            )
             if menu.MenuItemCount != 0:
                 self.cam.PopupMenu(menu)
                 menu.Destroy()
@@ -863,14 +940,43 @@ class CameraInterface(MWindow):
         _icon = wx.NullIcon
         _icon.CopyFromBitmap(icons8_camera.GetBitmap())
         self.SetIcon(_icon)
-        self.SetTitle(_("CameraInterface {index}").format(index=self.index))
+        self.update_title()
         self.Layout()
         self.restore_aspect()
 
+    def update_title(self):
+        """
+        Updates the title of the window to reflect the current camera index.
+        """
+        label = _get_camera_attribute(
+            self.context.kernel,
+            self.index,
+            "desc",
+            _("Camera {index}").format(index=self.index),
+        )
+        self.SetTitle(label)
+
     def create_menu(self, append):
         def identify_cameras(event=None):
             self.context("camdetect\n")
 
+        def change_label(event=None):
+            """
+            Change the label of the camera.
+            """
+            dialog = wx.TextEntryDialog(
+                self,
+                _("Enter a new label for the camera:"),
+                _("Change camera label"),
+                str(self.camera.desc or ""),
+            )
+            if dialog.ShowModal() == wx.ID_OK:
+                new_label = dialog.GetValue().strip()
+                if new_label:
+                    self.context(f'camera{self.index} label "{new_label}"\n')
+                    self.update_title()
+            dialog.Destroy()
+
         wxglade_tmp_menu = wx.Menu()
         item = wxglade_tmp_menu.Append(wx.ID_ANY, _("Reset Fisheye"), "")
         self.Bind(wx.EVT_MENU, self.panel.reset_fisheye, id=item.GetId())
@@ -904,6 +1010,12 @@ class CameraInterface(MWindow):
             )
             self.Bind(wx.EVT_MENU, self.panel.swap_camera(i), id=item.GetId())
         wxglade_tmp_menu.AppendSeparator()
+        item = wxglade_tmp_menu.Append(wx.ID_ANY, _("Change camera label"), "")
+        self.Bind(
+            wx.EVT_MENU,
+            change_label,
+            id=item.GetId(),
+        )
         item = wxglade_tmp_menu.Append(wx.ID_ANY, _("Identify cameras"), "")
         self.Bind(wx.EVT_MENU, identify_cameras, id=item.GetId())
 
@@ -932,6 +1044,29 @@ class CameraInterface(MWindow):
         def detect_usb_cameras(event=None):
             camera("camdetect\n")
 
+        caminfo = []
+        for idx in range(5):
+            label = _get_camera_attribute(
+                kernel, idx, "desc", _("Camera {index}").format(index=idx)
+            )
+            caminfo.append(
+                {
+                    "identifier": f"cam{idx}",
+                    "label": label,
+                    "action": camera_click(idx),
+                    "signal": f"camset{idx}",
+                    "multi_autoexec": True,
+                },
+            )
+        caminfo.append(
+            {
+                "identifier": "id_cam",
+                "label": _("Identify cameras"),
+                "tip": _("Detects cameras on the system and sets them up"),
+                "action": detect_usb_cameras,
+                "multi_autoexec": True,
+            },
+        )
         kernel.register(
             "button/preparation/Camera",
             {
@@ -941,49 +1076,7 @@ class CameraInterface(MWindow):
                 "identifier": "camera_id",
                 "action": camera_click(),
                 "priority": 3,
-                "multi": [
-                    {
-                        "identifier": "cam0",
-                        "label": _("Camera {index}").format(index=0),
-                        "action": camera_click(0),
-                        "signal": "camset0",
-                        "multi_autoexec": True,
-                    },
-                    {
-                        "identifier": "cam1",
-                        "label": _("Camera {index}").format(index=1),
-                        "action": camera_click(1),
-                        "signal": "camset1",
-                        "multi_autoexec": True,
-                    },
-                    {
-                        "identifier": "cam2",
-                        "label": _("Camera {index}").format(index=2),
-                        "action": camera_click(2),
-                        "signal": "camset2",
-                        "multi_autoexec": True,
-                    },
-                    {
-                        "identifier": "cam3",
-                        "label": _("Camera {index}").format(index=3),
-                        "action": camera_click(3),
-                        "signal": "camset3",
-                        "multi_autoexec": True,
-                    },
-                    {
-                        "identifier": "cam4",
-                        "label": _("Camera {index}").format(index=4),
-                        "action": camera_click(4),
-                        "signal": "camset4",
-                        "multi_autoexec": True,
-                    },
-                    {
-                        "identifier": "id_cam",
-                        "label": _("Identify cameras"),
-                        "action": detect_usb_cameras,
-                        "multi_autoexec": True,
-                    },
-                ],
+                "multi": caminfo,
             },
         )
         kernel.register("window/CameraURI", CameraURI)
@@ -1058,6 +1151,7 @@ class CameraInterface(MWindow):
     def helptext():
         return _("Display the camera window")
 
+
 class CameraURIPanel(wx.Panel):
     def __init__(self, *args, context=None, index=None, **kwds):
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
@@ -1070,8 +1164,11 @@ class CameraURIPanel(wx.Panel):
         assert isinstance(self.index, int)
         self.context.setting(list, "uris", [])
         self.list_uri = wxListCtrl(
-            self, wx.ID_ANY, style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES,
-            context=self.context, list_name="list_camerauri",
+            self,
+            wx.ID_ANY,
+            style=wx.LC_HRULES | wx.LC_REPORT | wx.LC_VRULES,
+            context=self.context,
+            list_name="list_camerauri",
         )
         self.button_add = wxButton(self, wx.ID_ANY, _("Add URI"))
         self.text_uri = TextCtrl(self, wx.ID_ANY, "")
@@ -1198,8 +1295,7 @@ class CameraURIPanel(wx.Panel):
     def on_tree_popup_clear(self, index):
         def delete(event):
             if self.context.kernel.yesno(
-                _("Do you really want to delete all entries?"),
-                caption=_("URI-Manager")
+                _("Do you really want to delete all entries?"), caption=_("URI-Manager")
             ):
                 self.context.uris.clear()
                 self.changed = True