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

meerk40t/gui/laserrender.py

@@ -37,7 +37,7 @@ from ..tools.geomstr import (  # , TYPE_RAMP
     Geomstr,
 )
 from .fonts import wxfont_to_svg
-from .icons import icons8_image_50
+from .icons import icons8_image
 from .zmatrix import ZMatrix
 
 DRAW_MODE_FILLS = 0x000001
@@ -215,10 +215,11 @@ class LaserRender:
                     "elem rect",
                     "elem line",
                     "effect hatch",
+                    "effect wobble",
                 )
                 nodes = [e for e in nodes if e.type not in path_elements]
             if draw_mode & DRAW_MODE_IMAGE:  # Do not draw images.
-                nodes = [e for e in nodes if e.type != "elem image"]
+                nodes = [e for e in nodes if hasattr(e, "as_image")]
             if draw_mode & DRAW_MODE_TEXT:  # Do not draw text.
                 nodes = [e for e in nodes if e.type != "elem text"]
             if draw_mode & DRAW_MODE_REGMARKS:  # Do not draw regmarked items.
@@ -270,6 +271,7 @@ class LaserRender:
                 "elem line",
                 "elem polyline",
                 "effect hatch",
+                "effect wobble",
             ):
                 node.draw = self.draw_vector
                 node._make_cache = self.cache_geomstr
@@ -277,7 +279,7 @@ class LaserRender:
                 node.draw = self.draw_point_node
             elif node.type in place_nodes:
                 node.draw = self.draw_placement_node
-            elif node.type == "elem image":
+            elif hasattr(node, "as_image"):
                 node.draw = self.draw_image_node
             elif node.type == "elem text":
                 node.draw = self.draw_text_node
@@ -599,7 +601,7 @@ class LaserRender:
                     gc.SetBrush(wx.RED_BRUSH)
                     gc.DrawRectangle(0, 0, cut._cache_width, cut._cache_height)
                     gc.DrawBitmap(
-                        icons8_image_50.GetBitmap(),
+                        icons8_image.GetBitmap(),
                         0,
                         0,
                         cut._cache_width,
@@ -630,25 +632,12 @@ class LaserRender:
             gc.StrokePath(p)
             del p
 
-    def cache_shape(self, node, gc):
-        matrix = node.matrix
-        node._cache_matrix = copy(matrix)
-        # Ensure Sync.
-        node.shape.transform = matrix
-        cache = self.make_path(gc, node.shape)
-        node._cache = cache
-
-    def cache_path(self, node, gc):
-        matrix = node.matrix
-        node._cache_matrix = copy(matrix)
-        # Ensure Sync.
-        node.path.transform = matrix
-        cache = self.make_path(gc, node.path)
-        node._cache = cache
-
     def cache_geomstr(self, node, gc):
-        matrix = node.matrix
-        node._cache_matrix = copy(matrix)
+        try:
+            matrix = node.matrix
+            node._cache_matrix = copy(matrix)
+        except AttributeError:
+            node._cache_matrix = Matrix()
         geom = node.as_geometry()
         cache = self.make_geomstr(gc, geom, node=node)
         node._cache = cache
@@ -672,7 +661,10 @@ class LaserRender:
                     property_op(kernel.root, node)
                 if hasattr(node, "_cache"):
                     node._cache = None
-        matrix = node.matrix
+        try:
+            matrix = node.matrix
+        except AttributeError:
+            matrix = Matrix()
         gc.PushState()
         try:
             cache = node._cache
@@ -891,55 +883,54 @@ class LaserRender:
         gc.PopState()
 
     def draw_image_node(self, node, gc, draw_mode, zoomscale=1.0, alpha=255):
-        image = node.active_image
-        matrix = node.active_matrix
+        image, bounds = node.as_image()
         gc.PushState()
-        if matrix is not None and not matrix.is_identity():
-            gc.ConcatTransform(wx.GraphicsContext.CreateMatrix(gc, ZMatrix(matrix)))
-        if node._process_image_failed:
-            image_width, image_height = image.size
-            gc.SetBrush(wx.RED_BRUSH)
-            gc.SetPen(wx.RED_PEN)
-            gc.DrawRectangle(0, 0, image_width, image_height)
-            gc.DrawBitmap(icons8_image_50.GetBitmap(), 0, 0, image_width, image_height)
-        else:
-            if draw_mode & DRAW_MODE_CACHE == 0:
-                cache = None
-                try:
-                    cache = node._cache
-                except AttributeError:
-                    pass
-                if cache is None:
-                    try:
-                        max_allowed = node.max_allowed
-                    except AttributeError:
-                        max_allowed = 2048
-                    node._cache_width, node._cache_height = image.size
-                    node._cache = self.make_thumbnail(
-                        image,
-                        maximum=max_allowed,
-                        alphablack=draw_mode & DRAW_MODE_ALPHABLACK == 0,
-                    )
-                gc.DrawBitmap(node._cache, 0, 0, node._cache_width, node._cache_height)
-            else:
-                node._cache_width, node._cache_height = image.size
-                try:
-                    cache = self.make_thumbnail(
-                        image, alphablack=draw_mode & DRAW_MODE_ALPHABLACK == 0
-                    )
-                    gc.DrawBitmap(cache, 0, 0, node._cache_width, node._cache_height)
-                except MemoryError:
-                    pass
+
+        try:
+            image = node.active_image
+            matrix = node.active_matrix
+            bounds = 0, 0, image.width, image.height
+            if matrix is not None and not matrix.is_identity():
+                gc.ConcatTransform(wx.GraphicsContext.CreateMatrix(gc, ZMatrix(matrix)))
+        except AttributeError:
+            pass
+
+        cache = None
+        try:
+            cache = node._cache
+        except AttributeError:
+            pass
+        if cache is None:
+            try:
+                max_allowed = node.max_allowed
+            except AttributeError:
+                max_allowed = 2048
+            node._cache_width, node._cache_height = image.size
+            node._cache = self.make_thumbnail(
+                image,
+                maximum=max_allowed,
+                alphablack=draw_mode & DRAW_MODE_ALPHABLACK == 0,
+            )
+        node._cache_width, node._cache_height = image.size
+        try:
+            cache = self.make_thumbnail(
+                image, alphablack=draw_mode & DRAW_MODE_ALPHABLACK == 0
+            )
+            min_x, min_y, max_x, max_y = bounds
+            gc.DrawBitmap(cache, min_x, min_y, max_x - min_x, max_y - min_y)
+        except MemoryError:
+            pass
         gc.PopState()
-        txt = node._processing_message
-        if txt is not None:
-            gc.PushState()
-            gc.SetTransform(wx.GraphicsContext.CreateMatrix(gc, ZMatrix(None)))
-            font = wx.Font()
-            font.SetPointSize(20)
-            gc.SetFont(font, wx.BLACK)
-            gc.DrawText(txt, 30, 30)
-            gc.PopState()
+        if hasattr(node, "message"):
+            txt = node.message
+            if txt is not None:
+                gc.PushState()
+                gc.SetTransform(wx.GraphicsContext.CreateMatrix(gc, ZMatrix(None)))
+                font = wx.Font()
+                font.SetPointSize(20)
+                gc.SetFont(font, wx.BLACK)
+                gc.DrawText(txt, 30, 30)
+                gc.PopState()
 
     def measure_text(self, node):
         """

meerk40t/gui/lasertoolpanel.py

@@ -4,9 +4,9 @@ import wx
 
 from meerk40t.core.units import Length
 from meerk40t.gui.icons import (
-    instruction_circle,
-    instruction_frame,
-    instruction_rectangle,
+    icon_instruct_circle,
+    icon_instruct_rect,
+    icon_instruct_square,
 )
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import dip_size
@@ -98,7 +98,7 @@ class LaserToolPanel(wx.Panel):
         img_instruction_1 = wx.StaticBitmap(
             self.nb_circle,
             wx.ID_ANY,
-            self.fitted_bitmap(instruction_circle, desired_height),
+            self.fitted_bitmap(icon_instruct_circle, desired_height),
         )
         instructions = _(
             "Instruction: place the laser on three points on the circumference of the circle on the bed and confirm the position by clicking on the buttons below.\nMK will find the center for you and place the laser above it or will recreate the circle for further processing."
@@ -174,7 +174,7 @@ class LaserToolPanel(wx.Panel):
         self.img_instruction_2 = wx.StaticBitmap(
             self.nb_rectangle,
             wx.ID_ANY,
-            self.fitted_bitmap(instruction_frame, desired_height),
+            self.fitted_bitmap(icon_instruct_rect, desired_height),
         )
         instructions = _(
             "Instruction: place the laser on one corner of the encompassing rectangle and confirm the position by clicking on the buttons below. Then choose the opposing corner.\nMK will create a rectangle for you for further processing."
@@ -272,7 +272,7 @@ class LaserToolPanel(wx.Panel):
         self.img_instruction_3 = wx.StaticBitmap(
             self.nb_square,
             wx.ID_ANY,
-            self.fitted_bitmap(instruction_rectangle, desired_height),
+            self.fitted_bitmap(icon_instruct_square, desired_height),
         )
         instructions = _(
             "Instruction: place the laser on two points of one side of a square on the bed and confirm the position by clicking on the buttons below. Then choose one point on the other side of the corner.\nMK will create a square for you for further processing."
@@ -765,6 +765,7 @@ class LaserToolPanel(wx.Panel):
 
     @signal_listener("driver;position")
     @signal_listener("emulator;position")
+    @signal_listener("status;position")
     def on_update_laser(self, origin, pos):
         self.laserposition = (pos[2], pos[3])
 
@@ -774,7 +775,7 @@ class LaserTool(MWindow):
         super().__init__(551, 234, submenu="Operations", *args, **kwds)
         self.panel = LaserToolPanel(self, wx.ID_ANY, context=self.context)
         _icon = wx.NullIcon
-        # _icon.CopyFromBitmap(icons8_computer_support_50.GetBitmap())
+        # _icon.CopyFromBitmap(icons8_computer_support.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Place Template"))
 

meerk40t/gui/materialtest.py

@@ -10,7 +10,7 @@ from meerk40t.core.node.op_engrave import EngraveOpNode
 from meerk40t.core.node.op_image import ImageOpNode
 from meerk40t.core.node.op_raster import RasterOpNode
 from meerk40t.core.units import UNITS_PER_PIXEL, Angle, Length
-from meerk40t.gui.icons import STD_ICON_SIZE, icons8_detective_50
+from meerk40t.gui.icons import STD_ICON_SIZE, get_default_icon_size, icons8_detective
 from meerk40t.gui.mwindow import MWindow
 from meerk40t.gui.wxutils import StaticBoxSizer, TextCtrl, dip_size
 from meerk40t.kernel import Settings, lookup_listener, signal_listener
@@ -284,7 +284,7 @@ class TemplatePanel(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=0.5 * get_default_icon_size())
         )
 
         sizer_main = wx.BoxSizer(wx.VERTICAL)
@@ -1563,7 +1563,7 @@ class TemplateTool(MWindow):
         self.add_module_delegate(self.panel_saveload)
 
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_detective_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_detective.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Parameter-Test"))
 

meerk40t/gui/mkdebug.py

@@ -1,9 +1,15 @@
+"""
+    This module contains panels that display internal developer information.
+    They will become visible if you type 'set debug_mode True' in the
+    console and restart the program.
+"""
 import time
 
 import wx
 from wx import aui
 
-from meerk40t.gui.wxutils import StaticBoxSizer
+import meerk40t.gui.icons as mkicons
+from meerk40t.gui.wxutils import ScrolledPanel, StaticBoxSizer
 
 _ = wx.GetTranslation
 
@@ -26,7 +32,47 @@ def register_panel_debugger(window, context):
     context.register("pane/debug_tree", pane)
 
 
+def register_panel_color(window, context):
+    pane = (
+        aui.AuiPaneInfo()
+        .Left()
+        .MinSize(225, 110)
+        .FloatingSize(225, 110)
+        .Caption(_("System-Colors"))
+        .CaptionVisible(not context.pane_lock)
+        .Name("debug_color")
+        .Hide()
+    )
+    pane.dock_proportion = 225
+    pane.control = DebugColorPanel(window, wx.ID_ANY, context=context)
+    pane.submenu = "_ZZ_" + _("Debug")
+    window.on_pane_create(pane)
+    context.register("pane/debug_color", pane)
+
+
+def register_panel_icon(window, context):
+    pane = (
+        aui.AuiPaneInfo()
+        .Left()
+        .MinSize(225, 110)
+        .FloatingSize(225, 110)
+        .Caption(_("Icons"))
+        .CaptionVisible(not context.pane_lock)
+        .Name("debug_icons")
+        .Hide()
+    )
+    pane.dock_proportion = 225
+    pane.control = DebugIconPanel(window, wx.ID_ANY, context=context)
+    pane.submenu = "_ZZ_" + _("Debug")
+    window.on_pane_create(pane)
+    context.register("pane/debug_icons", pane)
+
+
 class DebugTreePanel(wx.Panel):
+    """
+    Displays information about selected elements
+    """
+
     def __init__(self, *args, context=None, **kwds):
         # begin wxGlade: PositionPanel.__init__
         kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
@@ -104,3 +150,210 @@ class DebugTreePanel(wx.Panel):
         self.lb_emphasized.SetValue(txt2)
 
         self.txt_first.SetValue(txt3)
+
+
+class DebugColorPanel(ScrolledPanel):
+    """
+    Displays system defined (OS and wxpython) colors to simplify identifying / choosing them
+    """
+
+    def __init__(self, *args, context=None, **kwds):
+        # begin wxGlade: PositionPanel.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        ScrolledPanel.__init__(self, *args, **kwds)
+        from copy import copy
+
+        self.context = context
+
+        sizer_main = wx.BoxSizer(wx.VERTICAL)
+        count = 1000
+        font = wx.Font(
+            6, wx.FONTFAMILY_SWISS, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL
+        )
+        pattern = "SYS_COLOUR_"
+        for prop in dir(wx):
+            if prop.startswith(pattern):
+                # print (prop)
+                count += 1
+                if count >= 5:
+                    sizer_line = wx.BoxSizer(wx.HORIZONTAL)
+                    sizer_main.Add(sizer_line, 0, wx.EXPAND, 0)
+                    count = 0
+
+                col = wx.SystemSettings().GetColour(getattr(wx, prop))
+                infosizer = wx.BoxSizer(wx.VERTICAL)
+                box = wx.StaticBitmap(
+                    self, wx.ID_ANY, size=wx.Size(32, 32), style=wx.SB_RAISED
+                )
+                box.SetBackgroundColour(col)
+                box.SetToolTip(prop)
+                lbl = wx.StaticText(self, wx.ID_ANY, prop[len(pattern) :])
+                lbl.SetFont(font)
+                lbl.SetMinSize(wx.Size(75, -1))
+                infosizer.Add(box, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+                infosizer.Add(lbl, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+
+                sizer_line.Add(infosizer, 1, wx.EXPAND, 0)
+        count = 1000  # New line
+        coldb = (
+            "AQUAMARINE",
+            "FIREBRICK",
+            "MEDIUM FOREST GREEN",
+            "RED",
+            "BLACK",
+            "FOREST GREEN",
+            "MEDIUM GOLDENROD",
+            "SALMON",
+            "BLUE",
+            "GOLD",
+            "MEDIUM ORCHID",
+            "SEA GREEN",
+            "BLUE VIOLET",
+            "GOLDENROD",
+            "MEDIUM SEA GREEN",
+            "SIENNA",
+            "BROWN",
+            "GREY",
+            "MEDIUM SLATE BLUE",
+            "SKY BLUE",
+            "CADET BLUE",
+            "GREEN",
+            "MEDIUM SPRING GREEN",
+            "SLATE BLUE",
+            "CORAL",
+            "GREEN YELLOW",
+            "MEDIUM TURQUOISE",
+            "SPRING GREEN",
+            "CORNFLOWER BLUE",
+            "INDIAN RED",
+            "MEDIUM VIOLET RED",
+            "STEEL BLUE",
+            "CYAN",
+            "KHAKI",
+            "MIDNIGHT BLUE",
+            "TAN",
+            "DARK GREY",
+            "LIGHT BLUE",
+            "NAVY",
+            "THISTLE",
+            "DARK GREEN",
+            "LIGHT GREY",
+            "ORANGE",
+            "TURQUOISE",
+            "DARK OLIVE GREEN",
+            "LIGHT STEEL BLUE",
+            "ORANGE RED",
+            "VIOLET",
+            "DARK ORCHID",
+            "LIME GREEN",
+            "ORCHID",
+            "VIOLET RED",
+            "DARK SLATE BLUE",
+            "MAGENTA",
+            "PALE GREEN",
+            "WHEAT",
+            "DARK SLATE GREY",
+            "MAROON",
+            "PINK",
+            "WHITE",
+            "DARK TURQUOISE",
+            "MEDIUM AQUAMARINE",
+            "PLUM",
+            "YELLOW",
+            "DIM GREY",
+            "MEDIUM BLUE",
+            "PURPLE",
+            "YELLOW GREEN",
+        )
+        for entry in coldb:
+            count += 1
+            if count >= 5:
+                sizer_line = wx.BoxSizer(wx.HORIZONTAL)
+                sizer_main.Add(sizer_line, 0, wx.EXPAND, 0)
+                count = 0
+
+            col = wx.Colour(entry)
+            infosizer = wx.BoxSizer(wx.VERTICAL)
+            box = wx.StaticBitmap(
+                self, wx.ID_ANY, size=wx.Size(32, 32), style=wx.SB_RAISED
+            )
+            box.SetBackgroundColour(col)
+            box.SetToolTip(entry)
+            lbl = wx.StaticText(self, wx.ID_ANY, entry)
+            lbl.SetFont(font)
+            lbl.SetMinSize(wx.Size(75, -1))
+            infosizer.Add(box, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+            infosizer.Add(lbl, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
+
+            sizer_line.Add(infosizer, 1, wx.EXPAND, 0)
+
+        self.SetSizer(sizer_main)
+        sizer_main.Fit(self)
+        self.Layout()
+        self.SetupScrolling()
+
+    def pane_show(self, *args):
+        return
+
+    def pane_hide(self, *args):
+        return
+
+
+class DebugIconPanel(wx.Panel):
+    """
+    Displays defined icons in a bigger size to facilitate debugging / changing them
+    """
+
+    def __init__(self, *args, context=None, **kwds):
+        # begin wxGlade: PositionPanel.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+
+        self.context = context
+        self.icon = None
+
+        sizer_main = wx.BoxSizer(wx.VERTICAL)
+        choose_sizer = wx.BoxSizer(wx.HORIZONTAL)
+
+        lbl = wx.StaticText(self, wx.ID_ANY, "Pick icon")
+
+        self.icon_list = list()
+        for entry in dir(mkicons):
+            # print (entry)
+            if entry.startswith("icon"):
+                self.icon_list.append(entry)
+        self.combo_icons = wx.ComboBox(
+            self,
+            wx.ID_ANY,
+            choices=self.icon_list,
+            style=wx.CB_SORT | wx.CB_READONLY | wx.CB_DROPDOWN,
+        )
+        choose_sizer.Add(lbl, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        choose_sizer.Add(self.combo_icons, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_main.Add(choose_sizer, 0, wx.EXPAND, 0)
+        self.SetSizer(sizer_main)
+        self.icon_show = wx.StaticBitmap(self, wx.ID_ANY)
+        sizer_main.Add(self.icon_show, 1, wx.EXPAND, 0)
+        sizer_main.Fit(self)
+        self.combo_icons.Bind(wx.EVT_COMBOBOX, self.on_combo)
+        self.Layout()
+
+    def on_combo(self, event):
+        idx = self.combo_icons.GetSelection()
+        if idx < 0:
+            return
+        s = self.combo_icons.GetString(idx)
+        if s:
+            obj = getattr(mkicons, s, None)
+            if obj is not None:
+                if isinstance(obj, (mkicons.VectorIcon, mkicons.PyEmbeddedImage)):
+                    imgs = self.icon_show.Size
+                    ms = min(imgs[0], imgs[1])
+                    bmp = obj.GetBitmap(resize=ms)
+                    self.icon_show.SetBitmap(bmp)
+
+    def pane_show(self, *args):
+        return
+
+    def pane_hide(self, *args):
+        return