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

meerk40t/core/elements/offset_clpr.py

@@ -673,8 +673,7 @@ def init_commands(kernel):
             offset = 0
         else:
             try:
-                ll = Length(offset)
-                offset = float(ll)
+                offset = float(Length(offset, settings=self.length_settings()))
             except ValueError:
                 offset = 0
         if offset == 0.0:
@@ -769,8 +768,7 @@ def init_commands(kernel):
             offset = 0
         else:
             try:
-                ll = Length(offset)
-                offset = float(ll)
+                offset = float(Length(offset, settings=self.length_settings()))
             except ValueError:
                 offset = 0
         if offset == 0.0:

meerk40t/core/elements/placements.py

@@ -74,10 +74,10 @@ def init_commands(kernel):
         type=int,
         help=_("How many placements on the Y-Axis?\n(0 = as many as fit on the bed)"),
     )
-    @self.console_option("dx", "m", type=Length, help=_("Gap in x-direction"))
-    @self.console_option("dy", "n", type=Length, help=_("Gap in y-direction"))
-    @self.console_argument("x", type=Length, help=_("x coord"))
-    @self.console_argument("y", type=Length, help=_("y coord"))
+    @self.console_option("dx", "m", type=str, help=_("Gap in x-direction"))
+    @self.console_option("dy", "n", type=str, help=_("Gap in y-direction"))
+    @self.console_argument("x", type=str, help=_("x coord"))
+    @self.console_argument("y", type=str, help=_("y coord"))
     @self.console_command(
         "placement",
         help=_("Adds a placement = a fixed job start position"),
@@ -100,36 +100,31 @@ def init_commands(kernel):
         loops=None,
         **kwargs,
     ):
+        try:
+            # fmt: off
+            lensett = self.length_settings()
+            x = 0 if x is None else float(Length(x, relative_length=self.device.view.width, settings=lensett))
+            y = 0 if y is None else float(Length(y, relative_length=self.device.view.height, settings=lensett))
+            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
+        except ValueError:
+            channel(_("Invalid length value."))
+            return
         if loops is None:
             loops = 1
         if corner is None:
             corner = 0
         if rotation is None:
             rotation = 0
-        if x is None:
-            x = 0
-        if y is None:
-            y = x
         if nx is None:
             nx = 1
         if ny is None:
             ny = 1
-        if dx is None:
-            dx = 0
+        if dx == 0:
             nx = 1
-        if dy is None:
-            dy = 0
+        if dy == 0:
             ny = 1
-        try:
-            x = Length(x)
-            y = Length(y)
-            len_dx = Length(dx)
-            dx_val = float(len_dx)
-            len_dy = Length(dy)
-            dy_val = float(len_dy)
-        except ValueError:
-            channel(_("Invalid values given"))
-            return
         if nx < 0 or ny < 0:
             channel(_("Invalid values for nx/ny provided"))
             return

meerk40t/core/elements/render.py

@@ -342,7 +342,7 @@ def init_commands(kernel):
         action="store_true",
         help=_("Preserve intermediary objects"),
     )
-    @self.console_argument("offset", type=Length, help="Offset distance")
+    @self.console_argument("offset", type=str, help="Offset distance")
     @self.console_command(
         "outline",
         help=_("Create an outline path at the inner and outer side of a path"),
@@ -436,10 +436,16 @@ def init_commands(kernel):
             invert = False
         if blacklevel is None:
             blacklevel = 0.5
-        if offset is None:
-            offset = self.length("5mm")
-        else:
-            offset = self.length(offset)
+        try:
+            # fmt: off
+            lensett = self.length_settings()
+            if offset is None:
+                offset = "5mm"
+            offset = float(Length(offset, relative_length=self.device.view.width, settings=lensett))
+            # fmt: on
+        except ValueError:
+            channel(_("Invalid length value."))
+            return
         if steps is None or steps < 1:
             steps = 1
         if outer is None:
@@ -718,7 +724,9 @@ def init_commands(kernel):
         input_type=(None, "elements"),
         output_type="elements",
     )
-    def keyhole_elements(command, channel, _, refid=None, nohide=None, data=None, post=None, **kwargs):
+    def keyhole_elements(
+        command, channel, _, refid=None, nohide=None, data=None, post=None, **kwargs
+    ):
         if data is None:
             data = list(self.elems(emphasized=True))
 
@@ -727,7 +735,12 @@ def init_commands(kernel):
         if refid is None:
             # We do look for the very first occurence of a path like object and take this...
             for node in data:
-                if node.id is not None and node.type in ("elem path", "elem ellipse", "elem rect", "elem polyline"):
+                if node.id is not None and node.type in (
+                    "elem path",
+                    "elem ellipse",
+                    "elem rect",
+                    "elem polyline",
+                ):
                     refid = node.id
                     break
 
@@ -739,9 +752,13 @@ def init_commands(kernel):
             channel(_("A node with such an ID couldn't be found"))
             return
         if not hasattr(refnode, "as_geometry"):
-            channel(_("This node can not act as a keyhole: {nodetype}").format(nodetype=refnode.type))
+            channel(
+                _("This node can not act as a keyhole: {nodetype}").format(
+                    nodetype=refnode.type
+                )
+            )
             return
-        images = list ( (e for e in data if e.type == "elem image") )
+        images = list((e for e in data if e.type == "elem image"))
         if len(images) == 0:
             channel(_("No images selected/provided"))
             return
@@ -765,11 +782,13 @@ def init_commands(kernel):
         input_type=(None, "elements"),
         output_type="elements",
     )
-    def remove_keyhole_elements(command, channel, _, refid=None, nohide=None, data=None, post=None, **kwargs):
+    def remove_keyhole_elements(
+        command, channel, _, refid=None, nohide=None, data=None, post=None, **kwargs
+    ):
         if data is None:
             data = list(self.elems(emphasized=True))
 
-        images = list ( (e for e in data if e.type == "elem image") )
+        images = list((e for e in data if e.type == "elem image"))
         if len(images) == 0:
             channel(_("No images selected/provided"))
             return