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

meerk40t/tools/kerftest.py

@@ -9,7 +9,7 @@ from meerk40t.core.node.op_cut import CutOpNode
 from meerk40t.core.node.op_engrave import EngraveOpNode
 from meerk40t.core.node.op_raster import RasterOpNode
 from meerk40t.core.units import UNITS_PER_PIXEL, Length
-from meerk40t.gui.icons import STD_ICON_SIZE, icon_kerf_50, icons8_detective_50
+from meerk40t.gui.icons import STD_ICON_SIZE, icon_kerf, icons8_detective
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import StaticBoxSizer, TextCtrl, dip_size
 from meerk40t.kernel import lookup_listener, signal_listener
@@ -58,7 +58,7 @@ class KerfPanel(wx.Panel):
 
         self.button_create = wx.Button(self, wx.ID_ANY, _("Create Pattern"))
         self.button_create.SetBitmap(
-            icons8_detective_50.GetBitmap(resize=STD_ICON_SIZE / 2)
+            icons8_detective.GetBitmap(resize=STD_ICON_SIZE / 2)
         )
 
         self._set_layout()
@@ -156,7 +156,7 @@ class KerfPanel(wx.Panel):
         sizer_param.Add(hline_dim, 0, wx.EXPAND, 0)
         sizer_param.Add(hline_delta, 0, wx.EXPAND, 0)
 
-        sizer_info = StaticBoxSizer(self, wx.ID_ANY, _("How to use it"), wx.VERTICAL)
+        sizer_info = StaticBoxSizer(self, wx.ID_ANY, _("How to use it"), wx.HORIZONTAL)
         infomsg = _(
             "If you want to produce cut out shapes with *exact* dimensions"
             + " after the burn, then you need to take half the width of the"
@@ -166,10 +166,14 @@ class KerfPanel(wx.Panel):
             + " label together. Choose the pair that has a perfect fit and use the"
             + " label as your kerf-compensation value."
         )
+        info_pic = wx.StaticBitmap(
+            self, wx.ID_ANY, bitmap=icon_kerf.GetBitmap(resize=STD_ICON_SIZE)
+        )
         info_label = wx.TextCtrl(
             self, wx.ID_ANY, value=infomsg, style=wx.TE_READONLY | wx.TE_MULTILINE
         )
         info_label.SetBackgroundColour(self.GetBackgroundColour())
+        sizer_info.Add(info_pic, 0, 0, 0)
         sizer_info.Add(info_label, 1, wx.EXPAND, 0)
 
         main_sizer.Add(sizer_cutop, 0, wx.EXPAND, 1)
@@ -863,7 +867,7 @@ class KerfTool(MWindow):
         )
         self.add_module_delegate(self.panel_template)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icon_kerf_50.GetBitmap())
+        _icon.CopyFromBitmap(icon_kerf.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Kerf-Test"))
         self.Layout()

meerk40t/tools/livinghinges.py

@@ -4,13 +4,16 @@ import wx
 
 from meerk40t.core.units import ACCEPTED_UNITS, Length
 from meerk40t.fill.patterns import LivingHinges
-from meerk40t.gui.icons import STD_ICON_SIZE, icons8_hinges_50
+from meerk40t.gui.icons import STD_ICON_SIZE, icon_hinges
 from meerk40t.gui.laserrender import LaserRender
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import StaticBoxSizer, dip_size
 from meerk40t.kernel import signal_listener
 from meerk40t.svgelements import Color, Matrix, Path
 
+# from meerk40t.fill.patternfill import LivingHinges
+
+
 _ = wx.GetTranslation
 
 """
@@ -99,7 +102,7 @@ class HingePanel(wx.Panel):
             self,
             wx.ID_ANY,
             0,
-            int(1 - _FACTOR / 2),
+            int(1 - _FACTOR / 2) + 1,
             int(_FACTOR / 2),
             style=wx.SL_HORIZONTAL,
         )
@@ -114,7 +117,7 @@ class HingePanel(wx.Panel):
             self,
             wx.ID_ANY,
             0,
-            int(1 - _FACTOR / 2),
+            int(1 - _FACTOR / 2) + 1,
             int(_FACTOR / 2),
             style=wx.SL_HORIZONTAL,
         )
@@ -489,7 +492,7 @@ class HingePanel(wx.Panel):
                 )
                 gc.SetPen(mypen_path)
                 gspath = self.hinge_generator.preview_path
-                if gspath is not None:
+                if gspath is not None and self.hinge_generator.outershape is not None:
                     if isinstance(gspath, Path):
                         bb = self.hinge_generator.outershape.bbox()
                         gspath.transform *= Matrix.translate(-bb[0], -bb[1])
@@ -533,7 +536,9 @@ class HingePanel(wx.Panel):
         self.button_generate.Enable(False)
         self.button_generate.SetLabel(_("Processing..."))
         start_time = time()
-        if self.hinge_generator.outershape is not None:
+        if self.hinge_generator.outershape is not None and hasattr(
+            self.hinge_generator.outershape, "as_geometry"
+        ):
             # As we have a reference shape, we make sure
             # we update the information...
             units = self.context.units_name
@@ -917,7 +922,7 @@ class HingePanel(wx.Panel):
             self.slider_param_b.SetValue(int(10 * self.hinge_param_b))
         if require_sync:
             self.sync_controls(True)
-        flag = wd > 0 and ht > 0
+        flag = wd > 0 and ht > 0 and self.hinge_generator.outershape is not None
         self.button_generate.Enable(flag)
         self.Layout()
 
@@ -931,9 +936,11 @@ class HingePanel(wx.Panel):
                 bounds = node.bbox()
                 self.hinge_generator.set_hinge_shape(first_selected)
                 flag = False
+                self.button_generate.Enable(True)
                 break
         if flag:
             self.hinge_generator.set_hinge_shape(None)
+            self.button_generate.Enable(False)
             if units in ("in", "inch"):
                 s = "2in"
             else:
@@ -985,7 +992,7 @@ class LivingHingeTool(MWindow):
         )
         self.add_module_delegate(self.panel_template)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_hinges_50.GetBitmap())
+        _icon.CopyFromBitmap(icon_hinges.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Living-Hinges"))
         self.Layout()
@@ -1014,7 +1021,7 @@ class LivingHingeTool(MWindow):
             "button/extended_tools/LivingHinge",
             {
                 "label": _("Hinge"),
-                "icon": icons8_hinges_50,
+                "icon": icon_hinges,
                 "tip": _("Fill area with a living hinge pattern"),
                 "action": lambda v: kernel.console("window open Hingetool\n"),
                 "size": STD_ICON_SIZE,

{meerk40t-0.9.2000.dist-info → meerk40t-0.9.3001.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: meerk40t
-Version: 0.9.2000
+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
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -21,6 +20,7 @@ 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
@@ -70,16 +70,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.
 
@@ -87,9 +92,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).
@@ -119,16 +124,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)
-
-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.
-
+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.