meerk40t 0.9.2000__tar.gz → 0.9.3001__tar.gz

meerk40t-0.9.3001/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 meerk40t
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

meerk40t-0.9.3001/PKG-INFO

@@ -0,0 +1,139 @@
+Metadata-Version: 2.1
+Name: meerk40t
+Version: 0.9.3001
+Summary: MeerK40t LaserCutter Software
+Home-page: https://github.com/meerk40t/meerk40t
+Author: Tatarize
+Author-email: tatarize@gmail.com
+License: MIT
+Keywords: lasercutter,laser,vector,parser
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Topic :: Multimedia :: Graphics
+Classifier: Topic :: Multimedia :: Graphics :: Editors :: Vector-Based
+Classifier: Topic :: Utilities
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: pyusb>=1.0.0
+Requires-Dist: pyserial
+Requires-Dist: numpy
+Provides-Extra: all
+Requires-Dist: wxPython>=4.0.0; extra == "all"
+Requires-Dist: Pillow>=7.0.0; extra == "all"
+Requires-Dist: opencv-python-headless>=3.4.0.0; extra == "all"
+Requires-Dist: ezdxf>=0.14.0; extra == "all"
+Provides-Extra: gui
+Requires-Dist: wxPython>=4.0.0; extra == "gui"
+Requires-Dist: Pillow>=7.0.0; extra == "gui"
+Provides-Extra: cam
+Requires-Dist: opencv-python-headless>=3.4.0.0; extra == "cam"
+Provides-Extra: dxf
+Requires-Dist: ezdxf>=0.14.0; extra == "dxf"
+Provides-Extra: camhead
+Requires-Dist: opencv-python>=3.4.0.0; extra == "camhead"
+
+# MeerK40t
+MeerK40t (pronounced MeerKat) is a built-from-the-ground-up MIT licensed open-source laser cutting software.
+
+## Primary Goals
+* Provide users with high quality laser control software.
+* Provide developers with a highly extensible platform to help further their own ideas, and provide novel work to the laser community at large.
+
+## Running
+MeerK40t is written in Python and precompiled versions are [available for download](https://github.com/meerk40t/meerk40t/releases) for Windows, Mac OSX, Linux and Raspberry Pi (more infos below). Due note this sometimes will give false postitives for various viruses (especially since Meerk40t isn't signed).
+
+### Source
+
+Alternatively you can run MeerK40t directly from Python. `pip install meerk40t[all]` with python installed will usually be sufficient. Then merely run `meerk40t` at the command line.
+
+See [Install: Source wiki page](https://github.com/meerk40t/meerk40t/wiki/Install:-Source)
+
+### GUI
+![meerk40t8](https://user-images.githubusercontent.com/3302478/196283699-745d0616-5e74-49b3-ba95-f4902061584b.png)
+
+The wxMeerK40t is the GUI and is written in wxPython. We use AUI to allow to have a very highly configurable UI. We can easily add panes and tools and there are quite a few available already.
+
+### Command Line Interface
+
+Meerk40t has an advanced internal console system allowing access to most parts of the code with various commands. It also provides a command line interface which should allow you to automate any processes.
+
+## Drivers
+
+Meerk40t provides a variety of drivers with an extensible framework to provide support for other new laser devices. The code was written with the myriad of possibilities for different software in mind. For example, it may be essential that GRBL be able to reset an alarm or notify the user of particular error codes. The configuration for GRBL is not the same for the configuration of other laser control drivers. With this in mind, Meerk40t can radically change how and when it works
+
+
+### Supported devices
+*   Lihuiyu M2/M3-Nano
+*   GRBL
+*   Ezcad2-compatible JCZ controllers galvo lasers
+*   Moshiboard
+*   NewlyDraw System 8.1 Lasers
+*   Ruida-Emulation (Middleman between Lightburn and K40)
+
+### Lihuiyu M2-Nano
+For the Lihuiyu (stock driver), Meerk40t supports both the windows and libusb connection methods, making it compatible with Whisperer and with the original Chinese software. So MeerK40t can usually run alongside these other pieces of software interchangeably.
+
+### GRBL
+
+GRBL is itself open source and the various interfaces with the board should be quite well understood.
+
+### EZCAD2-Compatible Galvo LMC
+
+Meerk40t supports controlling galvo as well as gantry lasers with open source support.
+
+### Moshiboard
+
+The support for old moshiboards makes meerk40t the only known opensource software that controls moshiboards.
+
+### System 8.1 Lasers (NewlyDraw)
+
+HPGL-modified laser systems produced under many different company names
+
+## Support
+The primary source for help and documentation is the [MeerK40t Wiki - please click here](https://github.com/meerk40t/meerk40t/wiki).
+
+If you have a bug, feature request, or other issue raise it here. These are likely to be resolved. Squeaky wheels get the grease.
+https://github.com/meerk40t/meerk40t/issues
+
+If you need additional support, please research/ask on:
+
+*   [Facebook](https://www.facebook.com/groups/716000085655097/)
+*   [Maker Forums](https://forum.makerforums.info/t/about-the-meerk40t-category/79660)
+*   [YouTube - David Olsen's channel](https://www.youtube.com/channel/UCsAUV23O2FyKxC0HN7nkAQQ)
+*   [YouTube - Some instruction videos](https://www.youtube.com/channel/UCMN9gGvpacxZINPZCSOecaQ)
+*   [Discord](https://discord.gg/vkDD3HdQq6)
+
+## Assisting the Project
+
+Open source projects live and die with their support. There are a lots of ways to help the project. There are also a lot of ways the project should help you.
+*   Code
+*   Provide Translations in other languages.
+*   Design ( Good design instincts, smooth out the rough edges)
+*   Compile/Testers
+*   Beta testers
+*   Make helpful support content
+*   Make guides ("How to setup cameras?", etc)
+*   Bounce ideas around
+
+## Download
+You can find and download all current and historical versions in the [Releases](https://github.com/meerk40t/meerk40t/releases) section.
+
+Currently, primary branches:
+* 0.9 - Active - New features and some underlying architectural changes. Try the latest released version: [0.9.2](https://github.com/meerk40t/meerk40t/releases#latest)
+* 0.8 - Maintenance - may receive critical bugfixes but no more new features, latest version: [0.8.12](https://github.com/meerk40t/meerk40t/releases/tag/0.8.12000) (Oct 17, 2023)
+* 0.7 - Discontinued - K40 support only (including ruidacontrol emulator for 3rd party lasersoftware integration), latest version [0.7.10](https://github.com/meerk40t/meerk40t/releases/tag/0.7.10000) (June 13, 2023)
+* 0.6 - Discontinued - K40 support only, latest version: [0.6.24](https://github.com/meerk40t/meerk40t/releases/tag/0.6.24) (Oct 11, 2021)
+
+Just download one of the files for Windows, Mac OSX, Linux and Raspberry Pi.
+
+## Lightburn integration
+Meerk40t allows to act as an intermediary between your K40 laser and software that supports Ruida-controlled laser equipment - [Lightburn](https://lightburnsoftware.com/) is a relevant example of such a software product. You just need to issue the command ``ruidacontrol`` in MeerK40ts console window and you will then be able to add an emulated Ruida Laser inside Lightburn™. Laser jobs that are created inside Lightburn™ and sent to this laser will be picked up by MeerK40t and sent to your K40. See some more detailed instructions in this [video](https://www.youtube.com/watch?v=LUUfLf5Agu0). Please note `ruidacontrol` will require the DSP version of Lightburn™. (Present in all versions since 0.7)
+
+With 0.9 another way of interacting with Lightburn was introduced, which will work as well with the standard version of LB: You just need to issue the command ``grblcontrol`` in MeerK40ts console window, and you will then be able to add an emulated remote GBRL-LPC laser inside Lightburn or any TCP GRBL control software.

{meerk40t-0.9.2000 → meerk40t-0.9.3001}/README.md

@@ -29,16 +29,21 @@ Meerk40t provides a variety of drivers with an extensible framework to provide s
 
 
 ### Supported devices
-*   M2-Nano
-*   Moshiboard
+*   Lihuiyu M2/M3-Nano
 *   GRBL
-*   Fibre Lasers based on the JCZ controllers (still experimental)
+*   Ezcad2-compatible JCZ controllers galvo lasers
+*   Moshiboard
+*   NewlyDraw System 8.1 Lasers
 *   Ruida-Emulation (Middleman between Lightburn and K40)
 
 ### Lihuiyu M2-Nano
 For the Lihuiyu (stock driver), Meerk40t supports both the windows and libusb connection methods, making it compatible with Whisperer and with the original Chinese software. So MeerK40t can usually run alongside these other pieces of software interchangeably.
 
-### Galvo LMC
+### GRBL
+
+GRBL is itself open source and the various interfaces with the board should be quite well understood.
+
+### EZCAD2-Compatible Galvo LMC
 
 Meerk40t supports controlling galvo as well as gantry lasers with open source support.
 
@@ -46,9 +51,9 @@ Meerk40t supports controlling galvo as well as gantry lasers with open source su
 
 The support for old moshiboards makes meerk40t the only known opensource software that controls moshiboards.
 
-### GRBL
+### System 8.1 Lasers (NewlyDraw)
 
-GRBL is itself open source and the various interfaces with the board should be quite well understood.
+HPGL-modified laser systems produced under many different company names
 
 ## Support
 The primary source for help and documentation is the [MeerK40t Wiki - please click here](https://github.com/meerk40t/meerk40t/wiki).
@@ -78,14 +83,16 @@ Open source projects live and die with their support. There are a lots of ways t
 
 ## Download
 You can find and download all current and historical versions in the [Releases](https://github.com/meerk40t/meerk40t/releases) section.
-Currently there are three relevant branches:
-* 0.7 - K40 support only (including ruidacontrol emulator for 3rd party lasersoftware integration) - no longer supported, still good enough for 3rd party integration, latest version [0.7.10](https://github.com/meerk40t/meerk40t/releases/tag/0.7.10000)
-* 0.8 - Multi laser support - receives critical bugfixes but no more new features, latest version: [0.8.11](https://github.com/meerk40t/meerk40t/releases/tag/0.8.11001)
-* 0.9 - Active development branch with new features and some underlying architectural changes. Still a bit green behind the ears, but good enough for daily use. If you feel brave, try the latest released version: [0.9.1](https://github.com/meerk40t/meerk40t/releases#latest)
+
+Currently, primary branches:
+* 0.9 - Active - New features and some underlying architectural changes. Try the latest released version: [0.9.2](https://github.com/meerk40t/meerk40t/releases#latest)
+* 0.8 - Maintenance - may receive critical bugfixes but no more new features, latest version: [0.8.12](https://github.com/meerk40t/meerk40t/releases/tag/0.8.12000) (Oct 17, 2023)
+* 0.7 - Discontinued - K40 support only (including ruidacontrol emulator for 3rd party lasersoftware integration), latest version [0.7.10](https://github.com/meerk40t/meerk40t/releases/tag/0.7.10000) (June 13, 2023)
+* 0.6 - Discontinued - K40 support only, latest version: [0.6.24](https://github.com/meerk40t/meerk40t/releases/tag/0.6.24) (Oct 11, 2021)
 
 Just download one of the files for Windows, Mac OSX, Linux and Raspberry Pi.
 
 ## Lightburn integration
-Meerk40t allows to act as an intermediator between your K40 laser and software that supports Ruida-controlled laser equipment - [Lightburn](https://lightburnsoftware.com/) is a relevant example of such a software product. You just need to issue the command ``ruidacontrol`` in MeerK40ts console window and you will then be able to add an emulated Ruida Laser inside Lightburn. Laser jobs that are created inside Lightburn and sent to this laser will be picked up by MeerK40t and sent to your K40. See some more detailled instructions in this [video](https://www.youtube.com/watch?v=LUUfLf5Agu0). Please note this will require the DSP version of Light burn. (Present in all versions since 0.7)
+Meerk40t allows to act as an intermediary between your K40 laser and software that supports Ruida-controlled laser equipment - [Lightburn](https://lightburnsoftware.com/) is a relevant example of such a software product. You just need to issue the command ``ruidacontrol`` in MeerK40ts console window and you will then be able to add an emulated Ruida Laser inside Lightburn™. Laser jobs that are created inside Lightburn™ and sent to this laser will be picked up by MeerK40t and sent to your K40. See some more detailed instructions in this [video](https://www.youtube.com/watch?v=LUUfLf5Agu0). Please note `ruidacontrol` will require the DSP version of Lightburn™. (Present in all versions since 0.7)
 
-With 0.9 another way of interacting with Lightburn was introduced, which will work as well with the standard version of LB: You just need to issue the command ``grblcontrol`` in MeerK40ts console window and you will then be able to add an emulated remote GBRL-LPC laser inside Lightburn.
+With 0.9 another way of interacting with Lightburn was introduced, which will work as well with the standard version of LB: You just need to issue the command ``grblcontrol`` in MeerK40ts console window, and you will then be able to add an emulated remote GBRL-LPC laser inside Lightburn or any TCP GRBL control software.

{meerk40t-0.9.2000 → meerk40t-0.9.3001}/meerk40t/balormk/balor_params.py

@@ -13,19 +13,17 @@ FLOAT_PARAMETERS = (
     "delay_laser_on",
     "delay_laser_off",
     "delay_polygon",
-    "wobble_speed",
 )
 INT_PARAMETERS = ("pulse_width",)
 
 BOOL_PARAMETERS = (
-    "wobble_enabled",
     "timing_enabled",
     "rapid_enabled",
     "pulse_width_enabled",
 )
 
 
-STRING_PARAMETERS = ("wobble_type", "wobble_radius", "wobble_interval")
+STRING_PARAMETERS = ()
 
 
 class Parameters:
@@ -96,46 +94,6 @@ class Parameters:
     def timing_enabled(self, value):
         self.settings["timing_enabled"] = value
 
-    @property
-    def wobble_enabled(self):
-        return self.settings.get("wobble_enabled", False)
-
-    @wobble_enabled.setter
-    def wobble_enabled(self, value):
-        self.settings["wobble_enabled"] = value
-
-    @property
-    def wobble_radius(self):
-        return self.settings.get("wobble_radius", "1.5mm")
-
-    @wobble_radius.setter
-    def wobble_radius(self, value):
-        self.settings["wobble_radius"] = value
-
-    @property
-    def wobble_speed(self):
-        return self.settings.get("wobble_speed", 50.0)
-
-    @wobble_speed.setter
-    def wobble_speed(self, value):
-        self.settings["wobble_speed"] = value
-
-    @property
-    def wobble_interval(self):
-        return self.settings.get("wobble_interval", "0.3mm")
-
-    @wobble_interval.setter
-    def wobble_interval(self, value):
-        self.settings["wobble_interval"] = value
-
-    @property
-    def wobble_type(self):
-        return self.settings.get("wobble_type", "circle")
-
-    @wobble_type.setter
-    def wobble_type(self, value):
-        self.settings["wobble_type"] = value
-
     @property
     def speed(self):
         return self.settings.get("speed", 100.0)

{meerk40t-0.9.2000 → meerk40t-0.9.3001}/meerk40t/balormk/controller.py

@@ -12,7 +12,6 @@ from copy import copy
 
 from meerk40t.balormk.mock_connection import MockConnection
 from meerk40t.balormk.usb_connection import USBConnection
-from meerk40t.fill.fills import Wobble
 
 DRIVER_STATE_RAPID = 0
 DRIVER_STATE_LIGHT = 1
@@ -273,7 +272,6 @@ class GalvoController:
         self._delay_poly = None
         self._delay_end = None
 
-        self._wobble = None
         self._port_bits = 0
         self._machine_index = 0
 
@@ -627,40 +625,6 @@ class GalvoController:
             self.list_laser_off_delay(self.service.delay_laser_off)
             self.list_polygon_delay(self.service.delay_polygon)
 
-    def set_wobble(self, settings):
-        """
-        Set the wobble parameters and mark modifications routines.
-
-        @param settings: The dict setting to extract parameters from.
-        @return:
-        """
-        if settings is None:
-            self._wobble = None
-            return
-        wobble_enabled = str(settings.get("wobble_enabled", False)).lower() == "true"
-        if not wobble_enabled:
-            self._wobble = None
-            return
-        wobble_radius = settings.get("wobble_radius", "1.5mm")
-        wobble_r, _ = self.service.view.position(wobble_radius, 0, vector=True)
-        wobble_interval = settings.get("wobble_interval", "0.3mm")
-        wobble_speed = settings.get("wobble_speed", 50.0)
-        wobble_type = settings.get("wobble_type", "circle")
-        wobble_interval, _ = self.service.view.position(wobble_interval, 0, vector=True)
-        algorithm = self.service.lookup(f"wobble/{wobble_type}")
-        if self._wobble is None:
-            self._wobble = Wobble(
-                algorithm=algorithm,
-                radius=wobble_r,
-                speed=wobble_speed,
-                interval=wobble_interval,
-            )
-        else:
-            # set our parameterizations
-            self._wobble.algorithm = algorithm
-            self._wobble.radius = wobble_r
-            self._wobble.speed = wobble_speed
-
     #######################
     # PLOTLIKE SHORTCUTS
     #######################
@@ -673,11 +637,7 @@ class GalvoController:
             return
         if self._mark_speed is not None:
             self.list_mark_speed(self._mark_speed)
-        if self._wobble:
-            for wx, wy in self._wobble(self._last_x, self._last_y, x, y):
-                self.list_mark(wx, wy)
-        else:
-            self.list_mark(x, y)
+        self.list_mark(x, y)
 
     def goto(self, x, y, long=None, short=None, distance_limit=None):
         if x == self._last_x and y == self._last_y:

{meerk40t-0.9.2000 → meerk40t-0.9.3001}/meerk40t/balormk/device.py

@@ -15,12 +15,13 @@ from meerk40t.core.laserjob import LaserJob
 from meerk40t.core.spoolers import Spooler
 from meerk40t.core.units import Angle, Length
 from meerk40t.core.view import View
+from meerk40t.device.mixins import Status
 from meerk40t.kernel import CommandSyntaxError, Service, signal_listener
 from meerk40t.svgelements import Path, Point
 from meerk40t.tools.geomstr import Geomstr
 
 
-class BalorDevice(Service):
+class BalorDevice(Service, Status):
     """
     The BalorDevice is a MeerK40t service for the device type. It should be the main method of interacting with
     the rest of meerk40t. It defines how the scene should look and contains a spooler which meerk40t will give jobs
@@ -29,6 +30,7 @@ class BalorDevice(Service):
 
     def __init__(self, kernel, path, *args, choices=None, **kwargs):
         Service.__init__(self, kernel, path)
+        Status.__init__(self)
         self.name = "balor"
         self.extension = "lmc"
         self.job = None
@@ -1791,35 +1793,27 @@ class BalorDevice(Service):
             """
             if data is None:
                 data = list(self.elements.elems(emphasized=True))
-            pts = []
+            g = Geomstr()
             for e in data:
-                if e.type == "elem image":
+                if hasattr(e, "as_image"):
                     bounds = e.bounds
-                    pts += [
-                        (bounds[0], bounds[1]),
-                        (bounds[0], bounds[3]),
-                        (bounds[2], bounds[1]),
-                        (bounds[2], bounds[3]),
-                    ]
+                    g.append(
+                        Geomstr.rect(
+                            bounds[0],
+                            bounds[1],
+                            bounds[2] - bounds[0],
+                            bounds[3] - bounds[1],
+                        )
+                    )
                 elif e.type == "elem text":
                     continue  # We can't outline text.
                 else:
-                    try:
-                        path = abs(Path(e.shape))
-                    except AttributeError:
-                        try:
-                            path = abs(e.path)
-                        except AttributeError:
-                            continue
-                    pts += [q for q in path.as_points()]
-            hull = [p for p in Point.convex_hull(pts)]
+                    g.append(e.as_geometry())
+            hull = Geomstr.hull(g)
             if len(hull) == 0:
                 channel(_("No elements bounds to trace."))
                 return
-            hull.append(hull[0])  # loop
-            hull = list(map(complex, hull))
-            geometry = Geomstr.lines(*hull)
-            return "geometry", geometry
+            return "geometry", hull
 
         def ant_points(points, steps):
             points = list(points)

{meerk40t-0.9.2000 → meerk40t-0.9.3001}/meerk40t/balormk/driver.py

@@ -102,7 +102,7 @@ class BalorDriver:
         """
         Required.
 
-        Sets a laser parameter this could be speed, power, wobble, number_of_unicorns, or any unknown parameters for
+        Sets a laser parameter this could be speed, power, number_of_unicorns, or any unknown parameters for
         yet to be written drivers.
 
         @param key:
@@ -186,7 +186,6 @@ class BalorDriver:
         con.program_mode()
         self._list_bits = con._port_bits
         last_on = None
-        con.set_wobble(None)
         queue = self.queue
         self.queue = list()
         for q in queue:
@@ -198,7 +197,6 @@ class BalorDriver:
                 except KeyError:
                     self.value_penbox = None
             con.set_settings(settings)
-            con.set_wobble(settings)
             # LOOP CHECKS
             if self._aborting:
                 con.abort()
@@ -323,7 +321,6 @@ class BalorDriver:
                                 except KeyError:
                                     self.value_penbox = None
                             con.set_settings(settings)
-                            con.set_wobble(settings)
                         elif on & (
                             PLOT_RAPID | PLOT_JOG
                         ):  # Plot planner requests position change.
@@ -533,6 +530,7 @@ class BalorDriver:
             return
         self.paused = True
         self.connection.pause()
+        self.service.signal("pause")
 
     def resume(self):
         """
@@ -545,6 +543,7 @@ class BalorDriver:
         """
         self.paused = False
         self.connection.resume()
+        self.service.signal("pause")
 
     def reset(self):
         """
@@ -554,6 +553,7 @@ class BalorDriver:
         """
         self.paused = False
         self.connection.abort()
+        self.service.signal("pause")
 
     def dwell(self, time_in_ms):
         """

{meerk40t-0.9.2000 → meerk40t-0.9.3001}/meerk40t/balormk/gui/balorconfig.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
 from meerk40t.kernel import signal_listener
 
@@ -16,7 +16,7 @@ class BalorConfiguration(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(_(_("Balor-Configuration")))
 

{meerk40t-0.9.2000 → meerk40t-0.9.3001}/meerk40t/balormk/gui/balorcontroller.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 BalorControllerPanel(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 BalorControllerPanel(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 BalorController(MWindow):
         self.add_module_delegate(self.panel)
         self.SetTitle(_("Balor-Controller"))
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_connected_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_connected.GetBitmap())
         self.SetIcon(_icon)
         self.Layout()
 

{meerk40t-0.9.2000 → meerk40t-0.9.3001}/meerk40t/balormk/gui/baloroperationproperties.py

@@ -92,52 +92,6 @@ class BalorOperationPanel(ScrolledPanel):
                 "label": _("Polygon Delay"),
                 "tip": _("Delay amount between different points in the path travel."),
             },
-            {
-                "attr": "wobble_enabled",
-                "object": params,
-                "default": False,
-                "type": bool,
-                "label": _("Enable Wobble"),
-                "tip": _("Enable wobble for this particular cut"),
-            },
-            {
-                "attr": "wobble_radius",
-                "object": params,
-                "default": "1.5mm",
-                "type": Length,
-                "conditional": (params, "wobble_enabled"),
-                "label": _("Radius of wobble"),
-                "tip": _("Radius of the wobble for this cut, if wobble is enabled."),
-            },
-            {
-                "attr": "wobble_interval",
-                "object": params,
-                "default": "0.2mm",
-                "type": Length,
-                "conditional": (params, "wobble_enabled"),
-                "label": _("Wobble Sampling Interval"),
-                "tip": _("Sample interval for the wobble of this cut"),
-            },
-            {
-                "attr": "wobble_speed",
-                "object": params,
-                "default": 50.0,
-                "type": float,
-                "conditional": (params, "wobble_enabled"),
-                "label": _("Wobble Speed Multiplier"),
-                "tip": _("Wobble rotation speed multiplier"),
-            },
-            {
-                "attr": "wobble_type",
-                "object": params,
-                "default": "circle",
-                "type": str,
-                "style": "combo",
-                "choices": list(self.context.match("wobble", suffix=True)),
-                "conditional": (params, "wobble_enabled"),
-                "label": _("Wobble Pattern Type"),
-                "tip": _("Pattern type for the given wobble."),
-            },
         ]
 
         self.panel = ChoicePropertyPanel(