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

meerk40t/device/gui/formatterpanel.py

@@ -3,28 +3,29 @@ import wx
 from meerk40t.core.elements.element_types import elem_group_nodes, op_nodes
 from meerk40t.gui.choicepropertypanel import ChoicePropertyPanel
 from meerk40t.gui.icons import (
-    icons8_diagonal_20,
-    icons8_direction_20,
-    icons8_file_20,
-    icons8_group_objects_20,
-    icons8_home_20,
-    icons8_home_location_20,
-    icons8_image_20,
-    icons8_image_50,
-    icons8_input_20,
-    icons8_laser_beam_20,
-    icons8_output_20,
-    icons8_oval_50,
-    icons8_polyline_50,
-    icons8_rectangular_50,
-    icons8_return_20,
-    icons8_scatter_plot_20,
-    icons8_small_beam_20,
-    icons8_system_task_20,
-    icons8_text_50,
-    icons8_timer_20,
-    icons8_vector_50,
+    EmptyIcon,
+    icon_console,
+    icon_effect_hatch,
+    icon_effect_wobble,
+    icon_external,
+    icon_internal,
+    icon_mk_ellipse,
+    icon_mk_polyline,
+    icon_mk_rectangular,
+    icon_points,
+    icon_return,
+    icon_timer,
+    icons8_direction,
+    icons8_file,
+    icons8_group_objects,
+    icons8_home_filled,
+    icons8_image,
+    icons8_laser_beam,
+    icons8_laserbeam_weak,
+    icons8_text,
+    icons8_vector,
 )
+from meerk40t.gui.wxutils import dip_size
 
 _ = wx.GetTranslation
 
@@ -43,30 +44,31 @@ class FormatterPanel(wx.Panel):
         self.context = context
         self.data = {}
         images = {
-            "util wait": icons8_timer_20,
-            "util home": icons8_home_20,
-            "util goto": icons8_return_20,
-            "util output": icons8_output_20,
-            "util input": icons8_input_20,
-            "util console": icons8_system_task_20,
-            "op engrave": icons8_small_beam_20,
-            "op cut": icons8_laser_beam_20,
-            "op image": icons8_image_20,
-            "op raster": icons8_direction_20,
-            "op dots": icons8_scatter_plot_20,
-            "effect hatch": icons8_diagonal_20,
-            "file": icons8_file_20,
-            "group": icons8_group_objects_20,
-            "elem point": icons8_scatter_plot_20,
-            "elem ellipse": icons8_oval_50,
-            "elem image": icons8_image_50,
-            "elem path": icons8_vector_50,
-            "elem polyline": icons8_polyline_50,
-            "elem rect": icons8_rectangular_50,
-            "elem line": icons8_polyline_50,
-            "elem text": icons8_text_50,
-            "place current": icons8_home_location_20,
-            "place point": icons8_home_location_20,
+            "util wait": icon_timer,
+            "util home": icons8_home_filled,
+            "util goto": icon_return,
+            "util output": icon_external,
+            "util input": icon_internal,
+            "util console": icon_console,
+            "op engrave": icons8_laserbeam_weak,
+            "op cut": icons8_laser_beam,
+            "op image": icons8_image,
+            "op raster": icons8_direction,
+            "op dots": icon_points,
+            "effect hatch": icon_effect_hatch,
+            "effect wobble": icon_effect_wobble,
+            "file": icons8_file,
+            "group": icons8_group_objects,
+            "elem point": icon_points,
+            "elem ellipse": icon_mk_ellipse,
+            "elem image": icons8_image,
+            "elem path": icons8_vector,
+            "elem polyline": icon_mk_polyline,
+            "elem rect": icon_mk_rectangular,
+            "elem line": icon_mk_polyline,
+            "elem text": icons8_text,
+            "place current": icons8_home_filled,
+            "place point": icons8_home_filled,
         }
         omit = ("elem line",)
         self.node_list = list(elem_group_nodes + op_nodes)
@@ -109,13 +111,20 @@ class FormatterPanel(wx.Panel):
                 "signals": ("rebuild_tree", "speed_min"),
             },
         ]
+        testsize = dip_size(self, 20, 20)
+        imgsize = testsize[1]
         for node in self.node_list:
-            imgsize = 20
             if node in images:
-                image = images[node].GetBitmap(resize=imgsize, noadjustment=True)
+                image = images[node].GetBitmap(
+                    resize=imgsize, buffer=2, noadjustment=True
+                )
             else:
-                image = wx.Bitmap(8, imgsize, imgsize)
-            if node in elem_group_nodes:
+                # print (f"Did not find {node}")
+                continue
+                # image = EmptyIcon(size=imgsize, color=None, msg="??").GetBitmap()
+            if node.startswith("effect"):
+                sectname = "Elements (Effects)"
+            elif node in elem_group_nodes:
                 sectname = "Elements"
             elif node in elem_group_nodes:
                 sectname = "Grouping + Files"

meerk40t/device/gui/warningpanel.py

@@ -1,12 +1,12 @@
 import wx
 
 from meerk40t.gui.icons import (
-    icons8_diagonal_20,
-    icons8_direction_20,
-    icons8_image_20,
-    icons8_laser_beam_20,
-    icons8_scatter_plot_20,
-    icons8_small_beam_20,
+    icon_effect_hatch,
+    icon_points,
+    icons8_direction,
+    icons8_image,
+    icons8_laser_beam,
+    icons8_laserbeam_weak,
 )
 from meerk40t.gui.wxutils import TextCtrl, dip_size
 
@@ -28,12 +28,12 @@ class WarningPanel(wx.Panel):
         self.data = {}
 
         self.images = {
-            "cut": icons8_laser_beam_20,
-            "engrave": icons8_small_beam_20,
-            "raster": icons8_direction_20,
-            "image": icons8_image_20,
-            "dots": icons8_scatter_plot_20,
-            "hatch": icons8_diagonal_20,
+            "cut": icons8_laser_beam,
+            "engrave": icons8_laserbeam_weak,
+            "raster": icons8_direction,
+            "image": icons8_image,
+            "dots": icon_points,
+            "hatch": icon_effect_hatch,
         }
         self.checkboxes = []
         self.limits = []

meerk40t/device/mixins.py

@@ -0,0 +1,13 @@
+class Status:
+    def __init__(self):
+        self._laser_status = "idle"
+
+    @property
+    def laser_status(self):
+        return self._laser_status
+
+    @laser_status.setter
+    def laser_status(self, new_value):
+        self._laser_status = new_value
+        flag = bool(new_value == "active")
+        self.signal("pipe;running", flag)

meerk40t/dxf/dxf_io.py

@@ -152,10 +152,11 @@ class DXFProcessor:
             node.stroke = color
 
     def parse(self, entity, context_node, e_list):
-        try:
-            entity.transform_to_wcs(entity.ocs())
-        except AttributeError:
-            pass
+        if hasattr(entity, "transform_to_wcs"):
+            try:
+                entity.transform_to_wcs(entity.ocs())
+            except AttributeError as e:
+                pass
         if entity.dxftype() == "CIRCLE":
             m = Matrix()
             m.post_scale(self.scale, -self.scale)
@@ -192,7 +193,7 @@ class DXFProcessor:
             if len(path) != 0:
                 if not isinstance(path[0], Move):
                     path = Move(path.first_point) + path
-
+                path.approximate_arcs_with_cubics()
             node = context_node.add(path=path, type="elem path")
             self.check_for_attributes(node, entity)
             e_list.append(node)
@@ -296,6 +297,7 @@ class DXFProcessor:
                     if len(path) != 0:
                         if not isinstance(path[0], Move):
                             path = Move(path.first_point) + path
+                        path.approximate_arcs_with_cubics()
                     node = context_node.add(path=path, type="elem path")
                     self.check_for_attributes(node, entity)
                     e_list.append(node)
@@ -346,6 +348,7 @@ class DXFProcessor:
                 if len(path) != 0:
                     if not isinstance(path[0], Move):
                         path = Move(path.first_point) + path
+                    path.approximate_arcs_with_cubics()
                 node = context_node.add(path=path, type="elem path")
                 self.check_for_attributes(node, entity)
                 e_list.append(node)
@@ -407,6 +410,7 @@ class DXFProcessor:
             if len(path) != 0:
                 if not isinstance(path[0], Move):
                     path = Move(path.first_point) + path
+                path.approximate_arcs_with_cubics()
             node = context_node.add(path=path, type="elem path")
             self.check_for_attributes(node, entity)
             e_list.append(node)

meerk40t/extra/ezd.py

@@ -37,12 +37,14 @@ def _parse_struct(file):
     @return:
     """
     p = list()
-    count = struct.unpack("<I", file.read(4))[0]
+    count = struct.unpack("<i", file.read(4))[0]
     for i in range(count):
         b = file.read(4)
         if len(b) != 4:
             return p
-        (length,) = struct.unpack("<I", b)
+        (length,) = struct.unpack("<i", b)
+        if length == -1:
+            return p
         b = file.read(length)
         if len(b) != length:
             return p
@@ -68,7 +70,7 @@ def _interpret(data, index, type):
     elif type == "short":
         (data[index],) = struct.unpack("<H", data[index])
     elif type == int:
-        (data[index],) = struct.unpack("<I", data[index])
+        (data[index],) = struct.unpack("<i", data[index])
     elif type == float:
         (data[index],) = struct.unpack("d", data[index])
     elif type == "matrix":
@@ -239,8 +241,8 @@ class EZCFile:
         header = magic_number.decode("utf_16")
         if header != "EZCADUNI":
             return False
-        v0 = struct.unpack("<I", file.read(4))  # 0
-        v1 = struct.unpack("<I", file.read(4))  # 2001
+        v0 = struct.unpack("<i", file.read(4))  # 0
+        v1 = struct.unpack("<i", file.read(4))  # 2001
         s1 = file.read(60)
         s1 = s1.decode("utf-16")
         s2 = file.read(60)
@@ -256,13 +258,13 @@ class EZCFile:
         @param file:
         @return:
         """
-        self._locations["preview"] = struct.unpack("<I", file.read(4))[0]
-        self._locations["v1"] = struct.unpack("<I", file.read(4))[0]
-        self._locations["pens"] = struct.unpack("<I", file.read(4))[0]
-        self._locations["font"] = struct.unpack("<I", file.read(4))[0]
-        self._locations["v4"] = struct.unpack("<I", file.read(4))[0]
-        self._locations["vectors"] = struct.unpack("<I", file.read(4))[0]
-        self._locations["prevectors"] = struct.unpack("<I", file.read(4))[0]
+        self._locations["preview"] = struct.unpack("<i", file.read(4))[0]
+        self._locations["v1"] = struct.unpack("<i", file.read(4))[0]
+        self._locations["pens"] = struct.unpack("<i", file.read(4))[0]
+        self._locations["font"] = struct.unpack("<i", file.read(4))[0]
+        self._locations["v4"] = struct.unpack("<i", file.read(4))[0]
+        self._locations["vectors"] = struct.unpack("<i", file.read(4))[0]
+        self._locations["prevectors"] = struct.unpack("<i", file.read(4))[0]
 
     def parse_unknown_nontable(self, file):
         """
@@ -324,10 +326,10 @@ class EZCFile:
         if seek == 0:
             return
         file.seek(seek, 0)
-        unknown = struct.unpack("<I", file.read(4))[0]
-        width = struct.unpack("<I", file.read(4))[0]
-        height = struct.unpack("<I", file.read(4))[0]
-        v3 = struct.unpack("<3I", file.read(12))
+        unknown = struct.unpack("<i", file.read(4))[0]
+        width = struct.unpack("<i", file.read(4))[0]
+        height = struct.unpack("<i", file.read(4))[0]
+        v3 = struct.unpack("<3i", file.read(12))
         # 800, 0x200002
 
         # RGB0
@@ -346,7 +348,7 @@ class EZCFile:
         if seek == 0:
             return
         file.seek(seek, 0)
-        font_count = struct.unpack("<I", file.read(4))[0]
+        font_count = struct.unpack("<i", file.read(4))[0]
 
         for i in range(font_count):
             f = file.read(100)
@@ -364,8 +366,8 @@ class EZCFile:
             return
         file.seek(seek, 0)
 
-        parameter_count = struct.unpack("<I", file.read(4))[0]
-        seek = struct.unpack("<I", file.read(4))[0]
+        parameter_count = struct.unpack("<i", file.read(4))[0]
+        seek = struct.unpack("<i", file.read(4))[0]
         file.seek(seek, 0)
         for c in range(parameter_count):
             self.pens.append(Pen(file))
@@ -445,7 +447,7 @@ class EZObject:
         self.position = header[13]
         self.z_pos = header[14]
         if isinstance(self, list):
-            (count,) = struct.unpack("<I", file.read(4))
+            (count,) = struct.unpack("<i", file.read(4))
             for c in range(count):
                 parse_object(file, self)
 
@@ -502,7 +504,7 @@ class EZCurve(EZObject):
                 d = struct.unpack(f"<5d", file.read(40))
                 # print(d)
                 continue
-            (pt_count,) = struct.unpack("<I", file.read(4))
+            (pt_count,) = struct.unpack("<i", file.read(4))
             # print(unk1, curve_type, unk2, unk2, pt_count)
             pts.append(
                 (
@@ -718,7 +720,7 @@ class EZText(EZObject):
         self.circle_text_button_flags = args[
             85
         ]  # 2 is first button, 1 is right to left.
-        (count,) = struct.unpack("<I", file.read(4))
+        (count,) = struct.unpack("<i", file.read(4))
         for i in range(count):
             (type,) = struct.unpack("<H", file.read(2))
             # type, 7 file. 1 Text. 2 Serial
@@ -726,7 +728,7 @@ class EZText(EZObject):
             _construct(extradata)
             extradata2 = _parse_struct(file)
             _construct(extradata2)
-        (unk,) = struct.unpack("<I", file.read(4))
+        (unk,) = struct.unpack("<i", file.read(4))
 
 
 class EZImage(EZObject):
@@ -741,7 +743,7 @@ class EZImage(EZObject):
 
         image_bytes = bytearray(file.read(2))  # BM
         image_length = file.read(4)  # int32le
-        (size,) = struct.unpack("<I", image_length)
+        (size,) = struct.unpack("<i", image_length)
         image_bytes += image_length
         image_bytes += file.read(size - 6)
 
@@ -831,7 +833,7 @@ class EZHatch(list, EZObject):
         self.hatch3_loop_distance = args[37]
         self.hatch3_angle_inc = args[28]
         tell = file.tell()
-        (check,) = struct.unpack("<I", file.read(4))
+        (check,) = struct.unpack("<i", file.read(4))
         file.seek(tell, 0)
         if check == 15:
             self.group = EZGroup(file)
@@ -861,7 +863,7 @@ object_map = {
 
 
 def parse_object(file, objects):
-    object_type = struct.unpack("<I", file.read(4))[0]  # 0
+    object_type = struct.unpack("<i", file.read(4))[0]  # 0
     if object_type == 0:
         return False
     ez_class = object_map.get(object_type)