meerk40t 0.9.7900__tar.gz → 0.9.7930__tar.gz

{meerk40t-0.9.7900 → meerk40t-0.9.7930}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meerk40t
-Version: 0.9.7900
+Version: 0.9.7930
 Summary: MeerK40t LaserCutter Software
 Home-page: https://github.com/meerk40t/meerk40t
 Author: Tatarize

{meerk40t-0.9.7900 → meerk40t-0.9.7930}/meerk40t/balormk/controller.py

@@ -438,6 +438,16 @@ class GalvoController:
     # MODE SHIFTS
     #######################
 
+    def mode_shift(self, mode):
+        if self.source == "fiber":
+            self.set_fiber_mo(mode)
+        elif self.source == "uv":
+            # unclear what this does.
+            pass
+        elif self.source == "co2":
+            # unclear what this does.
+            pass
+
     def raw_mode(self):
         self.mode = DRIVER_STATE_RAW
 
@@ -452,8 +462,7 @@ class GalvoController:
         self._list_executing = False
         self._number_of_list_packets = 0
         self.wait_idle()
-        if self.source == "fiber":
-            self.set_fiber_mo(0)
+        self.mode_shift(0)
         self.port_off(bit=0)
         self.write_port()
         marktime = self.get_mark_time()
@@ -472,15 +481,13 @@ class GalvoController:
             self.light_off()
             self.port_on(bit=0)
             self.write_port()
-            if self.source == "fiber":
-                self.set_fiber_mo(1)
+            self.mode_shift(1)
         else:
             self.mode = DRIVER_STATE_PROGRAM
             self.reset_list()
             self.port_on(bit=0)
             self.write_port()
-            if self.source == "fiber":
-                self.set_fiber_mo(1)
+            self.mode_shift(1)
             self._ready = None
             self._speed = None
             self._travel_speed = None
@@ -494,8 +501,23 @@ class GalvoController:
             self._delay_poly = None
             self._delay_end = None
             self.list_ready()
-            if self.service.delay_openmo != 0 and self.source == "fiber":
-                self.list_delay_time(int(self.service.delay_openmo * 100))
+            # Type specific initialization.
+            if self.source == "fiber":
+                if self.service.delay_openmo != 0:
+                    self.list_delay_time(int(self.service.delay_openmo * 100))
+            elif self.source == "co2":
+                # unclear what this does.
+                pass
+            elif self.source == "uv":
+                """
+                According to https://discord.com/channels/910979180970278922/932730275253854209/1394709596647592006
+                self.list_mark_frequency(0x014D)  # 333
+                self.list_set_co2_fpk(0x0043, 0x0043)  # 67, 67
+                self.list_mark_power_ratio(0x00F0)  # 240
+
+                fpk, power, frequency are already done in set_settings.
+                """
+                pass
             self.list_write_port()
             self.list_jump_speed(self.service.default_rapid_speed)
 
@@ -503,8 +525,7 @@ class GalvoController:
         if self.mode == DRIVER_STATE_LIGHT:
             return
         if self.mode == DRIVER_STATE_PROGRAM:
-            if self.source == "fiber":
-                self.set_fiber_mo(0)
+            self.mode_shift(0)
             self.port_off(bit=0)
             self.port_on(self._light_bit)
             self.write_port()
@@ -635,6 +656,11 @@ class GalvoController:
             self.frequency(frequency)
             self.fpk(fpk)
             self.power(power)
+        elif self.source == "uv":
+            self.frequency(frequency)
+            self.fpk(fpk)
+            self.power(power)
+
         self.list_mark_speed(float(settings.get("speed", self.service.default_speed)))
 
         if str(settings.get("timing_enabled", False)).lower() == "true":
@@ -893,8 +919,11 @@ class GalvoController:
         if self.source == "co2":
             power_ratio = int(round(200 * power / self._frequency))
             self.list_mark_power_ratio(power_ratio)
-        if self.source == "fiber":
+        elif self.source == "fiber":
             self.list_mark_current(self._convert_power(power))
+        elif self.source == "uv":
+            power_ratio = int(round(200 * power / self._frequency))
+            self.list_mark_power_ratio(power_ratio)
 
     def frequency(self, frequency):
         if self._frequency == frequency:
@@ -904,6 +933,10 @@ class GalvoController:
             self.list_qswitch_period(self._convert_frequency(frequency, base=20000.0))
         elif self.source == "co2":
             self.list_mark_frequency(self._convert_frequency(frequency, base=10000.0))
+        elif self.source == "uv":
+            # UV source uses the same frequency as CO2.
+            # It is not clear if this is correct.
+            self.list_mark_frequency(self._convert_frequency(frequency, base=10000.0))
 
     def fpk(self, fpk):
         """
@@ -911,8 +944,8 @@ class GalvoController:
         @param fpk: first_pulse_killer value in percent.
         @return:
         """
-        if self.source != "co2":
-            # FPK only used for CO2 source.
+        if self.source not in ("co2", "uv"):
+            # FPK only used for CO2 and UV sources.
             return
         if self._fpk == fpk or fpk is None:
             return

{meerk40t-0.9.7900 → meerk40t-0.9.7930}/meerk40t/balormk/livelightjob.py

@@ -86,9 +86,9 @@ class LiveLightJob:
 
     @property
     def status(self):
-        if self.is_running and self.time_started is not None:
+        if self.is_running() and self.time_started is not None:
             return "Running"
-        elif not self.is_running:
+        elif not self.is_running():
             return "Disabled"
         else:
             return "Queued"
@@ -233,8 +233,8 @@ class LiveLightJob:
                     # We required them in frame.
                     continue
                 # Fix them.
-                x &= 0xFFFF
-                y &= 0xFFFF
+                x = max(min(x, 0xFFFF), 0)
+                y = max(min(y, 0xFFFF), 0)
             if first:
                 first_x, first_y = x, y
                 first = False
@@ -333,7 +333,7 @@ class LiveLightJob:
         self.update()
 
     def update_crosshair(self):
-        """Update the redlight path to display crosshairs. Fallback case when nohing can be displayed"""
+        """Update the redlight path to display crosshairs. Fallback case when nothing can be displayed"""
         margin = 5000
         geometry = Geomstr.lines(
             (0x8000, 0x8000),
@@ -348,10 +348,37 @@ class LiveLightJob:
         )
         self.prepare_redlight_point(geometry, False, "crosshair")
 
+    def update_lightning(self):
+        """
+        Update the redlight path to display lightning bolts.
+        Fallback case for out of bounds paths
+        """
+        margin = float(Length("1cm"))
+        orgx = self.service.view.width // 2
+        orgy = self.service.view.height // 2
+
+        geometry = Geomstr.lines(
+            (orgx - margin, orgy - 2 * margin),  # top
+            (orgx - margin, orgy + margin),
+            (orgx + margin, orgy - margin),
+            (orgx + margin, orgy + 2 * margin),
+        )
+        geometry2 = Geomstr.lines(
+            (orgx + 0.5 * margin, orgy + 1.5 * margin),  # left
+            (orgx + 0.5 * margin, orgy + 1.5 * margin),  # left
+            (orgx + margin, orgy + 2 * margin),
+            (orgx + 1.5 * margin, orgy + 1.5 * margin),
+            (orgx + 0.5 * margin, orgy + 1.5 * margin),  # left
+        )
+        geometry.append(geometry2)
+
+        self.prepare_redlight_point(geometry, True, "lightning")
+
     def update_geometry(self):
         """Update the redlight path based on the provided geometry. Static, won't be changed."""
         if self._geometry is None:
-            self.update_crosshair()
+            # self.update_crosshair()
+            self.update_lightning()
             return
         geometry = Geomstr(self._geometry)
         self.prepare_redlight_point(geometry, not self.raw, "geometry")
@@ -363,7 +390,7 @@ class LiveLightJob:
             return
         geometry = method(elems)
         if geometry is None:
-            self.update_crosshair()
+            self.update_lightning()
             return
 
         self.prepare_redlight_point(geometry, True, source)

{meerk40t-0.9.7900 → meerk40t-0.9.7930}/meerk40t/core/cutcode/plotcut.py

@@ -59,7 +59,8 @@ class PlotCut(CutObject):
         # Default to vector settings.
         self.settings["raster_step_x"] = 0
         self.settings["raster_step_y"] = 0
-        self.settings["power"] = 1000.0
+        # We shouldn't reset power here, because it is set by the plot planner.
+        # self.settings["power"] = 1000.0
         speed = self.settings.get("speed", 0)
         if speed is None:
             return False

{meerk40t-0.9.7900 → meerk40t-0.9.7930}/meerk40t/core/elements/branches.py

@@ -830,13 +830,13 @@ def init_commands(kernel):
 
     @self.console_argument(
         "x",
-        type=Length,
+        type=str,
         default=0,
         help=_("X-Coordinate of Goto?"),
     )
     @self.console_argument(
         "y",
-        type=Length,
+        type=str,
         default=0,
         help=_("Y-Coordinate of Goto?"),
     )
@@ -848,11 +848,22 @@ def init_commands(kernel):
     )
     def gotoop(
         command,
+        channel,
+        _,
         x=0,
         y=0,
         **kwargs,
     ):
-        op = self.op_branch.add(type="util goto", x=str(x), y=str(y))
+        lensett = self.length_settings()
+        try:
+            # fmt: off
+            # The goto operation expects x and y to be in parsable length format.
+            sx = Length(x, relative_length=self.device.view.width, settings=lensett).length_mm
+            sy = Length(y, relative_length=self.device.view.height, settings=lensett).length_mm
+            # fmt: on
+        except ValueError:
+            raise CommandSyntaxError(_("Invalid length value."))
+        op = self.op_branch.add(type="util goto", x=sx, y=sy)
         return "ops", [op]
 
     @self.console_command(
@@ -1326,10 +1337,10 @@ def init_commands(kernel):
         return "elements", data
 
     @self.console_option(
-        "dx", "x", help=_("copy offset x (for elems)"), type=Length, default=0
+        "dx", "x", help=_("copy offset x (for elems)"), type=str, default=0
     )
     @self.console_option(
-        "dy", "y", help=_("copy offset y (for elems)"), type=Length, default=0
+        "dy", "y", help=_("copy offset y (for elems)"), type=str, default=0
     )
     @self.console_option(
         "copies", "c", help=_("amount of copies to be created"), type=int, default=1
@@ -1341,7 +1352,16 @@ def init_commands(kernel):
         output_type=("elements", "ops"),
     )
     def e_copy(
-        data=None, data_type=None, post=None, dx=None, dy=None, copies=None, **kwargs
+        command,
+        channel,
+        _,
+        data=None,
+        data_type=None,
+        post=None,
+        dx=None,
+        dy=None,
+        copies=None,
+        **kwargs,
     ):
         if data_type is None:
             if data is None:
@@ -1378,14 +1398,15 @@ def init_commands(kernel):
             self.add_ops(add_ops)
             return "ops", add_ops
         else:
-            if dx is None:
-                x_pos = 0
-            else:
-                x_pos = float(dx)
-            if dy is None:
-                y_pos = 0
-            else:
-                y_pos = float(dy)
+            lensett = self.length_settings()
+            try:
+                # fmt: off
+                x_pos = 0 if dx is None else float(Length(dx, relative_length=self.device.view.width, settings=lensett))
+                y_pos = 0 if dy is None else float(Length(dy, relative_length=self.device.view.height, settings=lensett))
+                # fmt: on
+            except ValueError:
+                channel(_("Invalid length value for copy offset."))
+                return
             add_elem = list()
             shift = list()
             tx = 0

{meerk40t-0.9.7900 → meerk40t-0.9.7930}/meerk40t/core/elements/clipboard.py

@@ -77,8 +77,8 @@ def init_commands(kernel):
         self.signal("icons")
         return "elements", self._clipboard[destination]
 
-    @self.console_option("dx", "x", help=_("paste offset x"), type=Length, default=0)
-    @self.console_option("dy", "y", help=_("paste offset y"), type=Length, default=0)
+    @self.console_option("dx", "x", help=_("paste offset x"), type=str, default=0)
+    @self.console_option("dy", "y", help=_("paste offset y"), type=str, default=0)
     @self.console_command(
         "paste",
         help=_("clipboard paste"),
@@ -123,15 +123,11 @@ def init_commands(kernel):
         if len(pasted) == 0:
             channel(_("Error: Clipboard Empty"))
             return
-
-        if dx is not None:
-            dx = float(dx)
-        else:
-            dx = 0
-        if dy is not None:
-            dy = float(dy)
-        else:
-            dy = 0
+        lensett = self.length_settings()
+        # fmt: off
+        dx = 0 if dx is None else float(Length(dx, relative_length=self.device.view.width, settings=lensett))
+        dy = 0 if dy is None else float(Length(dy, relative_length=self.device.view.height, settings=lensett))
+        # fmt: on
         if dx != 0 or dy != 0:
             matrix = Matrix.translate(dx, dy)
             for node in pasted:
@@ -139,7 +135,9 @@ def init_commands(kernel):
         # _("Clipboard paste")
         with self.undoscope("Clipboard paste"):
             if len(pasted) > 1:
-                group = self.elem_branch.add(type="group", label="Group", id="Copy", expanded=True)
+                group = self.elem_branch.add(
+                    type="group", label="Group", id="Copy", expanded=True
+                )
             else:
                 group = self.elem_branch
             target = []

{meerk40t-0.9.7900 → meerk40t-0.9.7930}/meerk40t/core/elements/elements.py

@@ -4404,6 +4404,29 @@ class Elemental(Service):
 
         return changed, before, after
 
+    def length_settings(self):
+        settings = {}
+        bb = self.selected_area()
+        if bb is None:
+            bb = [
+                0,
+                0,
+                float(Length(self.device.view.width)),
+                float(Length(self.device.view.height)),
+            ]
+
+        settings["min_x"] = bb[0]
+        settings["min_y"] = bb[1]
+        settings["max_x"] = bb[2]
+        settings["max_y"] = bb[3]
+        settings["center_x"] = (bb[0] + bb[2]) / 2
+        settings["center_y"] = (bb[1] + bb[3]) / 2
+        settings["width"] = bb[2] - bb[0]
+        settings["height"] = bb[3] - bb[1]
+        settings["width_2"] = (bb[2] - bb[0]) / 2
+        settings["height_2"] = (bb[3] - bb[1]) / 2
+        return settings
+
 
 def linearize_path(path, interp=50, point=False):
     import numpy as np

{meerk40t-0.9.7900 → meerk40t-0.9.7930}/meerk40t/core/elements/geometry.py

@@ -138,6 +138,7 @@ Functions:
 """
 
 from meerk40t.core.units import Angle, Length
+from meerk40t.kernel import CommandSyntaxError
 from meerk40t.svgelements import Matrix
 from meerk40t.tools.geomstr import BeamTable, Geomstr
 
@@ -218,9 +219,9 @@ def init_commands(kernel):
         except AssertionError:
             channel(_("Geometry was not valid."))
 
-    @self.console_argument("x_pos", type=Length)
-    @self.console_argument("y_pos", type=Length)
-    @self.console_argument("r_pos", type=Length)
+    @self.console_argument("x_pos", type=str, help=_("X position for circle center."))
+    @self.console_argument("y_pos", type=str, help=_("Y position for circle center."))
+    @self.console_argument("r_pos", type=str, help=_("Radius for circle."))
     @self.console_command(
         "circle",
         help=_("circle <x> <y> <r>"),
@@ -229,7 +230,19 @@ def init_commands(kernel):
         all_arguments_required=True,
     )
     def element_circle(channel, _, x_pos, y_pos, r_pos, data=None, post=None, **kwargs):
-        data.append(Geomstr.circle(r_pos, x_pos, y_pos, slices=4))
+        lensett = self.length_settings()
+        try:
+            # fmt: off
+            xp = float(Length(x_pos, relative_length=self.device.view.width, settings=lensett))
+            yp = float(Length(y_pos, relative_length=self.device.view.height, settings=lensett))
+            rp = float(Length(r_pos, settings=lensett))
+            # fmt: on
+        except ValueError:
+            channel(_("Invalid length value for circle."))
+            return
+        if data is None:
+            data = Geomstr()
+        data.append(Geomstr.circle(rp, xp, yp, slices=4))
         return "geometry", data
 
     @self.console_argument(
@@ -242,10 +255,10 @@ def init_commands(kernel):
         type=Length,
         help=_("y position for top left corner of rectangle."),
     )
-    @self.console_argument("width", type=Length, help=_("width of the rectangle."))
-    @self.console_argument("height", type=Length, help=_("height of the rectangle."))
-    @self.console_option("rx", "x", type=Length, help=_("rounded rx corner value."))
-    @self.console_option("ry", "y", type=Length, help=_("rounded ry corner value."))
+    @self.console_argument("width", type=str, help=_("width of the rectangle."))
+    @self.console_argument("height", type=str, help=_("height of the rectangle."))
+    @self.console_option("rx", "x", type=str, help=_("rounded rx corner value."))
+    @self.console_option("ry", "y", type=str, help=_("rounded ry corner value."))
     @self.console_command(
         "rect",
         help=_("adds rectangle to geometry"),
@@ -269,10 +282,21 @@ def init_commands(kernel):
         """
         Draws a svg rectangle with optional rounded corners.
         """
-        if rx is None:
-            rx = 0
-        if ry is None:
-            ry = 0
+        lensett = self.length_settings()
+        try:
+            # fmt: off
+            x_pos = float(Length(x_pos, relative_length=self.device.view.width, settings=lensett))
+            y_pos = float(Length(y_pos, relative_length=self.device.view.height, settings=lensett))
+            width = float(Length(width, relative_length=self.device.view.width, settings=lensett))
+            height = float(Length(height, relative_length=self.device.view.height, settings=lensett))
+            rx = 0 if rx is None else float(Length(rx, relative_length=self.device.view.width, settings=lensett))
+            ry = rx if ry is None else float(Length(ry, relative_length=self.device.view.height, settings=lensett))
+            # fmt: on
+        except ValueError:
+            channel(_("Invalid length value."))
+            return
+        if data is None:
+            data = Geomstr()
         data.append(
             Geomstr.rect(
                 x=float(x_pos),
@@ -347,8 +371,8 @@ def init_commands(kernel):
         data.greedy_distance(0j, flips=not no_flips)
         return "geometry", data
 
-    @self.console_argument("tx", type=Length, help=_("translate x value"))
-    @self.console_argument("ty", type=Length, help=_("translate y value"))
+    @self.console_argument("tx", type=str, help=_("translate x value"))
+    @self.console_argument("ty", type=str, help=_("translate y value"))
     @self.console_command(
         "translate",
         help=_("translate <tx> <ty>"),
@@ -356,6 +380,14 @@ def init_commands(kernel):
         output_type="geometry",
     )
     def element_translate(tx, ty, data: Geomstr, **kwargs):
+        try:
+            lensett = self.length_settings()
+            # fmt: off
+            tx = float(Length(tx, relative_length=self.device.view.width, settings=lensett))
+            ty = float(Length(ty, relative_length=self.device.view.height, settings=lensett))
+            # fmt: on
+        except ValueError:
+            raise CommandSyntaxError(_("Invalid length value."))
         data.translate(tx, ty)
         return "geometry", data
 
@@ -404,6 +436,8 @@ def init_commands(kernel):
     def geometry_hatch(data: Geomstr, distance: Length, angle: Angle, **kwargs):
         segments = data.segmented()
         hatch = Geomstr.hatch(segments, angle=angle.radians, distance=float(distance))
+        if data is None:
+            data = Geomstr()
         data.append(hatch)
         return "geometry", data