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

meerk40t/gui/wxmmain.py

@@ -449,11 +449,94 @@ class MeerK40t(MWindow):
         self.autosave = Autosaver(self.context)
         self.handover = GUIThread(self.context)
         kernel = self.context.kernel
-        if hasattr(kernel.args, "maximized") and kernel.args.maximized:
+
+        maxit = hasattr(kernel.args, "maximized") and kernel.args.maximized
+        minit = hasattr(kernel.args, "minimized") and kernel.args.minimized 
+        remember = self.context.setting(bool, "remember_main_pos", True)
+        if remember:
+            self.RestoreWindowState(force_maximized=maxit, force_minimized=minit)
+        else:
+            self.CenterOnScreen()
+            if maxit:
+                self.Maximize()
+            elif minit:
+                self.Iconize()
+        self.Bind(wx.EVT_ACTIVATE, self.on_active)
+
+
+    def SaveWindowState(self):
+        # Save window position, size, and state
+        pos = self.GetPosition()
+        size = self.GetSize()
+        maximized = self.IsMaximized()
+        minimized = self.IsIconized()
+        # Store in settings (replace with your config system)
+        self.context.mainwin_pos = (pos.x, pos.y)
+        self.context.mainwin_size = (size.x, size.y)
+        self.context.mainwin_maximized = maximized
+        self.context.mainwin_minimized = minimized
+
+    def RestoreWindowState(self, default_pos=None, default_size=None, force_minimized=False, force_maximized=False):
+        # Restore window position, size, and state
+        pos = self.context.mainwin_pos
+        size = self.context.mainwin_size
+        maximized = self.context.mainwin_maximized or force_maximized
+        minimized = self.context.mainwin_minimized or force_minimized
+        # Get all screens
+        display_count = wx.Display.GetCount()
+        screens = [wx.Display(i).GetGeometry() for i in range(display_count)]
+        def in_any_screen(x, y):
+            for rect in screens:
+                if rect.Contains(wx.Point(x, y)):
+                    return True
+            return False
+        # Default position and size: use first screen's geometry
+        if screens:
+            first_screen = screens[0]
+            if default_pos is None:
+                default_pos = wx.Point(first_screen.x, first_screen.y)
+            if default_size is None:
+                default_size = wx.Size(first_screen.width, first_screen.height)
+        else:
+            if default_pos is None:
+                default_pos = wx.Point(0, 0)
+            if default_size is None:
+                default_size = wx.Size(1024, 768)
+        # Validate position and size to ensure the window is mostly visible on a screen
+        def rect_mostly_in_screen(x, y, w, h, threshold=0.5):
+            # Returns True if at least `threshold` fraction of the window area is on any screen
+            window_rect = wx.Rect(x, y, w, h)
+            for screen in wx.Display.GetCount() and [wx.Display(i).GetGeometry() for i in range(wx.Display.GetCount())] or []:
+                intersection = window_rect.Intersect(screen)
+                if intersection.IsEmpty():
+                    continue
+                visible_area = intersection.GetWidth() * intersection.GetHeight()
+                total_area = w * h
+                if total_area == 0:
+                    continue
+                if visible_area / total_area >= threshold:
+                    return True
+            return False
+
+        # Determine intended position and size
+        intended_pos = pos if pos else (default_pos.x, default_pos.y)
+        intended_size = size if size else (default_size.GetWidth(), default_size.GetHeight())
+
+        if rect_mostly_in_screen(intended_pos[0], intended_pos[1], intended_size[0], intended_size[1]):
+            self.SetPosition(wx.Point(intended_pos[0], intended_pos[1]))
+        else:
+            self.SetPosition(default_pos)
+
+        # Validate size
+        if size:
+            self.SetSize(wx.Size(size[0], size[1]))
+        else:
+            self.SetSize(default_size)
+        # Restore state
+        if maximized:
             self.Maximize()
-        if hasattr(kernel.args, "minimized") and kernel.args.minimized:
+        elif minimized:
             self.Iconize()
-        self.Bind(wx.EVT_ACTIVATE, self.on_active)
 
     def on_active(self, event):
         if event.GetActive():
@@ -1060,6 +1143,11 @@ class MeerK40t(MWindow):
         context.setting(bool, "enable_sel_rotate", True)
         context.setting(bool, "enable_sel_skew", False)
         context.setting(int, "zoom_margin", 4)  # 4%
+        context.setting(tuple, "mainwin_pos", None)
+        context.setting(tuple, "mainwin_size", None)
+        context.setting(bool, "mainwin_maximized", False)
+        context.setting(bool, "mainwin_minimized", False)
+        
         # Standard-Icon-Sizes
         # default, factor 1 - leave as is
         # small = factor 2/3, min_size = 32
@@ -4836,11 +4924,18 @@ class MeerK40t(MWindow):
                 return True
             if answer == wx.CANCEL:
                 return True  # VETO
+        for job in self.context.device.spooler.queue:
+            if job.is_running():
+                print(f"{job.label} was still running, stopping...")
+                try:
+                    job.stop()
+                except Exception as e:
+                    print(f"Error stopping job {job.label}: {e}")
         return False
 
     def window_close(self):
         context = self.context
-
+        self.SaveWindowState()
         context.aui = self._mgr.SavePerspective()
         self.on_panes_closed()
         self._mgr.UnInit()

meerk40t/lihuiyu/driver.py

@@ -12,12 +12,15 @@ import time
 
 from meerk40t.tools.zinglplotter import ZinglPlotter
 
+from ..core.cutcode.cubiccut import CubicCut
 from ..core.cutcode.dwellcut import DwellCut
 from ..core.cutcode.gotocut import GotoCut
 from ..core.cutcode.homecut import HomeCut
 from ..core.cutcode.inputcut import InputCut
+from ..core.cutcode.linecut import LineCut
 from ..core.cutcode.outputcut import OutputCut
 from ..core.cutcode.plotcut import PlotCut
+from ..core.cutcode.quadcut import QuadCut
 from ..core.cutcode.waitcut import WaitCut
 from ..core.parameters import Parameters
 from ..core.plotplanner import PlotPlanner, grouped
@@ -719,12 +722,39 @@ class LihuiyuDriver(Parameters):
         """
         for segment_type, start, c1, c2, end, sets in geom.as_lines():
             if segment_type == "line":
+                plot = LineCut(
+                    start,
+                    end,
+                    settings={
+                        "power": sets.get("power", 1000.0),
+                        "speed": sets.get("speed", self.speed),
+                    },
+                )
                 self.plot_planner.push(plot)
             elif segment_type == "end":
                 pass
             elif segment_type == "quad":
+                plot = QuadCut(
+                    start,
+                    c1,
+                    end,
+                    settings={
+                        "power": sets.get("power", 1000.0),
+                        "speed": sets.get("speed", self.speed),
+                    },
+                )
                 self.plot_planner.push(plot)
             elif segment_type == "cubic":
+                plot = CubicCut(
+                    start,
+                    c1,
+                    c2,
+                    end,
+                    settings={
+                        "power": sets.get("power", 1000.0),
+                        "speed": sets.get("speed", self.speed),
+                    },
+                )
                 self.plot_planner.push(plot)
             elif segment_type == "arc":
                 interp = 50
@@ -733,7 +763,15 @@ class LihuiyuDriver(Parameters):
                 g.arc(start, c1, end)
                 last = start
                 for p in list(g.as_equal_interpolated_points(distance=interp))[1:]:
-                    self.plot_planner.push((last, p))
+                    plot = LineCut(
+                        last,
+                        p,
+                        settings={
+                            "power": sets.get("power", 1000.0),
+                            "speed": sets.get("speed", self.speed),
+                        },
+                    )
+                    self.plot_planner.push(plot)
                     last = p
             elif segment_type == "point":
                 function = sets.get("function")
@@ -968,7 +1006,10 @@ class LihuiyuDriver(Parameters):
             sx = self.native_x
             sy = self.native_y
             # print("x: %s, y: %s -- c: %s, %s" % (str(x), str(y), str(sx), str(sy)))
-            on = int(on)
+            if self.state == DRIVER_STATE_RASTER and on >= 0.3 and on < 1:
+                on = 1
+            else:
+                on = int(on)
             if on > 1:
                 # Special Command.
                 if on & PLOT_FINISH:  # Plot planner is ending.
@@ -976,8 +1017,7 @@ class LihuiyuDriver(Parameters):
                     break
                 elif on & PLOT_SETTING:  # Plot planner settings have changed.
                     p_set = Parameters(self.plot_planner.settings)
-                    if p_set.power != self.power:
-                        self._set_power(p_set.power)
+                    self._set_power(p_set.power)
                     if (
                         p_set.raster_step_x != self.raster_step_x
                         or p_set.raster_step_y != self.raster_step_y
@@ -1068,11 +1108,8 @@ class LihuiyuDriver(Parameters):
                 self.state = DRIVER_STATE_MODECHANGE
 
     def _set_power(self, power=1000.0):
-        self.power = power
-        if self.power > 1000.0:
-            self.power = 1000.0
-        if self.power <= 0:
-            self.power = 0.0
+        self.power = min(1000, max(0, power))
+        self.settings["power"] = self.power
         if self.service.supports_pwm:
             self.send_at_pwm_code(self.power)
 

meerk40t/main.py

@@ -11,7 +11,7 @@ import os.path
 import sys
 
 APPLICATION_NAME = "MeerK40t"
-APPLICATION_VERSION = "0.9.7910"
+APPLICATION_VERSION = "0.9.7940"
 
 if not getattr(sys, "frozen", False):
     # If .git directory does not exist we are running from a package like pypi

meerk40t/ruida/emulator.py

@@ -161,6 +161,15 @@ class RuidaEmulator:
                 if self.channel:
                     self.channel(f"Process Failure: {str(bytes(array).hex())}")
 
+    def _home_device(self):
+        if hasattr(self.device.driver, "physical_home"):
+            # If the driver has a physical home, we can use that.
+            self.device.driver.physical_home()
+        elif hasattr(self.device.driver, "home"):
+            self.device.driver.home()
+        else:
+            self.device.driver.move_abs(0, 0)
+
     def _channel(self, text):
         if self.channel:
             self.channel(text)
@@ -357,7 +366,7 @@ class RuidaEmulator:
                 self._describe(array, "Stop Process")
                 try:
                     self.device.driver.reset()
-                    self.device.driver.home()
+                    self._home_device()
                 except AttributeError:
                     pass
                 return True
@@ -383,10 +392,7 @@ class RuidaEmulator:
                 return True
             elif array[1] == 0x2A:
                 self._describe(array, "Home XY")
-                try:
-                    self.device.driver.home()
-                except AttributeError:
-                    pass
+                self._home_device()
                 return True
             elif array[1] == 0x2E:
                 self._describe(array, "FocusZ")
@@ -628,7 +634,7 @@ class RuidaEmulator:
                     x = abscoord(array[3:8])
                     y = abscoord(array[8:13])
                     self._describe(array, f"Move {param} XY ({x}μm, {y}μm)")
-                    if "Origin" in param:
+                    if x != 0 or y != 0:
                         try:
                             self.device.driver.move_abs(
                                 f"{x / 1000}mm",
@@ -637,10 +643,7 @@ class RuidaEmulator:
                         except AttributeError:
                             pass
                     else:
-                        try:
-                            self.device.driver.home()
-                        except AttributeError:
-                            pass
+                        self._home_device()
                 elif array[1] == 0x30 or array[1] == 0x70:
                     x = abscoord(array[3:8])
                     y = abscoord(array[8:13])

meerk40t/ruida/plugin.py

@@ -93,6 +93,7 @@ def plugin(kernel, lifecycle=None):
             jogless=False,
             man_in_the_middle=None,
             bridge=False,
+            remainder=None,
             **kwargs,
         ):
             """
@@ -101,10 +102,14 @@ def plugin(kernel, lifecycle=None):
             controls that type of device. This would then be sent to the device in a
             somewhat agnostic fashion.
             """
+            if remainder and remainder.lower() in ("stop", "quit"):
+                quit = True
+
             root = kernel.root
             ruidacontrol = root.device.lookup("ruidacontrol")
             if ruidacontrol is None:
                 if quit:
+                    channel(_("No control instance to stop."))
                     return
                 ruidacontrol = RuidaControl(root)
                 root.device.register("ruidacontrol", ruidacontrol)

meerk40t/ruida/rdjob.py

@@ -663,6 +663,7 @@ class RDJob:
             self.x = x
             self.y = y
             ox, oy = matrix.transform_point([self.x, self.y])
+            # print (f"Will generate plotcut with power: {self.power}")
             self.plotcut = PlotCut(
                 settings={
                     "speed": self.speed,
@@ -672,9 +673,8 @@ class RDJob:
             )
             self.plotcut.plot_init(int(round(ox)), int(round(oy)))
         tx, ty = matrix.transform_point([x, y])
-        self.plotcut.plot_append(
-            int(round(tx)), int(round(ty)), power * (self.power / 1000.0)
-        )
+        # power is not a fraction of self.power, but just denoting laser on or off.
+        self.plotcut.plot_append(int(round(tx)), int(round(ty)), power)
         self.x = x
         self.y = y
 
@@ -1276,7 +1276,7 @@ class RDJob:
         else:
             desc = "Unknown Command!"
         if self.channel:
-            prefix = f"{offset:06x}" if offset is not None else ''
+            prefix = f"{offset:06x}" if offset is not None else ""
             self.channel(f"{prefix}-**-> {str(bytes(array).hex())}\t({desc})")
 
     def unswizzle(self, data):
@@ -1422,7 +1422,7 @@ class RDJob:
         self.laser_device_0()
         if air == 1:
             self.air_assist_on()
-        elif air==2:
+        elif air == 2:
             self.air_assist_off()
         self.speed_laser_1(speed)
         self.laser_on_delay(0)

meerk40t/tools/geomstr.py

@@ -658,6 +658,14 @@ class Pattern:
         current = 0j
 
         for entry in pattern(a, b, *args, **kwargs):
+            if (
+                not isinstance(entry, (list, tuple))
+                or len(entry) < 3
+                or np.isnan(entry[1])
+                or np.isnan(entry[2])
+            ):
+                # If the entry is not a list or tuple, or if the first element is NaN, we just skip it.
+                continue
             key = entry[0].lower()
             if key == "m":
                 current = complex(entry[1], entry[2])
@@ -715,6 +723,13 @@ class Pattern:
         @param y1:
         @return:
         """
+        try:
+            if np.isnan(x0) or np.isnan(y0) or np.isnan(x1) or np.isnan(y1):
+                # If any of the coordinates are NaN, we cannot generate a pattern.
+                return Geomstr()
+        except TypeError:
+            # If the coordinates are not numbers, we cannot generate a pattern.
+            return Geomstr()
         cw = self.cell_width
         ch = self.cell_height
         px = self.padding_x

{meerk40t-0.9.7910.dist-info → meerk40t-0.9.7940.dist-info}/METADATA

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

{meerk40t-0.9.7910.dist-info → meerk40t-0.9.7940.dist-info}/RECORD

@@ -3,17 +3,17 @@ meerk40t/constants.py,sha256=iTcOFJF_MLo3Ugms_A5kyz5MM0Ln9ZlZweMepW6Peto,203
 meerk40t/external_plugins.py,sha256=OQ2475hUr9KJDmrIip4zyf-851igd5n6IIMrsAvnA-U,2126
 meerk40t/external_plugins_build.py,sha256=8pwgdxSpsQMdiXJAX9kXQUc0-Dw9AMBgBfcLbTLAKfI,857
 meerk40t/internal_plugins.py,sha256=lMslowIIev1t1mf_VTewNwNgFLn1W2xTCqa9Je00Bjw,3455
-meerk40t/main.py,sha256=WiDB7SieTQSd7qC9e--qybAYmlN0t5BA6mLsg2aUyYo,7572
+meerk40t/main.py,sha256=OV93S9IrOENthfVlWJvH8P3heBVTpoEJyzdm-3vbW9Y,7572
 meerk40t/svgelements.py,sha256=OlHkjm9kDgx6ARGJ3M2Fyd2kMi06kWJizEt8zzV5xX8,333052
 meerk40t/balormk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerk40t/balormk/balor_params.py,sha256=S-kwGaHfBtXWDgtZlaudvQN_HkXPqlQyp8xVh5iSxW0,4290
 meerk40t/balormk/clone_loader.py,sha256=L2aMhCgvbKynqXcX3bVnvEtrL9EN26PBXNABUuEAJlU,20815
-meerk40t/balormk/controller.py,sha256=_JQdbnenHBxsD3rHddX7VYCHqboulj1QzO3z2_ItKZM,48958
+meerk40t/balormk/controller.py,sha256=cOrSTNuu9z8l2AfiHr8j4q5ATv9Na72U2seWEf6CJss,50229
 meerk40t/balormk/cylindermod.py,sha256=uHcH9gDJffr9hoLwkFp0frFeBRsUiGg9MJZjMx3F0z0,2223
 meerk40t/balormk/device.py,sha256=LjKr8lvACsKpb57RsGPo7m38IElJAotajMMzWlmqzgU,33735
 meerk40t/balormk/driver.py,sha256=iFgQ6EoSTvCNDjJGqJTIeRmTw-HE1x7gRO47U0fjb7U,27909
 meerk40t/balormk/galvo_commands.py,sha256=b09BinrPWwo4KYTMVdUFGtk_jGl1wEwngfSGwaqsK7g,42584
-meerk40t/balormk/livelightjob.py,sha256=LjbnfRcOPXv3p2YNv-ydL4gAlGreQRHA0NQgQ-ekAqY,16920
+meerk40t/balormk/livelightjob.py,sha256=sios52dTkUnE_z6Zek0L0WYbVS-h9lKD5HcugIVk2Fk,17962
 meerk40t/balormk/mock_connection.py,sha256=FCaInibW3wkGAL8GTqsB1As4Yfv0u33k6soTpC6hjcs,4295
 meerk40t/balormk/plugin.py,sha256=NhZ0oGJM_msmradpn2QkBgjukPO4_r_-aonLNTZcaVM,4887
 meerk40t/balormk/usb_connection.py,sha256=A6xgGKfjH95xdwJi2ytsKVj-GtsvhFeItkjykVRrgfI,11374
@@ -35,7 +35,7 @@ meerk40t/ch341/libusb.py,sha256=48NYQsgO7j-Sh8itRVLmC56bjjTyXIsY0lAjdBKV9yQ,2137
 meerk40t/ch341/mock.py,sha256=aaBXkC1KPRtyXweCi2LiyS5vDysNBVwZBk7Dw6ppymc,5497
 meerk40t/ch341/windriver.py,sha256=nEXAA0P-F7c-HL11kSJWUj1ZEelCPZKAqDEM-vDQ7Oo,5192
 meerk40t/core/__init__.py,sha256=hHHkA6qmojSU-5L1uDC_4A-EYfT38nbiYclZqKDdktI,14
-meerk40t/core/bindalias.py,sha256=YdKaVxpjidzUKiRDM0h93V5FXblEPgi4fdfdZpy2LE4,18282
+meerk40t/core/bindalias.py,sha256=ZeCdsIwr9vz1aVjZNcNrLvuIF8qOV9Jm1mZ9c153HEI,18516
 meerk40t/core/core.py,sha256=plyFMXXzGjNRRt6WeBuha5g7g0STaWd2I8ZAk-pDQGE,865
 meerk40t/core/cutplan.py,sha256=D-_ibSfsCWeI9QFoH_4QKAzmyGXNpL0s3lLuFJZrtFw,75668
 meerk40t/core/drivers.py,sha256=uSI5quDubayhmgsQ5GqHlmCiDIgJXwQ16tL0TfgwvPI,9654
@@ -46,11 +46,11 @@ meerk40t/core/parameters.py,sha256=cJYN0KAmvP8Iho2JdDucP2Q68vlj0nRI6aVK-Qdr3PE,1
 meerk40t/core/planner.py,sha256=CG7ygD96hWUZdGYPqpMR1qvevB929oIs0QbYnv55Syg,36711
 meerk40t/core/plotplanner.py,sha256=p_YsaSoPAdvCL1aAsY2q8sfHwCMwRPP-SG9ebcTnZbo,23177
 meerk40t/core/space.py,sha256=0Epmr5hYHkw1shU1OiEt_tK9eq7BRc8XWhRn7tQ6Po8,4002
-meerk40t/core/spoolers.py,sha256=vvbxxYSoACPc_KTAFPWtcp-PIRM55YxtXgLnHI8r13I,25089
+meerk40t/core/spoolers.py,sha256=PMG-BR78EfroPTnjh--fYbfh_-j1yx5dT0qzX_mpRuQ,25091
 meerk40t/core/svg_io.py,sha256=aBIHEGiAp5q3xTPFumA0kfhFb0Yd9Wp-uIU1zOsMS1Y,70520
 meerk40t/core/treeop.py,sha256=_L8Vv5Gp2JPxFzOZxsU17XiVFVrusmzLOHo5QtCH5CA,15190
 meerk40t/core/undos.py,sha256=VAvR4RZXp-jQC498JdqXYqyy2g28e3e6P7rnIfdH50A,11049
-meerk40t/core/units.py,sha256=LmuvS1kX4FKOWVPEX5TA0wf_9GlAsWzLGwacSIwXefc,23187
+meerk40t/core/units.py,sha256=82L3aJGPqd_eIPkuo28dH_Y9O03y2k3BHWmoqooysps,23352
 meerk40t/core/view.py,sha256=4y5DI0b9C0FTSQvMo-5Sf2c-Qvc3zZjwUM2zLqr5UI0,12641
 meerk40t/core/webhelp.py,sha256=2IuysYKzjQnIObombd1tTQmEqsdvpumh-xBTyr3Z4iM,2807
 meerk40t/core/wordlist.py,sha256=Rta262IKuSdNwYliLhgNUI0lcR2nOlvtMH10zKvD7eo,18325
@@ -65,28 +65,28 @@ meerk40t/core/cutcode/homecut.py,sha256=fsYY2MPU68hY5WScM2atnRhWcKtReb9ePzB_L0uC
 meerk40t/core/cutcode/inputcut.py,sha256=-xyCRLjxT-CoKIU0LfITWmwnKzW75HGd_yDhKUZK8WM,742
 meerk40t/core/cutcode/linecut.py,sha256=QRXfSTa0iAQFKBFhBO2qXGt5vF_LZMeP-BGa0QX35TA,919
 meerk40t/core/cutcode/outputcut.py,sha256=xiYWfGw0L17Fc6QHXIgjbHfNGnHeMlW_VPIIZy9KBr0,752
-meerk40t/core/cutcode/plotcut.py,sha256=XfbLvdZBrudLbFgKKXlNawkv3mi2dXgcaY41GmDL__s,10655
+meerk40t/core/cutcode/plotcut.py,sha256=FUufzVnT_k2X5Ni3sh78oRUJW-0ePb1Nu9ISDqieJBw,10737
 meerk40t/core/cutcode/quadcut.py,sha256=zMZ_KRv0fWdXwrZgPTidZ6UqqzTV9hP63POivxXmVIk,1592
 meerk40t/core/cutcode/rastercut.py,sha256=azBJhFJS1zhRhjUUvB553HHKDpts_eDijKdXerUKwTg,4793
 meerk40t/core/cutcode/waitcut.py,sha256=E5dOO5-LBUVBcP9_qClPkChYBNhQ8ElwucWqEkTlgRE,866
 meerk40t/core/elements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerk40t/core/elements/align.py,sha256=r68DOSr9DgkwbT8BvjoPGxtgJv52Hyz0YDMIFFIgMkA,30177
-meerk40t/core/elements/branches.py,sha256=7PobTrwghL82na_F5-9FqZimXaeYG6WyIVfMSCfvU6I,66546
-meerk40t/core/elements/clipboard.py,sha256=z0i4uM2zwPQAaZMDcWdN4fhfau4UXVOmLhKlLImPb34,8034
+meerk40t/core/elements/branches.py,sha256=TH6VXV9rtwCnOqP_RrtDW_YPhWfhAlA4HeYT6KsF0L0,67382
+meerk40t/core/elements/clipboard.py,sha256=RXS3nYKmDmonYDIyYQTSaQTy19ezTLYXelwJ2dciILo,8190
 meerk40t/core/elements/element_treeops.py,sha256=D2PzNY9NbMU_Qp9tVvs9G5IGdiSHruI1-Ik91nrYm6M,174699
 meerk40t/core/elements/element_types.py,sha256=MvHz7cYG1s4wAB215ZlEd1i4zanc2vv8iOxWzU0J4ys,2334
-meerk40t/core/elements/elements.py,sha256=kQitRHgubjz7qEs_y2DguBPiiQR3ojI8UFZukGB0iaw,181055
-meerk40t/core/elements/files.py,sha256=cuZPrRmvLqdhQ0Nft4Bm4yDQjI44mMR08AMEHSYAfOQ,4548
-meerk40t/core/elements/geometry.py,sha256=E11qolLrg_r2XhTOkGKASS8Lx9tj2n9qxOJ7ptkFkQY,17605
-meerk40t/core/elements/grid.py,sha256=UP7KX_q2SVhnDy3JYtDHXoXrKwTtEV6kwHQjBHGdmLQ,18987
+meerk40t/core/elements/elements.py,sha256=pkzMO1xUunhr1RvbMPR5QHJY-1JzsImAWJL4NdZ38hE,181797
+meerk40t/core/elements/files.py,sha256=Cki0DEXjJA0vj18QTFJ-9QX4UY_gj7aM-uBiueAvkUU,4569
+meerk40t/core/elements/geometry.py,sha256=tvIz3Rbr-yhwwcJjlAL8zQqhfHlDvi7CJ9M6NYtQ5vU,19464
+meerk40t/core/elements/grid.py,sha256=ub3AV44gFjqz3RecaQl-nQWpPgQZaaCY08D29toBApk,19639
 meerk40t/core/elements/materials.py,sha256=FvypUyQ7hVf3fP8_cyLKYFGra9c-4rRgnUF1F_hd6Es,5873
 meerk40t/core/elements/notes.py,sha256=tReyNmqe5YwC2IntMJZ8f0qvKw0oH0RU5He34TKfgt4,1781
-meerk40t/core/elements/offset_clpr.py,sha256=_3eRy-iesY6LXVdxz2f1F0hb8T0z5UfcFnxMEcdXyrA,35544
+meerk40t/core/elements/offset_clpr.py,sha256=XZ7fA9nUdbhBUdJUD6qkyDirmBLOs7-DBJM44yWOhWI,35562
 meerk40t/core/elements/offset_mk.py,sha256=LUjGbVgvPsHyy5T6AsB65Icok-SYl-GBJWyigdcRgfQ,37917
 meerk40t/core/elements/penbox.py,sha256=kW162SViOSMxJukBHafQa1i0H0qfgPhiPWbw3NrB8fs,12837
-meerk40t/core/elements/placements.py,sha256=r_b_8Net4_stPm0yPVKjyzA3WELXGZs6Susff5Y7QkI,10680
-meerk40t/core/elements/render.py,sha256=F-qsV7ii8Zh2xBMO7-orZKptkCbFPXbfahdt2qFXwTE,27382
-meerk40t/core/elements/shapes.py,sha256=rjWCojJii6qZ36f4evDZ9QhuH9Y--1a58W8VrsUsg0I,105549
+meerk40t/core/elements/placements.py,sha256=4h45hmeSBhhxd6Bi_peq_-dNmUmHHXCFAY9df5UP3gs,10901
+meerk40t/core/elements/render.py,sha256=x9wU_cGjXPWOjcTl_X4dtAIAJEs4YzIJpJPrH2TGriQ,27806
+meerk40t/core/elements/shapes.py,sha256=ZVbjYzVm_H4eP3uHuyYe0UApU0n8zAV6_9i_10lc0ZM,111454
 meerk40t/core/elements/testcases.py,sha256=4Oqq2ruNh_E71LmxHkSUC93Bo6_A8GPDamw73xJolHk,3758
 meerk40t/core/elements/trace.py,sha256=OT2hWFKAVflHJS1BHu12zoUyohFpIFzvEvlfGArgZug,20427
 meerk40t/core/elements/tree_commands.py,sha256=KkB1h3FSNNpflBEsJfLEhFGDR3q2IsJHCSGyXYS4BQE,14612
@@ -99,9 +99,9 @@ meerk40t/core/node/branch_elems.py,sha256=pe1baIxNpkGXX0Uoes6PTStq_leGuTTYDoRc7Y
 meerk40t/core/node/branch_ops.py,sha256=dtezh9pPRe0Pch3aRdnNTdcCNiblRyP_RTk0ZzQejtY,1425
 meerk40t/core/node/branch_regmark.py,sha256=-wo8J69dVind2-DNTDQrZZBiANLeWXP7E4Z1l7VcnfY,1501
 meerk40t/core/node/cutnode.py,sha256=8bN-oa0ZQzyQ4li9-bnP1U4m_EOKxqKJms8ltnDsweU,839
-meerk40t/core/node/effect_hatch.py,sha256=hlJQvkFRt22JRjF0ILFcsqyZC7jvWGl8MzWs0TGq0Ng,12297
-meerk40t/core/node/effect_warp.py,sha256=9I-kTHsbnkFe6FEgmecjXPcx4R66hRFx5oawDPhPowo,13659
-meerk40t/core/node/effect_wobble.py,sha256=UDXT-MtgckwHw9kEbHky-sBawNVWOS7-rjMo1HTrEJs,14716
+meerk40t/core/node/effect_hatch.py,sha256=1EXbiIhttbhZwLUov__gnFoAQA4XuetJynZ7-sEH0sk,12389
+meerk40t/core/node/effect_warp.py,sha256=C_FNnJrZ8yAOFzFfXWMJoXDa-ljRIaNUqQ3rrPPZVxc,13797
+meerk40t/core/node/effect_wobble.py,sha256=Q4sRz8dKFhmZfgojtPJi9R6rvLYA8-R1tOKchhF8h1M,14855
 meerk40t/core/node/elem_ellipse.py,sha256=NJTNqe3F95qxLlGUNR-WUp1Ulr7mswjbtiIztNIwVWo,14429
 meerk40t/core/node/elem_image.py,sha256=SfpBG-gl9dR4JAghsoJctTnNdEnWMZwwUXu96iIKywY,43878
 meerk40t/core/node/elem_line.py,sha256=wAMqCl8PGOCCk4NwzDLdlPyGHe4TybyvbJ8nLshv0Fc,12777
@@ -121,7 +121,7 @@ meerk40t/core/node/nutils.py,sha256=YfET5o-9Q-2f-8TNTdk-xruSDwpnzD4rhRBcCZKvhyI,
 meerk40t/core/node/op_cut.py,sha256=j-ZXhcrIlr2Z6Bi8Dra9QldXSbhoEhXPvSPTRaM0Yk8,17875
 meerk40t/core/node/op_dots.py,sha256=OfoQdOjEGh1RV8J0t-V7Rd3nAr0tO3-aT-FG3dRcHHQ,11570
 meerk40t/core/node/op_engrave.py,sha256=dczEX1oGQEOB8rNP_Y1DOD65BgljAXBQJa26xLCo4uc,15873
-meerk40t/core/node/op_image.py,sha256=HoV8Dz5IbLIFiWsv5XuKW1TR_D5zd0l6qAZ0q-fYLNY,32578
+meerk40t/core/node/op_image.py,sha256=qh0_F-Il8HGj2XjHQBY57-m4pAMLm8iMfa53wp_vyfk,33564
 meerk40t/core/node/op_raster.py,sha256=-iAWKvhuefZozaJRySXvtzjQhw9bbCMsDTlH1bNHyGU,32433
 meerk40t/core/node/place_current.py,sha256=YbMwOZP3pCeINlKLIvxihCuon1WGFlo8TyDtqo0Lojo,1216
 meerk40t/core/node/place_point.py,sha256=XEA3yGejiwuGUt2H1IbNoTUX2Pfdg2_qBAGRAE9IMKE,11439
@@ -179,12 +179,12 @@ meerk40t/grbl/control.py,sha256=WiWMOzXOvmIu1EWHHsGYN0o2sg5Pe33svWsfbRjuCPg,2622
 meerk40t/grbl/controller.py,sha256=zxQ733MFzgEssaQ1NlxPyAqzqf3fLH39evDxVjyMHK4,42040
 meerk40t/grbl/device.py,sha256=C30K5_9uwKjy9mrc6TYBM2gKW1Xc3lvvQJcSnNQPbo4,44216
 meerk40t/grbl/driver.py,sha256=npde5mUwUkP3ZdCrnwx3TdF_O5F0LF6XbRXLHNFIYY4,33286
-meerk40t/grbl/emulator.py,sha256=_rn0v5m0ZXHpXtLYKnr8OOYYc1juo3RUkF8ut1ZaQ38,21778
-meerk40t/grbl/gcodejob.py,sha256=YZRlhA6_W6rVEyBHUUiQTLK6SWQfKkXeDqmWgElegjA,29238
+meerk40t/grbl/emulator.py,sha256=tTBipjjzH6VGRamyHG_paQqIbJQxAIed9t__Sr8l1No,21910
+meerk40t/grbl/gcodejob.py,sha256=lkxlmUE8-aTcZxYt7XbUzXct2cR0MZacr1iBqWMmEcU,29644
 meerk40t/grbl/interpreter.py,sha256=jzUess5Ywxj_O9pkZL3gAWdRmBiGvRetRWt9SDC39sY,1569
 meerk40t/grbl/loader.py,sha256=UbXfTCJdkRbQBrEvlKcrZ2cfGiz8NJC8heyIOGYpyqo,596
 meerk40t/grbl/mock_connection.py,sha256=p-J8u1znNdNJ7olprZF-A5Ki9Kd_5Wls_oHH_85aVv4,1797
-meerk40t/grbl/plugin.py,sha256=OxcBvDgstoPBN8BdFgP3lvg1AdEdhUkABEncW7eb0do,10574
+meerk40t/grbl/plugin.py,sha256=nbZ4T9lj8K6SZco2eAvbS9jqUyvS3KGgu1tXyASa_U4,10856
 meerk40t/grbl/serial_connection.py,sha256=n0Uqvx_4K3KNpPWpvveRUF19uQ1gFDSVQ2-TFTfaCus,3188
 meerk40t/grbl/tcp_connection.py,sha256=Wlr2CXGBCiedfEuxArgLqPLpO9ybaYzk-WEqt93nAvQ,2741
 meerk40t/grbl/ws_connection.py,sha256=Vr2EqJvtgrEHPIJPpb5-FO7gOz1H5o6Qto5T0se_iz8,4028
@@ -227,7 +227,7 @@ meerk40t/gui/navigationpanels.py,sha256=N6GD-AkFUagIoNKQi7AKbskJs7Hx75-_3xMjUBv0
 meerk40t/gui/notes.py,sha256=UNuXa0V0qj7tYvWbTnFr_plkRziRANhgqJXDIx89OUY,4573
 meerk40t/gui/opassignment.py,sha256=b6UCXZboOVsnmymTrZ1ycn7sryF98EwrIhXizpyIWFQ,14584
 meerk40t/gui/operation_info.py,sha256=Y5zyMOHPRQdT06gQ7WUeLSJgoCJsp5D5mhlufb_VxvQ,11129
-meerk40t/gui/plugin.py,sha256=6PUx5GPEgOojwofMrHovx74TJYh9cqqd27btnVD000Y,19579
+meerk40t/gui/plugin.py,sha256=N0Kn3emZegEAxx_qThsb0F11HWKrNb1ZHbpZwxBDknw,20010
 meerk40t/gui/position.py,sha256=9wvNKuJrM5c-5l-4R7B2ZFXJtc7Q0KLlyST70ZuFdjI,27387
 meerk40t/gui/preferences.py,sha256=mD-bYAW3gLkDv9z_r8UjxfNVI6FhRr9XwiVpilelBIU,30840
 meerk40t/gui/ribbon.py,sha256=HYLiAhdnL9VTjLazBNlmlz2CEuH8sxFEP3jSd-HOObs,90472
@@ -236,18 +236,18 @@ meerk40t/gui/simulation.py,sha256=mzkWkb8QDgY3CSkaq9FvGRxkD4vdgFWeeDsM3Ubdv5k,96
 meerk40t/gui/snapoptions.py,sha256=Vd1PbMWyWSCXeRIOqc12ksx_lUZyNZzV-g9uJ23LcsA,8404
 meerk40t/gui/spoolerpanel.py,sha256=gu3ncSRMo2GEJyHZzepXEG93sv9ct0v6un8hke1k2iI,47203
 meerk40t/gui/themes.py,sha256=jVt5Km7if0IVV1MnpGvtvMlbvRqpO_DQzLLen_QzsXs,8299
-meerk40t/gui/tips.py,sha256=gJhKbNA7UKeJXgfTC3UYjAX8OHfcXjb0Ew6XwM2BOwo,22132
+meerk40t/gui/tips.py,sha256=y0FUqMYTW8JXvI7wE7Iy3K3uQwuWfJmL24wif3NgcD4,23460
 meerk40t/gui/usbconnect.py,sha256=1kznvNlXlT14NCev1PngYFmvmTKXLGxoti94FuoWF28,3018
 meerk40t/gui/wordlisteditor.py,sha256=PHuz9wEkyGtK2IuoRTZvI1xHJ_rC6p6kEmUnLFQZlxI,36955
 meerk40t/gui/wxmeerk40t.py,sha256=VlIn5N2vxt6a9rEUd-2XgX67pHwo20kJI-J-XcGXKFo,55540
-meerk40t/gui/wxmmain.py,sha256=LQ6k_lMtYn7FKGHCAzmoj_IHFSZaqxRs8p1Lfb783TE,214759
+meerk40t/gui/wxmmain.py,sha256=SGJXSmQB70Ixy1oZxUXXSXiMGuwIX-TmKq4ENIo-b7M,218917
 meerk40t/gui/wxmribbon.py,sha256=-qiWL0c2fNfl6d-bwHF_PROKy3i34aTs9ujCaw37tYU,61708
 meerk40t/gui/wxmscene.py,sha256=KVx8DMjWwWd1HidaldYKChhYTlaSz5QzvGm-dFPyzYU,71657
 meerk40t/gui/wxmtree.py,sha256=_guVz39SxL7xQ_OoX7U6OvqrQ9eSbXnPzlI40G03VMc,93430
 meerk40t/gui/wxutils.py,sha256=zydAiHhpQZJIqoTP-8Lj00XajuMYmiAACieJHKfq6os,68424
 meerk40t/gui/zmatrix.py,sha256=kNK4RQ9F9AFW32Gow4u2ZjLdmQXMPBhhv9DEhMU7utI,2705
 meerk40t/gui/help_assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meerk40t/gui/help_assets/help_assets.py,sha256=611_dH6Sa3ZE8nh8q6WzU_ERHH7JLqRLo-jTswcR0C8,28488
+meerk40t/gui/help_assets/help_assets.py,sha256=7K79w6oAuSjXGLixKXB48BjJEvBiC_fkrR4wBekg0y8,59771
 meerk40t/gui/propertypanels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerk40t/gui/propertypanels/attributes.py,sha256=p9hWJIOl5MNLCTyf3ZfyN2L5HRf0ILoNp990c2HXFTw,54392
 meerk40t/gui/propertypanels/blobproperty.py,sha256=dFKFM-OGyQszf6BZlyhWh_KPgwQr1c4tGnuJcuWuXu0,3529
@@ -359,7 +359,7 @@ meerk40t/kernel/states.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerk40t/lihuiyu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerk40t/lihuiyu/controller.py,sha256=VGnoWfs13JMUNXg7t2nzGW3OIt27UYXkzFoT1Lv1yWs,32973
 meerk40t/lihuiyu/device.py,sha256=lhNQ__lnLhARhuCDUwl54vDtzOXSrSArk7tFblkMy7Y,49802
-meerk40t/lihuiyu/driver.py,sha256=Fv7vjlMLBK_WSppyHQAAq7Y10V4dJERSeGfLtK57zJA,50049
+meerk40t/lihuiyu/driver.py,sha256=2wEeXuVupNMA1WXrG1USnTpO9_K9zeYL__9VIIfTmak,51405
 meerk40t/lihuiyu/interpreter.py,sha256=BzzWGREVHnmqO1E3hRWA5vLdwqE59oiDo7ePqtP1RZo,1639
 meerk40t/lihuiyu/laserspeed.py,sha256=GkcUlOVjkSwtybhosS05Wd7tVo8EM0dIfqpIPf2hta0,16351
 meerk40t/lihuiyu/loader.py,sha256=zwOINnkqfVlVjY-MQIBpF6BtpiTRGO7EzaaH-oRUOAY,2618
@@ -412,12 +412,12 @@ meerk40t/ruida/control.py,sha256=ir9uddn_hZ-QjPxGWBKLc6xy1JtqXVBE904lLR63dUA,104
 meerk40t/ruida/controller.py,sha256=RIdFegB_tuaI1q2Asl3pXNTERMVvl8ltYL9kQNy4mTU,3460
 meerk40t/ruida/device.py,sha256=iojk8_ry5chLCBGnYfgG7tPddhFQQf-ncS5UOFi5P8Y,23656
 meerk40t/ruida/driver.py,sha256=4Hgm5ptXjARThqf76k1AqznpHl7PgJ7FIZwswnFlKPg,17340
-meerk40t/ruida/emulator.py,sha256=nr3Qisv7Ix4-HWK4DpReeXw004LAEF2AzciU0mjV6g0,55390
+meerk40t/ruida/emulator.py,sha256=8S-XbfM-OqXMFa16o9K9XQku8VyoyMyTsTdDZM0xyP8,55516
 meerk40t/ruida/exceptions.py,sha256=xJtpaxuLOLANQuo15p6Fl0Lgq3eUwODCIsWw0TQm78s,116
 meerk40t/ruida/loader.py,sha256=8gHnKX3D5V7qQltvueO-m6X9-xARjVEl8rjYIpKqLbk,1516
 meerk40t/ruida/mock_connection.py,sha256=Qig2x5s01f6U3BKHNlZockyaJTWHhfgcVV6w895R8R4,1577
-meerk40t/ruida/plugin.py,sha256=WCMm0PKc3I9Q8iI1ptXfWVcWp_j20-UUR_SowSFEvbU,4091
-meerk40t/ruida/rdjob.py,sha256=DkqvSiEndzO26kwOzBsBayq5FjFHvExj0Z1_YS3n1-4,71865
+meerk40t/ruida/plugin.py,sha256=NRuDolYS-HNrxShEPRxhFlcLS8LCHJllWZd038agXOY,4279
+meerk40t/ruida/rdjob.py,sha256=JzQl4lEWnMdv33OiIdrW3C3JD6gEPJvu_u4UuK1eJJY,71977
 meerk40t/ruida/serial_connection.py,sha256=RJ95TX933rAD3eUL2Uz48xwhm-7wm1m3Jo-Tv6jsypk,3573
 meerk40t/ruida/tcp_connection.py,sha256=3utEZQDDUI6DzYJP83RABoXAFB-wEYGVRaoNsuWqCqE,4657
 meerk40t/ruida/udp_connection.py,sha256=S6eSoh9smYWmax6VdSOTJyc9ixEStgvy7bWVkHgqtDU,2130
@@ -428,7 +428,7 @@ meerk40t/ruida/gui/ruidacontroller.py,sha256=nJpZPW-dy7YbxxLnHzmYcU6guc-6tK1oJIw
 meerk40t/ruida/gui/ruidaoperationproperties.py,sha256=pMEZFyWHDsbzoIfIKrFrKsw2IDPEK2HhHDw3HDQM3dw,1002
 meerk40t/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerk40t/tools/driver_to_path.py,sha256=eeQOGZO-08CJBqeF9epQv-P7T3dcpP2grMILW5LLd3U,20851
-meerk40t/tools/geomstr.py,sha256=hzC99CpCAB2tSThNoBlOU8FBjFsKKKmAddtlAA2pZ78,207715
+meerk40t/tools/geomstr.py,sha256=kSR9E-LRxZuA1hzYCnk1nf_YwHB5RqQee1QoMG4CPJg,208380
 meerk40t/tools/jhfparser.py,sha256=CGC9C2cthrMWfUfumFs5EBzVCUP4PldwIqkf1Qhq52k,14395
 meerk40t/tools/kerftest.py,sha256=dtm4sP-cXQdwr3tkEImif30lnd1tyEYGxnN6vUTWe2M,36449
 meerk40t/tools/livinghinges.py,sha256=oO9ERPh2ILXpJj3-DvYyA3P7Y6FR2ACf3dbBehJlgR4,46949
@@ -440,10 +440,10 @@ meerk40t/tools/rasterplotter.py,sha256=pfIIwWjBaVnJQH2dSyfj7nj-cAK7AGmTU0kD6dBzz
 meerk40t/tools/shxparser.py,sha256=5CPV4HW5ulH71hWtiIFMFj0-Jn4-OqXRCdaimjOSfOs,35169
 meerk40t/tools/ttfparser.py,sha256=Dqd8msoqiaJAyFQ-Kdr3sBGyi5QxJFq0EOVf6-LM4Ac,61301
 meerk40t/tools/zinglplotter.py,sha256=wsXA9jnORb0AR0Bvrhcow-hROJhgDeLRcE8DmnEbiWo,20164
-meerk40t-0.9.7910.dist-info/LICENSE,sha256=sMsd9pY-cLfcNzUkQ2DvZobE0qpiiLMmoPfJMBTznNY,1065
-meerk40t-0.9.7910.dist-info/METADATA,sha256=LCrrTJHmFu0e5mnLq0DnM5YJFuWQMYy5wqRkHrfTjkU,8014
-meerk40t-0.9.7910.dist-info/WHEEL,sha256=Ll72iyqtt6Rbxp-Q7FSafYA1LeRv98X15xcZWRsFEmY,109
-meerk40t-0.9.7910.dist-info/entry_points.txt,sha256=5KjPHpJvgQq3-SwLWJQtLE1BvfGeINBae3Josx6fgpk,47
-meerk40t-0.9.7910.dist-info/top_level.txt,sha256=ng4SDtNom2u-smf8sCHERr74HYQIOJOjZbBlDdlpvjU,9
-meerk40t-0.9.7910.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerk40t-0.9.7910.dist-info/RECORD,,
+meerk40t-0.9.7940.dist-info/LICENSE,sha256=sMsd9pY-cLfcNzUkQ2DvZobE0qpiiLMmoPfJMBTznNY,1065
+meerk40t-0.9.7940.dist-info/METADATA,sha256=5v5vKxOkUu1vNyCQgBThuFi6mUlpoQO2Nost8xf2RAQ,8014
+meerk40t-0.9.7940.dist-info/WHEEL,sha256=Ll72iyqtt6Rbxp-Q7FSafYA1LeRv98X15xcZWRsFEmY,109
+meerk40t-0.9.7940.dist-info/entry_points.txt,sha256=5KjPHpJvgQq3-SwLWJQtLE1BvfGeINBae3Josx6fgpk,47
+meerk40t-0.9.7940.dist-info/top_level.txt,sha256=ng4SDtNom2u-smf8sCHERr74HYQIOJOjZbBlDdlpvjU,9
+meerk40t-0.9.7940.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerk40t-0.9.7940.dist-info/RECORD,,