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

meerk40t/gui/wxmtree.py

@@ -9,42 +9,48 @@ from ..svgelements import Color
 from .basicops import BasicOpPanel
 from .icons import (
     get_default_scale_factor,
+    icon_bell,
+    icon_bmap_text,
+    icon_canvas,
+    icon_close_window,
+    icon_console,
+    icon_effect_hatch,
+    icon_effect_wobble,
+    icon_external,
+    icon_internal,
+    icon_line,
     icon_meerk40t,
-    icons8_bell_20,
-    icons8_canvas_20,
-    icons8_close_window_20,
-    icons8_diagonal_20,
-    icons8_direction_20,
-    icons8_file_20,
-    icons8_ghost_20,
-    icons8_group_objects_20,
-    icons8_home_20,
-    icons8_home_location_20,
-    icons8_image_20,
-    icons8_input_20,
-    icons8_journey_20,
-    icons8_laser_beam_20,
-    icons8_line_20,
-    icons8_lock_50,
-    icons8_output_20,
-    icons8_oval_20,
-    icons8_polyline_50,
-    icons8_prototype_20,
+    icon_mk_ellipse,
+    icon_mk_polyline,
+    icon_mk_rectangular,
+    icon_path,
+    icon_points,
+    icon_regmarks,
+    icon_return,
+    icon_round_stop,
+    icon_timer,
+    icon_tree,
+    icon_warning,
+    icons8_direction,
+    icons8_file,
+    icons8_ghost,
+    icons8_group_objects,
+    icons8_home_filled,
+    icons8_image,
+    icons8_laser_beam,
+    icons8_laserbeam_weak,
+    icons8_lock,
     icons8_r_white,
-    icons8_rectangular_20,
-    icons8_return_20,
-    icons8_scatter_plot_20,
-    icons8_small_beam_20,
-    icons8_smartphone_ram_50,
-    icons8_stop_gesture_20,
-    icons8_system_task_20,
-    icons8_timer_20,
-    icons8_type_50,
-    icons8_warning_shield_20,
 )
 from .laserrender import DRAW_MODE_ICONS, LaserRender, swizzlecolor
 from .mwindow import MWindow
-from .wxutils import create_menu, get_key_name, is_navigation_key
+from .wxutils import (
+    StaticBoxSizer,
+    create_menu,
+    dip_size,
+    get_key_name,
+    is_navigation_key,
+)
 
 _ = wx.GetTranslation
 
@@ -115,11 +121,19 @@ class TreePanel(wx.Panel):
             | wx.TR_HIDE_ROOT
             | wx.TR_LINES_AT_ROOT,
         )
-        if wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW)[0] < 127:
+        # try:
+        #     res = wx.SystemSettings().GetAppearance().IsDark()
+        # except AttributeError:
+        #     res = wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW)[0] < 127
+        res = wx.SystemSettings().GetColour(wx.SYS_COLOUR_WINDOW)[0] < 127
+        if res:
             self.wxtree.SetBackgroundColour(wx.Colour(50, 50, 50))
 
+        self.setup_warn_panel()
+
         main_sizer = wx.BoxSizer(wx.VERTICAL)
         main_sizer.Add(self.wxtree, 1, wx.EXPAND, 0)
+        main_sizer.Add(self.warn_panel, 0, wx.EXPAND, 0)
         self.SetSizer(main_sizer)
         self.__set_tree()
         self.wxtree.Bind(wx.EVT_KEY_UP, self.on_key_up)
@@ -128,6 +142,95 @@ class TreePanel(wx.Panel):
 
         self.context.signal("rebuild_tree")
 
+    def setup_warn_panel(self):
+        def fix_unassigned_create(event):
+            previous = self.context.elements.classify_autogenerate
+            self.context.elements.classify_autogenerate = True
+            target_list = list(self.context.elements.unassigned_elements())
+            self.context.elements.classify(target_list)
+            self.context.elements.classify_autogenerate = previous
+            self.context.elements.signal("refresh_tree")
+
+        def fix_unassigned_used(event):
+            previous = self.context.elements.classify_autogenerate
+            self.context.elements.classify_autogenerate = False
+            target_list = list(self.context.elements.unassigned_elements())
+            self.context.elements.classify(target_list)
+            self.context.elements.classify_autogenerate = previous
+            self.context.elements.signal("refresh_tree")
+
+        def fix_unburnt(event):
+            for node in self.context.elements.elems():
+                will_be_burnt = False
+                first_op = None
+                for refnode in node._references:
+                    op = refnode.parent
+                    if op is not None:
+                        try:
+                            if op.output:
+                                will_be_burnt = True
+                                break
+                            else:
+                                if first_op is None:
+                                    first_op = op
+                        except AttributeError:
+                            pass
+                if not will_be_burnt and first_op is not None:
+                    try:
+                        first_op.output = True
+                        self.context.elements.signal(
+                            "element_property_update", first_op
+                        )
+                        self.context.elements.signal("warn_state_update")
+                    except AttributeError:
+                        pass
+
+        self.warn_panel = wx.BoxSizer(wx.HORIZONTAL)
+        unassigned_frame = StaticBoxSizer(self, wx.ID_ANY, "Unassigned", wx.HORIZONTAL)
+        unburnt_frame = StaticBoxSizer(self, wx.ID_ANY, "Non-burnt", wx.HORIZONTAL)
+        self.btn_fix_assign_create = wx.Button(self, wx.ID_ANY, "Assign (+new)")
+        self.btn_fix_assign_existing = wx.Button(self, wx.ID_ANY, "Assign")
+        self.btn_fix_unburnt = wx.Button(self, wx.ID_ANY, "Enable")
+        self.btn_fix_assign_create.SetToolTip(
+            _("Classify unassigned elements and create operations if necessary")
+        )
+        self.btn_fix_assign_existing.SetToolTip(
+            _("Classify unassigned elements and use only existing operations")
+        )
+        self.btn_fix_unburnt.SetToolTip(
+            _("Reactivate disabled operations that prevent elements from being burnt")
+        )
+
+        unassigned_frame.Add(self.btn_fix_assign_create, 0, wx.EXPAND, 0)
+        unassigned_frame.Add(self.btn_fix_assign_existing, 0, wx.EXPAND, 0)
+        unburnt_frame.Add(self.btn_fix_unburnt, 0, wx.EXPAND, 0)
+        self.warn_panel.Add(unassigned_frame, 1, wx.EXPAND, 0)
+        self.warn_panel.Add(unburnt_frame, 1, wx.EXPAND, 0)
+        self._last_issue = None
+        self.warn_panel.Show(False)
+        self.warn_panel.ShowItems(False)
+        self.Bind(wx.EVT_BUTTON, fix_unassigned_create, self.btn_fix_assign_create)
+        self.Bind(wx.EVT_BUTTON, fix_unassigned_used, self.btn_fix_assign_existing)
+        self.Bind(wx.EVT_BUTTON, fix_unburnt, self.btn_fix_unburnt)
+        # self.Show(False)
+
+    def check_for_issues(self):
+        non_assigned, non_burn = self.context.elements.have_unburnable_elements()
+        self.btn_fix_assign_create.Enable(non_assigned)
+        self.btn_fix_assign_existing.Enable(non_assigned)
+        self.btn_fix_unburnt.Enable(non_burn)
+        new_issue = non_assigned or non_burn
+        if self._last_issue == new_issue:
+            return
+        self._last_issue = new_issue
+        if new_issue:
+            self.warn_panel.Show(True)
+            self.warn_panel.ShowItems(True)
+        else:
+            self.warn_panel.Show(False)
+            self.warn_panel.ShowItems(False)
+        self.Layout()
+
     def __set_tree(self):
         self.shadow_tree = ShadowTree(
             self.context.elements, self.GetParent(), self.wxtree, self.context
@@ -216,6 +319,7 @@ class TreePanel(wx.Panel):
     def on_warn_state_update(self, origin, *args):
         # Updates the warning state, using signal to avoid unnecessary calls
         self.shadow_tree.update_warn_sign()
+        self.check_for_issues()
 
     @signal_listener("select_emphasized_tree")
     def on_shadow_select_emphasized_tree(self, origin, *args):
@@ -365,7 +469,7 @@ class ElementsTree(MWindow):
         self.panel = TreePanel(self, wx.ID_ANY, context=self.context)
         self.add_module_delegate(self.panel)
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_smartphone_ram_50.GetBitmap())
+        _icon.CopyFromBitmap(icon_tree.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Tree"))
 
@@ -400,49 +504,51 @@ class ShadowTree:
         self.tree_images = None
         self.name = "Project"
         self._freeze = False
-        self.iconsize = 20
+        testsize = dip_size(self, 20, 20)
+        self.iconsize = testsize[1]
         self.iconstates = {}
         self.last_call = 0
 
-        fact = get_default_scale_factor()
-        if fact > 1.0:
-            self.iconsize = int(self.iconsize * fact)
+        # fact = get_default_scale_factor()
+        # if fact > 1.0:
+        #    self.iconsize = int(self.iconsize * fact)
 
         self.do_not_select = False
         self.was_already_expanded = []
         service.add_service_delegate(self)
         self.setup_state_images()
         self.default_images = {
-            "console home -f": icons8_home_20,
-            "console move_abs": icons8_return_20,
-            "console beep": icons8_bell_20,
-            "console interrupt": icons8_stop_gesture_20,
-            "console quit": icons8_close_window_20,
-            "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,
-            "place current": icons8_home_location_20,
-            "place point": icons8_home_location_20,
-            "elem point": icons8_scatter_plot_20,
-            "file": icons8_file_20,
-            "group": icons8_group_objects_20,
-            "elem rect": icons8_rectangular_20,
-            "elem ellipse": icons8_oval_20,
-            "elem image": icons8_image_20,
-            "elem path": icons8_journey_20,
-            "elem line": icons8_line_20,
-            "elem polyline": icons8_polyline_50,
-            "elem text": icons8_type_50,
-            "blob": icons8_file_20,
+            "console home -f": icons8_home_filled,
+            "console move_abs": icon_return,
+            "console beep": icon_bell,
+            "console interrupt": icon_round_stop,
+            "console quit": icon_close_window,
+            "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,
+            "place current": icons8_home_filled,
+            "place point": icons8_home_filled,
+            "elem point": icon_points,
+            "file": icons8_file,
+            "group": icons8_group_objects,
+            "elem rect": icon_mk_rectangular,
+            "elem ellipse": icon_mk_ellipse,
+            "elem image": icons8_image,
+            "elem path": icon_path,
+            "elem line": icon_line,
+            "elem polyline": icon_mk_polyline,
+            "elem text": icon_bmap_text,
+            "blob": icons8_file,
         }
         self.image_cache = []
         self.cache_hits = 0
@@ -461,23 +567,31 @@ class ShadowTree:
         self.state_images = wx.ImageList()
         self.iconstates = {}
         self.state_images.Create(width=self.iconsize, height=self.iconsize)
-        image = icons8_lock_50.GetBitmap(
-            resize=(self.iconsize, self.iconsize), noadjustment=True
+        image = icons8_lock.GetBitmap(
+            resize=(self.iconsize, self.iconsize),
+            noadjustment=True,
+            buffer=1,
         )
         image_id = self.state_images.Add(bitmap=image)
         self.iconstates["lock"] = image_id
         image = icons8_r_white.GetBitmap(
-            resize=(self.iconsize, self.iconsize), noadjustment=True
+            resize=(self.iconsize, self.iconsize),
+            noadjustment=True,
+            buffer=1,
         )
         image_id = self.state_images.Add(bitmap=image)
         self.iconstates["refobject"] = image_id
-        image = icons8_warning_shield_20.GetBitmap(
-            resize=(self.iconsize, self.iconsize), noadjustment=True
+        image = icon_warning.GetBitmap(
+            resize=(self.iconsize, self.iconsize),
+            noadjustment=True,
+            buffer=1,
         )
         image_id = self.state_images.Add(bitmap=image)
         self.iconstates["warning"] = image_id
-        image = icons8_ghost_20.GetBitmap(
-            resize=(self.iconsize, self.iconsize), noadjustment=True
+        image = icons8_ghost.GetBitmap(
+            resize=(self.iconsize, self.iconsize),
+            noadjustment=True,
+            buffer=1,
         )
         image_id = self.state_images.Add(bitmap=image)
         self.iconstates["ghost"] = image_id
@@ -870,9 +984,13 @@ class ShadowTree:
                     return
 
         self.wxtree._freeze = False
-        self.wxtree.Expand(self.elements.get(type="branch elems")._item)
-        self.wxtree.Expand(self.elements.get(type="branch reg")._item)
-        self.update_warn_sign()
+        branch_elems_item = self.elements.get(type="branch elems")._item
+        if branch_elems_item:
+            self.wxtree.Expand(branch_elems_item)
+        branch_reg_item = self.elements.get(type="branch reg")._item
+        if branch_reg_item:
+            self.wxtree.Expand(branch_reg_item)
+        self.context.elements.signal("warn_state_update")
         self.context.elements.set_end_time("full_load", display=True, delete=True)
 
     def update_warn_sign(self):
@@ -1003,7 +1121,10 @@ class ShadowTree:
         self.set_icon(
             elemtree,
             icon_meerk40t.GetBitmap(
-                False, resize=(self.iconsize, self.iconsize), noadjustment=True
+                False,
+                resize=(self.iconsize, self.iconsize),
+                noadjustment=True,
+                buffer=1,
             ),
         )
         self.register_children(elemtree)
@@ -1011,8 +1132,10 @@ class ShadowTree:
         node_operations = elemtree.get(type="branch ops")
         self.set_icon(
             node_operations,
-            icons8_laser_beam_20.GetBitmap(
-                resize=(self.iconsize, self.iconsize), noadjustment=True
+            icons8_laser_beam.GetBitmap(
+                resize=(self.iconsize, self.iconsize),
+                noadjustment=True,
+                buffer=1,
             ),
         )
 
@@ -1022,16 +1145,20 @@ class ShadowTree:
         node_elements = elemtree.get(type="branch elems")
         self.set_icon(
             node_elements,
-            icons8_canvas_20.GetBitmap(
-                resize=(self.iconsize, self.iconsize), noadjustment=True
+            icon_canvas.GetBitmap(
+                resize=(self.iconsize, self.iconsize),
+                noadjustment=True,
+                buffer=1,
             ),
         )
 
         node_registration = elemtree.get(type="branch reg")
         self.set_icon(
             node_registration,
-            icons8_prototype_20.GetBitmap(
-                resize=(self.iconsize, self.iconsize), noadjustment=True
+            icon_regmarks.GetBitmap(
+                resize=(self.iconsize, self.iconsize),
+                noadjustment=True,
+                buffer=1,
             ),
         )
         self.update_op_labels()
@@ -1267,7 +1394,7 @@ class ShadowTree:
                     and node.fill.argb is not None
                 ):
                     c = node.fill
-            elif node.type.startswith("elem "):
+            elif node.type.startswith("elem ") or node.type.startswith("effect "):
                 if (
                     hasattr(node, "stroke")
                     and node.stroke is not None
@@ -1308,6 +1435,7 @@ class ShadowTree:
                         color=c,
                         resize=(self.iconsize, self.iconsize),
                         noadjustment=True,
+                        buffer=1,
                     )
                     cached_id = self.tree_images.Add(bitmap=image)
                     # print(f"Store id {cached_id} for {c} - {found}")
@@ -1712,6 +1840,9 @@ class ShadowTree:
             # have led to the creation of a new reference
             # node. For whatever reason this is not recognised
             # otherwise...
+            if not self.dragging_nodes:
+                # Dragging nodes were cleared (we must have rebuilt the entire tree)
+                return
             for node in self.dragging_nodes:
                 if node.type.startswith("op"):
                     self.context.signal("tree_changed")

meerk40t/gui/wxutils.py

@@ -13,9 +13,15 @@ from meerk40t.core.units import ACCEPTED_UNITS, Angle, Length
 _ = wx.GetTranslation
 
 
+##############
+# DYNAMIC CHOICE
+# NODE MENU
+##############
+
+
 def create_menu_for_choices(gui, choices: List[dict]) -> wx.Menu:
     """
-    Creates a menu for a given choices table
+    Creates a menu for a given choices table.
 
     Processes submenus, references, radio_state as needed.
     """
@@ -92,6 +98,13 @@ def create_menu_for_choices(gui, choices: List[dict]) -> wx.Menu:
 
 
 def create_choices_for_node(node, elements) -> List[dict]:
+    """
+    Converts a node tree operation menu to a choices dictionary to display the menu items in a choice panel.
+
+    @param node:
+    @param elements:
+    @return:
+    """
     choices = []
     from meerk40t.core.treeop import get_tree_operation_for_node
 
@@ -121,6 +134,9 @@ def create_menu_for_node_TEST(gui, node, elements) -> wx.Menu:
     """
     Test code towards unifying choices and tree nodes into choices that parse to menus.
 
+    This is unused experimental code. Testing the potential inter-relationships between choices for the choice panels
+    and dynamic node menus.
+
     @param gui:
     @param node:
     @param elements:
@@ -130,6 +146,11 @@ def create_menu_for_node_TEST(gui, node, elements) -> wx.Menu:
     return create_menu_for_choices(gui, choices)
 
 
+##############
+# DYNAMIC NODE MENU
+##############
+
+
 def create_menu_for_node(gui, node, elements, optional_2nd_node=None) -> wx.Menu:
     """
     Create menu for a particular node. Does not invoke the menu.
@@ -329,9 +350,18 @@ def create_menu(gui, node, elements):
         menu.Destroy()
 
 
+##############
+# GUI CONTROL OVERRIDES
+##############
+
+
 class TextCtrl(wx.TextCtrl):
-    # Just to add someof the more common things we need, i.e. smaller default size...
-    #
+    """
+    Just to add some of the more common things we need, i.e. smaller default size...
+
+    Allow text boxes of specific types so that we can have consistent options for dealing with them.
+    """
+
     def __init__(
         self,
         parent,
@@ -427,6 +457,21 @@ class TextCtrl(wx.TextCtrl):
         maxw = 100
         minpattern = "0000"
         maxpattern = "999999999.99mm"
+        if self._check == "length":
+            minpattern = "0000"
+            maxpattern = "999999999.99mm"
+        elif self._check == "percent":
+            minpattern = "0000"
+            maxpattern = "99.99%"
+        elif self._check == "float":
+            minpattern = "0000"
+            maxpattern = "99999.99"
+        elif self._check == "angle":
+            minpattern = "0000"
+            maxpattern = "9999.99deg"
+        elif self._check == "int":
+            minpattern = "0000"
+            maxpattern = "-999999"
         # Let's be a bit more specific: what is the minimum size of the textcontrol fonts
         # to hold these patterns
         tfont = self.GetFont()
@@ -634,7 +679,7 @@ class TextCtrl(wx.TextCtrl):
 
     def on_char(self, event):
         proceed = True
-        # The French awerty keyboard generates numbers by pressing Shift + some key
+        # The French azerty keyboard generates numbers by pressing Shift + some key
         # Under Linux this is not properly translated by GetUnicodeKey and
         # is hence leading to a 'wrong' character being recognised (the original key).
         # So we can't rely on a proper representation if the Shift-Key
@@ -723,6 +768,11 @@ class TextCtrl(wx.TextCtrl):
 
 
 class CheckBox(wx.CheckBox):
+    """
+    This checkbox replaces wx.Checkbox and creates a series of mouse over tool tips to permit Linux tooltips that
+    otherwise do not show.
+    """
+
     def __init__(
         self,
         *args,
@@ -796,6 +846,10 @@ class EditableListCtrl(wx.ListCtrl, listmix.TextEditMixin):
 
 
 class HoverButton(wx.Button):
+    """
+    Provide a button with Hover-Color changing ability.
+    """
+
     def __init__(self, parent, ID, label):
         super().__init__(parent, ID, label)
         self._focus_color = None
@@ -857,6 +911,10 @@ class HoverButton(wx.Button):
     #     event.Skip()
 
 
+##############
+# GUI KEYSTROKE FUNCTIONS
+##############
+
 WX_METAKEYS = [
     wx.WXK_START,
     wx.WXK_WINDOWS_LEFT,