meerk40t 0.9.2000__py2.py3-none-any.whl → 0.9.3001__py2.py3-none-any.whl

meerk40t/newly/device.py

@@ -4,17 +4,19 @@ Newly Device
 from meerk40t.core.laserjob import LaserJob
 from meerk40t.core.spoolers import Spooler
 from meerk40t.core.view import View
+from meerk40t.device.mixins import Status
 from meerk40t.kernel import CommandSyntaxError, Service, signal_listener
 from meerk40t.newly.driver import NewlyDriver
 
 
-class NewlyDevice(Service):
+class NewlyDevice(Service, Status):
     """
     Newly Device
     """
 
     def __init__(self, kernel, path, *args, choices=None, **kwargs):
         Service.__init__(self, kernel, path)
+        Status.__init__(self)
         self.name = "newly"
         self.extension = "hpgl"
         self.job = None
@@ -87,7 +89,7 @@ class NewlyDevice(Service):
                     },
                     {
                         "attr": "corner_speed",
-                        "type": 120,
+                        "type": int,
                         "label": _("Corner Speed"),
                         "width": 133,
                         "editable": True,
@@ -95,6 +97,8 @@ class NewlyDevice(Service):
                 ],
                 "style": "chart",
                 "primary": "speed",
+                "allow_deletion": True,
+                "allow_duplication": True,
                 "label": _("Speed Chart"),
                 "tip": _("Raster speed to chart."),
             },
@@ -507,6 +511,9 @@ class NewlyDevice(Service):
 
         self.viewbuffer = ""
 
+        # Sort the entries for the rasterchart
+        self.speedchart.sort(key=lambda x: x["speed"])
+
         @self.console_command(
             "estop",
             help=_("stops the current job, deletes the spooler"),

meerk40t/newly/driver.py

@@ -365,6 +365,7 @@ class NewlyDriver:
             return
         self.paused = True
         self.connection.pause()
+        self.service.signal("pause")
 
     def resume(self):
         """
@@ -377,6 +378,7 @@ class NewlyDriver:
         """
         self.paused = False
         self.connection.resume()
+        self.service.signal("pause")
 
     def reset(self):
         """
@@ -384,7 +386,9 @@ class NewlyDriver:
 
         @return:
         """
+        self.paused = False
         self.connection.abort()
+        self.service.signal("pause")
 
     def status(self):
         """

meerk40t/newly/gui/gui.py

@@ -7,7 +7,7 @@ def plugin(service, lifecycle):
         # Needed to test wx import.
         import wx  # pylint: disable=unused-import
 
-        from meerk40t.gui.icons import icons8_computer_support_50, icons8_connected_50
+        from meerk40t.gui.icons import icons8_computer_support, icons8_connected
 
         from .newlyconfig import NewlyConfiguration
         from .newlycontroller import NewlyController
@@ -26,7 +26,7 @@ def plugin(service, lifecycle):
             "button/control/Controller",
             {
                 "label": _("Controller"),
-                "icon": icons8_connected_50,
+                "icon": icons8_connected,
                 "tip": _("Opens Controller Window"),
                 "action": lambda e: service("window toggle Controller\n"),
             },
@@ -35,7 +35,7 @@ def plugin(service, lifecycle):
             "button/device/Configuration",
             {
                 "label": _("Config"),
-                "icon": icons8_computer_support_50,
+                "icon": icons8_computer_support,
                 "tip": _("Opens device-specific configuration window"),
                 "action": lambda v: service("window toggle Configuration\n"),
             },
@@ -43,14 +43,13 @@ def plugin(service, lifecycle):
 
     if lifecycle == "service_attach":
         from meerk40t.gui.icons import (
-            icons8_circled_play_50,
-            icons8_circled_stop_50,
-            icons8_computer_support_50,
-            icons8_connected_50,
-            icons8_file_50,
-            icons8_move_50,
-            icons8_play_50,
-            icons8_rectangular_50,
+            icon_mk_rectangular,
+            icons8_circled_play,
+            icons8_circled_stop,
+            icons8_computer_support,
+            icons8_connected,
+            icons8_file,
+            icons8_move,
         )
 
         _ = service.kernel.translation
@@ -60,7 +59,7 @@ def plugin(service, lifecycle):
             "button/control/SelectFile",
             {
                 "label": _("File {index}").format(index=selected),
-                "icon": icons8_file_50,
+                "icon": icons8_file,
                 "tip": _("Select active file to use for machine."),
                 "identifier": "file_index",
                 "object": service,
@@ -127,7 +126,7 @@ def plugin(service, lifecycle):
             "button/control/AutoStart",
             {
                 "label": _("Send Only"),
-                "icon": icons8_circled_stop_50,
+                "icon": icons8_circled_stop,
                 "tip": _("Send the file but do not start the file"),
                 "toggle_attr": "autoplay",
                 "object": service,
@@ -135,7 +134,7 @@ def plugin(service, lifecycle):
                 "toggle": {
                     "label": _("Send & Start"),
                     "tip": _("Automatically start the device after send"),
-                    "icon": icons8_circled_play_50,
+                    "icon": icons8_circled_play,
                     "signal": "autoplay",
                 },
             },
@@ -144,7 +143,7 @@ def plugin(service, lifecycle):
             "button/control/DrawFrame",
             {
                 "label": _("Draw Frame"),
-                "icon": icons8_rectangular_50,
+                "icon": icon_mk_rectangular,
                 "tip": _(
                     "Draw a bounding rectangle of the object saved in the machine"
                 ),
@@ -158,7 +157,7 @@ def plugin(service, lifecycle):
             "button/control/MoveFrame",
             {
                 "label": _("Move Frame"),
-                "icon": icons8_move_50,
+                "icon": icons8_move,
                 "tip": _(
                     "Move the bounding rectangle of the object saved in the machine"
                 ),
@@ -172,7 +171,7 @@ def plugin(service, lifecycle):
             "button/control/Replay",
             {
                 "label": _("Replay"),
-                "icon": icons8_play_50,
+                "icon": icons8_circled_play,
                 "tip": _("Replay the file saved in the machine"),
                 "action": lambda v: service(
                     "replay {index}\n".format(index=service.file_index)

meerk40t/newly/gui/newlyconfig.py

@@ -4,7 +4,7 @@ from meerk40t.device.gui.defaultactions import DefaultActionPanel
 from meerk40t.device.gui.formatterpanel import FormatterPanel
 from meerk40t.device.gui.warningpanel import WarningPanel
 from meerk40t.gui.choicepropertypanel import ChoicePropertyPanel
-from meerk40t.gui.icons import icons8_administrative_tools_50
+from meerk40t.gui.icons import icons8_administrative_tools
 from meerk40t.gui.mwindow import MWindow
 
 _ = wx.GetTranslation
@@ -15,7 +15,7 @@ class NewlyConfiguration(MWindow):
         super().__init__(420, 570, *args, **kwds)
         self.context = self.context.device
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_administrative_tools_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_administrative_tools.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Newly-Configuration"))
 

meerk40t/newly/gui/newlycontroller.py

@@ -2,7 +2,11 @@ import threading
 
 import wx
 
-from meerk40t.gui.icons import icons8_connected_50, icons8_disconnected_50
+from meerk40t.gui.icons import (
+    get_default_icon_size,
+    icons8_connected,
+    icons8_disconnected,
+)
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import dip_size
 from meerk40t.kernel import signal_listener
@@ -58,7 +62,9 @@ class NewlyControllerPanel(wx.ScrolledWindow):
             _("Force connection/disconnection from the device.")
         )
         self.button_device_connect.SetBitmap(
-            icons8_disconnected_50.GetBitmap(use_theme=False)
+            icons8_disconnected.GetBitmap(
+                use_theme=False, resize=get_default_icon_size()
+            )
         )
         # end wxGlade
 
@@ -89,14 +95,16 @@ class NewlyControllerPanel(wx.ScrolledWindow):
     def set_button_connected(self):
         self.button_device_connect.SetBackgroundColour("#00ff00")
         self.button_device_connect.SetBitmap(
-            icons8_connected_50.GetBitmap(use_theme=False)
+            icons8_connected.GetBitmap(use_theme=False, resize=get_default_icon_size())
         )
         self.button_device_connect.Enable()
 
     def set_button_disconnected(self):
         self.button_device_connect.SetBackgroundColour("#dfdf00")
         self.button_device_connect.SetBitmap(
-            icons8_disconnected_50.GetBitmap(use_theme=False)
+            icons8_disconnected.GetBitmap(
+                use_theme=False, resize=get_default_icon_size()
+            )
         )
         self.button_device_connect.Enable()
 
@@ -163,7 +171,7 @@ class NewlyController(MWindow):
         self.add_module_delegate(self.panel)
         self.SetTitle(_("Newly-Controller"))
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_connected_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_connected.GetBitmap())
         self.SetIcon(_icon)
         self.Layout()
 

meerk40t/rotary/gui/gui.py

@@ -7,7 +7,7 @@ def plugin(kernel, lifecycle):
     if lifecycle == "invalidate":
         return not kernel.has_feature("wx")
     if lifecycle == "register":
-        from meerk40t.gui.icons import icons8_roll_50
+        from meerk40t.gui.icons import icon_rotary
         from meerk40t.rotary.gui.rotarysettings import RotarySettings
 
         _ = kernel.translation
@@ -21,7 +21,7 @@ def plugin(kernel, lifecycle):
             "button/device/Rotary",
             {
                 "label": _("Rotary"),
-                "icon": icons8_roll_50,
+                "icon": icon_rotary,
                 "tip": _("Opens Rotary Window"),
                 "action": lambda v: kernel.console("window toggle Rotary\n"),
             },

meerk40t/rotary/gui/rotarysettings.py

@@ -5,7 +5,7 @@
 
 import wx
 
-from meerk40t.gui.icons import icons8_roll_50
+from meerk40t.gui.icons import icon_rotary
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import ScrolledPanel, StaticBoxSizer, TextCtrl, dip_size
 
@@ -216,7 +216,7 @@ class RotarySettings(MWindow):
         self.panel = RotarySettingsPanel(self, wx.ID_ANY, context=self.context.rotary)
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_roll_50.GetBitmap())
+        _icon.CopyFromBitmap(icon_rotary.GetBitmap())
         self.SetIcon(_icon)
         # begin wxGlade: RotarySettings.__set_properties
         self.SetTitle(_("Rotary-Settings"))

meerk40t/ruida/device.py

@@ -9,6 +9,7 @@ from meerk40t.kernel import Service
 
 from ..core.spoolers import Spooler
 from ..core.units import UNITS_PER_NM, Length
+from ..device.mixins import Status
 from .driver import RuidaDriver
 
 
@@ -19,7 +20,9 @@ class RuidaDevice(Service):
 
     def __init__(self, kernel, path, *args, choices=None, **kwargs):
         Service.__init__(self, kernel, path)
+        Status.__init__(self)
         self.name = "RuidaDevice"
+
         if choices is not None:
             for c in choices:
                 attr = c.get("attr")

meerk40t/ruida/driver.py

@@ -431,6 +431,7 @@ class RuidaDriver:
             return
         self.paused = True
         self.connection.pause()
+        self.service.signal("pause")
 
     def resume(self):
         """
@@ -443,6 +444,7 @@ class RuidaDriver:
         """
         self.paused = False
         self.connection.resume()
+        self.service.signal("pause")
 
     def reset(self):
         """
@@ -451,6 +453,8 @@ class RuidaDriver:
         @return:
         """
         self.connection.abort()
+        self.paused = False
+        self.service.signal("pause")
 
     def dwell(self, time_in_ms):
         """

meerk40t/ruida/gui/gui.py

@@ -7,9 +7,9 @@ def plugin(service, lifecycle):
         import wx
 
         from meerk40t.gui.icons import (
-            icons8_computer_support_50,
-            icons8_connected_50,
-            icons8_info_50,
+            icons8_computer_support,
+            icons8_connected,
+            icons8_info,
         )
 
         _ = service._
@@ -28,7 +28,7 @@ def plugin(service, lifecycle):
             "button/control/Info",
             {
                 "label": _("Ruida Info"),
-                "icon": icons8_info_50,
+                "icon": icons8_info,
                 "tip": _("Provide information about the Ruida Driver"),
                 "action": popup_info,
             },
@@ -37,7 +37,7 @@ def plugin(service, lifecycle):
             "button/control/Controller",
             {
                 "label": _("Controller"),
-                "icon": icons8_connected_50,
+                "icon": icons8_connected,
                 "tip": _("Opens Controller Window"),
                 "action": lambda e: service("window toggle Controller\n"),
             },
@@ -46,7 +46,7 @@ def plugin(service, lifecycle):
             "button/device/Configuration",
             {
                 "label": _("Config"),
-                "icon": icons8_computer_support_50,
+                "icon": icons8_computer_support,
                 "tip": _("Opens device-specific configuration window"),
                 "action": lambda v: service("window toggle Configuration\n"),
             },

meerk40t/ruida/gui/ruidaconfig.py

@@ -4,7 +4,7 @@ from meerk40t.device.gui.defaultactions import DefaultActionPanel
 from meerk40t.device.gui.formatterpanel import FormatterPanel
 from meerk40t.device.gui.warningpanel import WarningPanel
 from meerk40t.gui.choicepropertypanel import ChoicePropertyPanel
-from meerk40t.gui.icons import icons8_administrative_tools_50
+from meerk40t.gui.icons import icons8_administrative_tools
 from meerk40t.gui.mwindow import MWindow
 
 _ = wx.GetTranslation
@@ -15,7 +15,7 @@ class RuidaConfiguration(MWindow):
         super().__init__(420, 570, *args, **kwds)
         self.context = self.context.device
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_administrative_tools_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_administrative_tools.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_(_("Ruida-Configuration")))
 

meerk40t/ruida/gui/ruidacontroller.py

@@ -2,7 +2,11 @@ import threading
 
 import wx
 
-from meerk40t.gui.icons import icons8_connected_50, icons8_disconnected_50
+from meerk40t.gui.icons import (
+    get_default_icon_size,
+    icons8_connected,
+    icons8_disconnected,
+)
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import dip_size
 from meerk40t.kernel import signal_listener
@@ -58,7 +62,9 @@ class RuidaControllerPanel(wx.ScrolledWindow):
             _("Force connection/disconnection from the device.")
         )
         self.button_device_connect.SetBitmap(
-            icons8_disconnected_50.GetBitmap(use_theme=False)
+            icons8_disconnected.GetBitmap(
+                use_theme=False, resize=get_default_icon_size()
+            )
         )
         # end wxGlade
 
@@ -89,14 +95,16 @@ class RuidaControllerPanel(wx.ScrolledWindow):
     def set_button_connected(self):
         self.button_device_connect.SetBackgroundColour("#00ff00")
         self.button_device_connect.SetBitmap(
-            icons8_connected_50.GetBitmap(use_theme=False)
+            icons8_connected.GetBitmap(use_theme=False, resize=get_default_icon_size())
         )
         self.button_device_connect.Enable()
 
     def set_button_disconnected(self):
         self.button_device_connect.SetBackgroundColour("#dfdf00")
         self.button_device_connect.SetBitmap(
-            icons8_disconnected_50.GetBitmap(use_theme=False)
+            icons8_disconnected.GetBitmap(
+                use_theme=False, resize=get_default_icon_size()
+            )
         )
         self.button_device_connect.Enable()
 
@@ -161,7 +169,7 @@ class RuidaController(MWindow):
         self.add_module_delegate(self.panel)
         self.SetTitle(_("Ruida-Controller"))
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_connected_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_connected.GetBitmap())
         self.SetIcon(_icon)
         self.Layout()
 

meerk40t/svgelements.py

@@ -3995,7 +3995,7 @@ class PathSegment:
 
     These segments define a 1:1 relationship with the path_d or path data attribute, denoted in
     SVG by the 'd' attribute. These are moveto, closepath, lineto, and the curves which are cubic
-    B�zier curves, quadratic B�zier curves, and elliptical arc. These are classed as Move, Close,
+    B?zier curves, quadratic B?zier curves, and elliptical arc. These are classed as Move, Close,
     Line, CubicBezier, QuadraticBezier, and Arc. And in path_d are denoted as M, Z, L, C, Q, A.
 
     There are lowercase versions of these commands. And for C, and Q there are S and T which are
@@ -4514,7 +4514,7 @@ class Line(Linear):
 
 
 class QuadraticBezier(Curve):
-    """Represents Quadratic B�zier commands."""
+    """Represents Quadratic B?zier commands."""
 
     def __init__(self, start, control, end, **kwargs):
         Curve.__init__(self, start, end, **kwargs)
@@ -4604,7 +4604,7 @@ class QuadraticBezier(Curve):
 
     def bbox(self):
         """
-        Returns the bounding box for the quadratic B�zier curve.
+        Returns the bounding box for the quadratic B?zier curve.
         """
         n = self.start.x - self.control.x
         d = self.start.x - 2 * self.control.x + self.end.x
@@ -4696,7 +4696,7 @@ class QuadraticBezier(Curve):
 
 
 class CubicBezier(Curve):
-    """Represents Cubic B�zier commands."""
+    """Represents Cubic B?zier commands."""
 
     def __init__(self, start, control1, control2, end, **kwargs):
         Curve.__init__(self, start, end, **kwargs)
@@ -4801,7 +4801,7 @@ class CubicBezier(Curve):
             return [Point(*_compute_point(position)) for position in positions]
 
     def bbox(self):
-        """returns the tight-fitting bounding box of the B�zier curve.
+        """returns the tight-fitting bounding box of the B?zier curve.
         Code by:
         https://github.com/mathandy/svgpathtools
         """
@@ -5331,7 +5331,7 @@ class Arc(Curve):
     def length(self, error=ERROR, min_depth=MIN_DEPTH):
         """The length of an elliptical arc segment requires numerical
         integration, and in that case it's simpler to just do a geometric
-        approximation, as for cubic B�zier curves.
+        approximation, as for cubic B?zier curves.
         """
         if self.sweep == 0:
             return 0
@@ -6498,7 +6498,7 @@ class Path(Shape, MutableSequence):
 
     def approximate_arcs_with_cubics(self, error=0.1):
         """
-        Iterates through this path and replaces any Arcs with cubic B�zier curves.
+        Iterates through this path and replaces any Arcs with cubic B?zier curves.
         """
         sweep_limit = tau * error
         for s in range(len(self) - 1, -1, -1):
@@ -6509,7 +6509,7 @@ class Path(Shape, MutableSequence):
 
     def approximate_arcs_with_quads(self, error=0.1):
         """
-        Iterates through this path and replaces any Arcs with quadratic B�zier curves.
+        Iterates through this path and replaces any Arcs with quadratic B?zier curves.
         """
         sweep_limit = tau * error
         for s in range(len(self) - 1, -1, -1):
@@ -6520,7 +6520,7 @@ class Path(Shape, MutableSequence):
 
     def approximate_bezier_with_circular_arcs(self, error=0.01):
         """
-        Iterates through this path and replaces any B�zier curves with circular arcs.
+        Iterates through this path and replaces any B?zier curves with circular arcs.
         """
         for s in range(len(self) - 1, -1, -1):
             segment = self[s]