meerk40t 0.9.7010__py2.py3-none-any.whl → 0.9.7020__py2.py3-none-any.whl

meerk40t/extra/outerworld.py

@@ -3,7 +3,6 @@ This module exposes a couple of simple commands to send some simple commands to
 """
 import urllib
 import os.path
-from meerk40t.kernel import get_safe_path
 
 HTTPD = None
 SERVER_THREAD = None
@@ -109,7 +108,7 @@ def plugin(kernel, lifecycle):
                             candidate = "_webload.svg"
                     file_data = response.read()
 
-                    safe_dir = os.path.realpath(get_safe_path(kernel.name))
+                    safe_dir = kernel.os_information["WORKDIR"]
                     filename = os.path.join(safe_dir, candidate)
                     channel(f"Writing result to {filename}")
                     with open(filename, "wb") as f:
@@ -150,7 +149,7 @@ def plugin(kernel, lifecycle):
         if org_x != 0 or org_y != 0:
             channel(f"Upper left corner at: {Length(org_x, digits=2, preferred_units=units)}, {Length(org_y, digits=2, preferred_units=units)}")
 
-        res = elements_service.load(filename)
+        res = elements_service.load(filename, svg_ppi = elements_service.svg_ppi)
         if not res:
             channel("Could not load any data")
             return

meerk40t/extra/param_functions.py

@@ -1002,7 +1002,7 @@ def plugin(kernel, lifecycle):
                 cy = 0
             if radius is None:
                 radius = 0
-            sangle = float(startangle)
+            sangle = 0 if startangle is None else float(startangle)
             if corners <= 2:
                 # No need to look at side_length parameter as we are considering the radius value as an edge anyway...
                 geom = create_star_shape(

meerk40t/grbl/device.py

@@ -257,18 +257,21 @@ class GRBLDevice(Service, Status):
                 choice_dict["choices"] = ["UNCONFIGURED"]
                 choice_dict["display"] = ["pyserial-not-installed"]
 
+        from platform import system
+        is_linux = system() == "Linux"
         choices = [
             {
                 "attr": "serial_port",
                 "object": self,
                 "default": "UNCONFIGURED",
                 "type": str,
-                "style": "option",
+                "style": "combosmall" if is_linux else "option",
                 "label": "",
                 "tip": _("What serial interface does this device connect to?"),
                 "section": "_10_Serial Interface",
                 "subsection": "_00_",
                 "dynamic": update,
+                "exclusive": not is_linux, 
             },
             {
                 "attr": "baud_rate",

meerk40t/grbl/gui/grblcontroller.py

@@ -14,7 +14,7 @@ from meerk40t.gui.icons import (
 )
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import dip_size, wxButton, wxStaticText, TextCtrl
-from meerk40t.kernel import get_safe_path, signal_listener
+from meerk40t.kernel import signal_listener
 
 _ = wx.GetTranslation
 
@@ -146,7 +146,7 @@ class GRBLControllerPanel(wx.Panel):
         self.load_log()
 
     def history_filename(self):
-        safe_dir = os.path.realpath(get_safe_path(self.service.kernel.name))
+        safe_dir = self.service.kernel.os_information["WORKDIR"]
         fname = os.path.join(safe_dir, "grblhistory.log")
         is_there = os.path.exists(fname)
         return fname, is_there

meerk40t/gui/busy.py

@@ -8,6 +8,77 @@ import wx
 
 DEFAULT_SIZE = 14
 
+class SimpleBusyInfo:
+    """
+    Create a simplified BusyInfo class that uses the main window title as canvas. 
+    Just used for Linux as the wxWidgets implementation sucks big time regarding
+    the controlled update of a window. So the full-featured implementation below
+    does not only produce nothing visible but seems to have severe side effects
+    that may caus segmenation faults.
+
+    :param string `msg`:     a string to be displayed in the BusyInfo window.
+    """
+    def __init__(self, **kwds):
+        self.kernel = kwds.get("kernel", None)
+        self.shown = False
+        self._old_title = ""
+        self._msg = ""
+
+    def start(self, **kwds):
+        if self.shown:
+            self.end()
+        self.update_keywords(kwds)
+        self.shown = True
+        self._old_title = ""
+        try:
+            win:wx.Window = self.kernel.root.gui
+            win.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+            self._old_title = win.GetTitle()
+        except (TypeError, AttributeError) as e:
+            return
+
+    def end(self):
+        self.shown = False
+        self._msg = ""
+        try:
+            win = self.kernel.root.gui
+            win.SetCursor(wx.Cursor(wx.CURSOR_ARROW))
+        except (TypeError, AttributeError):
+            return
+        if self._old_title:
+            win.SetTitle(self._old_title)
+
+    def change(self, **kwds):
+        self.update_keywords(kwds)
+        if self.msg:
+            try:
+                win = self.kernel.root.gui
+                win.SetTitle(self.msg)
+            except (TypeError, AttributeError):
+                return
+
+    def update_keywords(self, kwds):
+        keep = 0
+        if "keep" in kwds:
+            keep = int(kwds["keep"])
+        if "msg" in kwds:
+            old_lines = self._msg.split("\n") if self._msg else []
+            new_lines = old_lines[:keep]
+            new_lines.append(kwds["msg"])
+            self._msg = "\n".join(new_lines)            
+
+    @property
+    def msg(self):
+        return self._msg.replace("\n", " - ")
+
+    def hide(self):
+        self.shown = False
+        return
+
+    def show(self):
+        self.shown = True
+        return
+
 
 class BusyInfo:
     """
@@ -55,19 +126,10 @@ class BusyInfo:
             if keep == 0:
                 self.image = None
         if "msg" in kwds:
-            newmsg = ""
-            if self.msg:
-                old = self.msg.split("\n")
-                idx = 0
-                while (idx < keep) and (idx < len(old)):
-                    if newmsg:
-                        newmsg += "\n"
-                    newmsg += old[idx]
-                    idx += 1
-            if newmsg:
-                newmsg += "\n"
-            newmsg += kwds["msg"]
-            self.msg = newmsg
+            old_lines = self.msg.split("\n") if self.msg else []
+            new_lines = old_lines[:keep]
+            new_lines.append(kwds["msg"])
+            self.msg = "\n".join(new_lines)            
         if "bgcolor" in kwds:
             self.bgcolor = kwds["bgcolor"]
         if "fgcolor" in kwds: