meerk40t 0.9.7010__py2.py3-none-any.whl → 0.9.7030__py2.py3-none-any.whl

meerk40t/gui/consolepanel.py

@@ -6,7 +6,7 @@ from wx import aui
 
 from meerk40t.gui.icons import STD_ICON_SIZE, icons8_console
 from meerk40t.gui.mwindow import MWindow
-from meerk40t.kernel import get_safe_path, signal_listener
+from meerk40t.kernel import signal_listener
 from meerk40t.gui.wxutils import TextCtrl
 
 try:
@@ -78,7 +78,7 @@ def register_panel_console(window, context):
         aui.AuiPaneInfo()
         .Bottom()
         .Layer(2)
-        .MinSize(600, 100)
+        .MinSize(100, 100)
         .FloatingSize(600, 230)
         .Caption(_("Console"))
         .Name("console")
@@ -600,7 +600,7 @@ class ConsolePanel(wx.ScrolledWindow):
         event.Skip(False)
 
     def history_filename(self):
-        safe_dir = os.path.realpath(get_safe_path(self.context.kernel.name))
+        safe_dir = self.context.kernel.os_information["WORKDIR"]
         fname = os.path.join(safe_dir, "cmdhistory.log")
         is_there = os.path.exists(fname)
         return fname, is_there

meerk40t/gui/gui_mixins.py

@@ -584,7 +584,10 @@ class Warnings:
                             image_node = node.node if hasattr(node, "node") else node
                             if getattr(image_node, "hidden", False):
                                 continue
-                            opdpi = op.dpi if useop else image_node.dpi
+                            if hasattr(image_node, "dpi"):
+                                opdpi = op.dpi if useop else image_node.dpi
+                            else:
+                                opdpi = op.dpi
                             step_x, step_y = self.context.device.view.dpi_to_steps(opdpi)
                             step_x *= self.context.device.view.native_scale_x
                             step_y *= self.context.device.view.native_scale_y

meerk40t/gui/hersheymanager.py

@@ -283,9 +283,19 @@ class FontGlyphPicker(wx.Dialog):
             return
         as_stroke = getattr(cfont, "STROKE_BASED", False)
         for c in cfont.glyphs:
-            if ord(c) == 65535:
+            if isinstance(c, str):
+                if len(c) > 1:
+                    # print (f"Strange: {c}, use {idx} instead")
+                    continue
+                if ord(c) == 65535:
+                    continue
+                cstr = str(c)
+            elif isinstance(c, int):
+                if c == 65535:
+                    continue
+                cstr = chr(c)
+            else:
                 continue
-            cstr = str(c)
             hexa = cstr.encode("utf-8")
             item = self.list_glyphs.InsertItem(self.list_glyphs.ItemCount, hexa)
             self.list_glyphs.SetItem(item, 1, str(ord(cstr)))
@@ -294,7 +304,7 @@ class FontGlyphPicker(wx.Dialog):
             try:
                 cfont.render(
                     path,
-                    c,
+                    cstr,
                     True,
                     12.0,
                     1.0,

meerk40t/gui/laserpanel.py

@@ -18,7 +18,7 @@ from meerk40t.gui.icons import (
     icons8_pentagon,
     icons8_save,
 )
-from meerk40t.gui.navigationpanels import Drag, Jog, MovePanel
+from meerk40t.gui.navigationpanels import Drag, Jog, MovePanel, JogDistancePanel
 from meerk40t.gui.wxutils import (
     HoverButton,
     ScrolledPanel,
@@ -47,10 +47,14 @@ def register_panel_laser(window, context):
     jog_drag.SetupScrolling()
     jog_panel = Jog(jog_drag, wx.ID_ANY, context=context)
     drag_panel = Drag(jog_drag, wx.ID_ANY, context=context)
-    main_sizer = wx.BoxSizer(wx.HORIZONTAL)
+    distance_panel = JogDistancePanel(jog_drag, wx.ID_ANY, context=context)
+    main_sizer = wx.BoxSizer(wx.VERTICAL)
+    sub_sizer = wx.BoxSizer(wx.HORIZONTAL)
     # main_sizer.AddStretchSpacer()
-    main_sizer.Add(jog_panel, 1, wx.ALIGN_CENTER_VERTICAL, 0)
-    main_sizer.Add(drag_panel, 1, wx.ALIGN_CENTER_VERTICAL, 0)
+    sub_sizer.Add(jog_panel, 1, wx.ALIGN_CENTER_VERTICAL, 0)
+    sub_sizer.Add(drag_panel, 1, wx.ALIGN_CENTER_VERTICAL, 0)
+    main_sizer.Add(sub_sizer, 1, wx.EXPAND, 0)
+    main_sizer.Add(distance_panel, 0, wx.EXPAND, 0)
     # main_sizer.AddStretchSpacer()
     jog_drag.SetSizer(main_sizer)
     jog_drag.Layout()
@@ -97,7 +101,7 @@ def register_panel_laser(window, context):
         page = notebook.GetCurrentPage()
         if page is None:
             return
-        pages = [jog_panel, drag_panel] if page is jog_drag else [page]
+        pages = [jog_panel, drag_panel, distance_panel] if page is jog_drag else [page]
         for p in pages:
             if hasattr(p, "pane_show"):
                 p.pane_show()
@@ -127,8 +131,9 @@ def register_panel_laser(window, context):
         else:
             panel_size = (wb_size[0] / 2, wb_size[1])
 
-        jog_panel.set_icons(dimension=panel_size)
-        drag_panel.set_icons(dimension=panel_size)
+        for panel in (jog_panel, drag_panel, distance_panel):
+            if hasattr(panel, "set_icons"):
+                panel.set_icons(dimension=panel_size)
 
     jog_drag.Bind(wx.EVT_SIZE, on_resize)
 

meerk40t/gui/materialmanager.py

@@ -36,7 +36,6 @@ from meerk40t.gui.wxutils import (
     wxStaticText,
     wxTreeCtrl,
 )
-from meerk40t.kernel.kernel import get_safe_path
 from meerk40t.kernel.settings import Settings
 from meerk40t.svgelements import Color
 
@@ -389,6 +388,9 @@ class MaterialPanel(ScrolledPanel):
         self.list_preview.AppendColumn(
             _("Frequency") + " [kHz]", format=wx.LIST_FORMAT_LEFT, width=50
         )
+        self.list_preview.AppendColumn(
+            _("Passes"), format=wx.LIST_FORMAT_LEFT, width=50
+        )
         self.list_preview.resize_columns()
         self.list_preview.SetToolTip(_("Click to select / Right click for actions"))
         self.opinfo = {
@@ -919,7 +921,7 @@ class MaterialPanel(ScrolledPanel):
         if len(oplist) == 0:
             return
         opinfo["author"] = last_author
-        directory = get_safe_path(self.context.kernel.name)
+        directory = self.context.kernel.os_information["WORKDIR"]
         local_file = os.path.join(directory, "op_export.cfg")
         if os.path.exists(local_file):
             try:
@@ -1317,6 +1319,9 @@ class MaterialPanel(ScrolledPanel):
                                 self.op_data.write_persistent(
                                     section_name, "passes", numeric_value
                                 )
+                                self.op_data.write_persistent(
+                                    section_name, "passes_custom", True
+                                )
                         elif param == "speed":
                             if numeric_value != 0:
                                 speedval = numeric_value
@@ -1592,6 +1597,9 @@ class MaterialPanel(ScrolledPanel):
                                 self.op_data.write_persistent(
                                     section_name, "passes", numeric_value
                                 )
+                                self.op_data.write_persistent(
+                                    section_name, "passes_custom", True
+                                )
                         elif param == "markspeed":
                             if numeric_value != 0:
                                 speedval = numeric_value
@@ -2066,6 +2074,7 @@ class MaterialPanel(ScrolledPanel):
                 oplabel = self.op_data.read_persistent(str, subsection, "label", "")
                 speed = self.op_data.read_persistent(str, subsection, "speed", "")
                 power = self.op_data.read_persistent(str, subsection, "power", "")
+                passes = self.op_data.read_persistent(str, subsection, "passes", "")
                 frequency = self.op_data.read_persistent(
                     str, subsection, "frequency", ""
                 )
@@ -2074,6 +2083,8 @@ class MaterialPanel(ScrolledPanel):
                 command = self.op_data.read_persistent(str, subsection, "command", "")
                 if power == "" and optype.startswith("op "):
                     power = "1000"
+                if passes == "" and optype.startswith("op "):
+                    passes = "1"
                 list_id = self.list_preview.InsertItem(
                     self.list_preview.GetItemCount(), f"#{idx}"
                 )
@@ -2093,6 +2104,7 @@ class MaterialPanel(ScrolledPanel):
                 self.list_preview.SetItem(list_id, 4, power)
                 self.list_preview.SetItem(list_id, 5, speed)
                 self.list_preview.SetItem(list_id, 6, frequency)
+                self.list_preview.SetItem(list_id, 7, passes)
                 key = get_key(optype, opc)
                 if key in icon_dict:
                     imgid = icon_dict[key]
@@ -2576,6 +2588,7 @@ class MaterialPanel(ScrolledPanel):
             "power": "1000",
             "label": "Raster ({percent}, {speed}mm/s)",
             "color": "#000000",
+            "passes": "1",
         }
         if self.is_balor:
             op_dict["frequency"] = "35"
@@ -2675,15 +2688,16 @@ class MaterialPanel(ScrolledPanel):
         # 4 "Power"
         # 5 "Speed"
         # 6 "Frequency"
+        # 7 "Passes"
         if self.is_balor:
             p1 = 0.15
             p2 = 0.35
-            p3 = (1.0 - p1 - p2) / 4
+            p3 = (1.0 - p1 - p2) / 5
             p4 = p3
         else:
             p1 = 0.15
             p2 = 0.40
-            p3 = (1.0 - p1 - p2) / 3
+            p3 = (1.0 - p1 - p2) / 4
             p4 = 0
         self.list_preview.SetColumnWidth(0, int(p3 * remaining))
         self.list_preview.SetColumnWidth(1, int(p1 * remaining))
@@ -2692,6 +2706,7 @@ class MaterialPanel(ScrolledPanel):
         self.list_preview.SetColumnWidth(4, int(p3 * remaining))
         self.list_preview.SetColumnWidth(5, int(p3 * remaining))
         self.list_preview.SetColumnWidth(6, int(p4 * remaining))
+        self.list_preview.SetColumnWidth(7, int(p3 * remaining))
 
     def before_operation_update(self, event):
         list_id = event.GetIndex()  # Get the current row
@@ -2708,7 +2723,7 @@ class MaterialPanel(ScrolledPanel):
                 ok = False
         except (AttributeError, KeyError):
             ok = False
-        if col_id not in range(2, 7):
+        if col_id not in range(2, 7 + 1):
             ok = False
         if col_id == 6 and not self.is_balor:
             ok = False
@@ -2724,7 +2739,7 @@ class MaterialPanel(ScrolledPanel):
         index = self.list_preview.GetItemData(list_id)
         key = self.get_nth_operation(index)
 
-        if list_id >= 0 and col_id in range(2, 7):
+        if list_id >= 0 and col_id in range(2, 7 + 1):
             if col_id == 2:
                 # id
                 self.op_data.write_persistent(key, "id", new_data)
@@ -2761,6 +2776,18 @@ class MaterialPanel(ScrolledPanel):
                 except ValueError:
                     event.Veto()
                     return
+            elif col_id == 7:
+                # Passes
+                try:
+                    new_data = int(new_data)
+                    if new_data < 1:
+                        new_data = 1
+                    self.op_data.write_persistent(key, "passes_custom", bool(new_data != 1))
+                    self.op_data.write_persistent(key, "passes", new_data)
+                    new_data = f"{new_data}"
+                except ValueError:
+                    event.Veto()
+                    return
             # Set the new data in the listctrl
             self.op_data.write_configuration()
             self.list_preview.SetItem(list_id, col_id, new_data)

meerk40t/gui/plugin.py

@@ -327,13 +327,19 @@ and a wxpython version <= 4.1.1."""
 
         kernel.yesno = yesno_popup
 
-        from meerk40t.gui.busy import BusyInfo
+        from meerk40t.gui.busy import SimpleBusyInfo, BusyInfo
 
-        kargs = {}
+        kargs = {"kernel": kernel,}
         if kernel.themes.dark:
             kargs["bgcolor"] = kernel.themes.get("win_bg")
             kargs["fgcolor"] = kernel.themes.get("win_fg")
-        kernel.busyinfo = BusyInfo(**kargs)
+        if kernel.os_information["OS_NAME"] != "Linux":
+            # The Linux implementation of wxWidgets 
+            # cannot properly update controls (n idea why,
+            # any hint to circumvent this would be welcome)
+            kernel.busyinfo = BusyInfo(**kargs)
+        else:
+            kernel.busyinfo = SimpleBusyInfo(**kargs)
 
         @kernel.console_argument("message")
         @kernel.console_command("notify", hidden=True)

meerk40t/gui/propertypanels/operationpropertymain.py

@@ -487,7 +487,7 @@ class SpeedPpiPanel(wx.Panel):
             self.update_power_speed_properties()
         except RuntimeError:
             # Pane was already destroyed
-            pass
+            return
         self.set_widgets(self.operation)
 
     def update_power_speed_properties(self):

meerk40t/gui/ribbon.py

@@ -563,7 +563,10 @@ class Button:
         """
 
         def toggle_click(origin, *args):
-            set_value = getattr(self.object, self.toggle_attr) if self.toggle_attr else not self.toggle
+            # Whats the value to set?
+            set_value = args[0] if args else not self.toggle
+            # But if we have a toggle_attr then this has precedence
+            set_value = getattr(self.object, self.toggle_attr) if self.toggle_attr else set_value
             self.set_button_toggle(set_value)
 
         self.context.listen(signal, toggle_click)

meerk40t/gui/scene/widget.py

@@ -103,7 +103,7 @@ class Widget(list):
 
         try:
             self.process_draw(gc)
-        except Exception as e:
+        except OSError as e:
             print (f"Could not process draw [{e}]")
         for i in range(len(self) - 1, -1, -1):
             widget = self[i]

meerk40t/gui/scenewidgets/rectselectwidget.py

@@ -257,22 +257,25 @@ class RectSelectWidget(Widget):
                     """
                     Calculates the shortest distance between two arrays of 2-dimensional points.
                     """
-                    # Calculate the Euclidean distance between each point in p1 and p2
-                    if tuplemode:
-                        # For an array of tuples:
-                        dist = np.sqrt(np.sum((p1[:, np.newaxis] - p2) ** 2, axis=2))
-                    else:
-                        # For an array of complex numbers
-                        dist = np.abs(p1[:, np.newaxis] - p2[np.newaxis, :])
-
-                    # Find the minimum distance and its corresponding indices
-                    min_dist = np.min(dist)
-                    if np.isnan(min_dist):
-                        return None, 0, 0
-                    min_indices = np.argwhere(dist == min_dist)
-
-                    # Return the coordinates of the two points
-                    return min_dist, p1[min_indices[0][0]], p2[min_indices[0][1]]
+                    try:
+                        # Calculate the Euclidean distance between each point in p1 and p2
+                        if tuplemode:
+                            # For an array of tuples:
+                            dist = np.sqrt(np.sum((p1[:, np.newaxis] - p2) ** 2, axis=2))
+                        else:
+                            # For an array of complex numbers
+                            dist = np.abs(p1[:, np.newaxis] - p2[np.newaxis, :])
+
+                        # Find the minimum distance and its corresponding indices
+                        min_dist = np.min(dist)
+                        if np.isnan(min_dist):
+                            return None, 0, 0
+                        min_indices = np.argwhere(dist == min_dist)
+
+                        # Return the coordinates of the two points
+                        return min_dist, p1[min_indices[0][0]], p2[min_indices[0][1]]
+                    except Exception: # out of memory eg
+                        return None, None, None
 
                 b = self.scene.context.elements._emphasized_bounds
                 if b is None:

meerk40t/gui/scenewidgets/selectionwidget.py

@@ -31,6 +31,7 @@ from meerk40t.gui.scene.scene import (
 from meerk40t.gui.scene.sceneconst import HITCHAIN_HIT_AND_DELEGATE
 from meerk40t.gui.scene.widget import Widget
 from meerk40t.gui.wxutils import (
+    dip_size,
     StaticBoxSizer,
     create_menu_for_node,
     get_gc_full_scale,
@@ -268,7 +269,7 @@ class BorderWidget(Widget):
             if self.show_rb:
                 gc.StrokeLine(sx * center_x, sy * self.bottom, sx * center_x, sy * bed_h)
                 gc.StrokeLine(sx * self.right, sy * center_y, sx * bed_w, sy * center_y)
-    
+
             mypen.SetStyle(wx.PENSTYLE_DOT)
             gc.SetPen(mypen)
             gc.StrokeLine(sx * self.left, sy * self.top, sx * self.right, sy * self.top)
@@ -335,7 +336,7 @@ class BorderWidget(Widget):
                 s_txt = str(Length(amount=rpos, digits=2, preferred_units=units))
                 (t_width, t_height) = gc.GetTextExtent(s_txt)
                 pos = self.right + rpos / 2.0 - t_width / 2
-                if pos - t_width - distance <= self.right:
+                if pos - distance <= self.right:
                     pos = self.right + distance
                 gc.DrawText(s_txt, pos, center_y)
 
@@ -1610,23 +1611,26 @@ class MoveWidget(Widget):
                 """
                 Calculates the shortest distance between two arrays of 2-dimensional points.
                 """
-                # Calculate the Euclidean distance between each point in p1 and p2
-                if tuplemode:
-                    # For an array of tuples:
-                    dist = np.sqrt(np.sum((p1[:, np.newaxis] - p2) ** 2, axis=2))
-                else:
-                    # For an array of complex numbers
-                    dist = np.abs(p1[:, np.newaxis] - p2[np.newaxis, :])
-                # Find the minimum distance and its corresponding indices
-                min_dist = np.min(dist)
-                if np.isnan(min_dist):
-                    # print (f"Encountered the infamous bug: {p1} {p2}")
-                    # Still need an example when that happens
-                    return None, 0, 0
-                min_indices = np.argwhere(dist == min_dist)
-
-                # Return the coordinates of the two points
-                return min_dist, p1[min_indices[0][0]], p2[min_indices[0][1]]
+                try:
+                    # Calculate the Euclidean distance between each point in p1 and p2
+                    if tuplemode:
+                        # For an array of tuples:
+                        dist = np.sqrt(np.sum((p1[:, np.newaxis] - p2) ** 2, axis=2))
+                    else:
+                        # For an array of complex numbers
+                        dist = np.abs(p1[:, np.newaxis] - p2[np.newaxis, :])
+                    # Find the minimum distance and its corresponding indices
+                    min_dist = np.min(dist)
+                    if np.isnan(min_dist):
+                        # print (f"Encountered the infamous bug: {p1} {p2}")
+                        # Still need an example when that happens
+                        return None, 0, 0
+                    min_indices = np.argwhere(dist == min_dist)
+
+                    # Return the coordinates of the two points
+                    return min_dist, p1[min_indices[0][0]], p2[min_indices[0][1]]
+                except Exception: # out of memory eg
+                    return None, None, None
 
             b = elements._emphasized_bounds
             if b is None:
@@ -2390,6 +2394,8 @@ class SelectionWidget(Widget):
         self.handle_pen.SetStyle(wx.PENSTYLE_SOLID)
         # want to have sharp edges
         self.handle_pen.SetJoin(wx.JOIN_MITER)
+        fact = dip_size(self.scene.pane, 100, 100)
+        self.font_size_factor = (fact[0] + fact[1]) / 100 * 0.5
 
         self.gc = None
         self.reset_variables()
@@ -2797,7 +2803,7 @@ class SelectionWidget(Widget):
             try:
                 factor = math.sqrt(abs(matrix.determinant))
                 self.line_width = 2.0 / factor
-                self.font_size = 14.0 / factor
+                self.font_size = 12.0 / factor * self.font_size_factor
             except ZeroDivisionError:
                 matrix.reset()
                 return

meerk40t/gui/simpleui.py

@@ -13,7 +13,7 @@ from wx import aui
 from ..core.exceptions import BadFileError
 from .icons import get_default_icon_size, icons8_computer_support, icons8_opened_folder
 from .mwindow import MWindow
-from .navigationpanels import Drag, Jog
+from .navigationpanels import Drag, Jog, JogDistancePanel
 from .wxutils import StaticBoxSizer, TextCtrl, wxButton, wxStaticText
 
 _ = wx.GetTranslation
@@ -26,19 +26,24 @@ class JogMovePanel(wx.Panel):
         wx.Panel.__init__(self, *args, **kwds)
         self.context = context
         self.context.themes.set_window_colors(self)
-
+        distance_panel = JogDistancePanel(self, wx.ID_ANY, context=context)
         jog_panel = Jog(self, wx.ID_ANY, context=context)
         drag_panel = Drag(self, wx.ID_ANY, context=context)
-        self.panels = [jog_panel, drag_panel]
-        self.main_sizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.main_sizer.Add(jog_panel, 1, wx.EXPAND, 0)
-        self.main_sizer.Add(drag_panel, 1, wx.EXPAND, 0)
+        self.panels = [distance_panel, jog_panel, drag_panel]
+        self.main_sizer = wx.BoxSizer(wx.VERTICAL)
+        self.jog_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.jog_sizer.Add(jog_panel, 1, wx.EXPAND, 0)
+        self.jog_sizer.Add(drag_panel, 1, wx.EXPAND, 0)
+        self.main_sizer.Add(distance_panel, 0, wx.EXPAND, 0)
+        self.main_sizer.Add(self.jog_sizer, 1, wx.EXPAND, 0)
         self.SetSizer(self.main_sizer)
         self.Layout()
         self.Bind(wx.EVT_SIZE, self.on_resize)
+        # Force initial resizing
+        wx.CallAfter(self.on_resize)
 
-    def on_resize(self, event):
-        wb_size = event.GetSize()
+    def on_resize(self, event=None):
+        wb_size = self.jog_sizer.GetSize()
         panel_size = (wb_size[0] / 2, wb_size[1])
         for p in self.panels:
             if hasattr(p, "set_icons"):

meerk40t/gui/simulation.py

@@ -823,7 +823,7 @@ class SimulationPanel(wx.Panel, Job):
             job_name="cache_updater",
             interval=0.25,
             times=1,
-            run_main=False,
+            run_main=True,
         )
 
         self.job_name = "simulate"
@@ -1573,6 +1573,8 @@ class SimulationPanel(wx.Panel, Job):
             self._stop()
             return
         # Refresh cutcode
+        self.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+
         if self.plan_name:
             self.cutplan = self.context.planner.get_or_make_plan(self.plan_name)
         else:
@@ -1621,6 +1623,8 @@ class SimulationPanel(wx.Panel, Job):
 
         self._startup()
         self.request_refresh()
+        self.SetCursor(wx.Cursor(wx.CURSOR_ARROW))
+
 
     @signal_listener("device;modified")
     @signal_listener("plan")
@@ -1685,7 +1689,11 @@ class SimulationPanel(wx.Panel, Job):
             self.options_optimize.Enable(False)
 
     def cache_updater(self):
-        self.button_spool.Enable(False)
+        try:
+            self.button_spool.Enable(False)
+        except RuntimeError:
+            # Control no longer existant
+            return 
         msg = self.button_spool.GetLabel()
         self.button_spool.SetLabel(_("Calculating"))
         for cut in self.cutcode:
@@ -1837,6 +1845,15 @@ class SimulationPanel(wx.Panel, Job):
         event.Skip()
 
     def on_redo_it(self, event):
+        # Dont occupy gui event handling too long
+        wx.CallAfter(self.redo_action)
+
+    def redo_action(self):
+        self.SetCursor(wx.Cursor(wx.CURSOR_WAIT))
+        self.btn_redo_it.SetLabel(_("Preparing simulation..."))
+        self.btn_redo_it.Enable(False)
+        self.btn_redo_it.Refresh()
+        self.btn_redo_it.Update()
         busy = self.context.kernel.busyinfo
         busy.start(msg=_("Preparing simulation..."))
 
@@ -1853,6 +1870,9 @@ class SimulationPanel(wx.Panel, Job):
         )
         busy.end()
         self._refresh_simulated_plan()
+        self.btn_redo_it.Enable(True)
+        self.btn_redo_it.SetLabel(_("Recalculate"))
+        self.SetCursor(wx.Cursor(wx.CURSOR_ARROW))
 
     def pane_show(self):
         self.Layout()

meerk40t/gui/spoolerpanel.py

@@ -23,7 +23,7 @@ from meerk40t.gui.wxutils import (
     wxListCtrl,
     wxStaticText,
 )
-from meerk40t.kernel import Job, get_safe_path, signal_listener
+from meerk40t.kernel import Job, signal_listener
 
 _ = wx.GetTranslation
 
@@ -330,7 +330,7 @@ class SpoolerPanel(wx.Panel):
         self.current_item = event.Index
 
     def write_csv(self):
-        filename = Path(get_safe_path(self.context.kernel.name, create=True)).joinpath(
+        filename = Path(self.context.kernel.os_information["WORKDIR"]).joinpath(
             "history.csv"
         )
         if self.filter_device:
@@ -673,15 +673,6 @@ class SpoolerPanel(wx.Panel):
 
         return routine
 
-    def pane_show(self, *args):
-        self.shown = True
-        self.context.schedule(self.timerjob)
-        self.refresh_spooler_list()
-
-    def pane_hide(self, *args):
-        self.context.unschedule(self.timerjob)
-        self.shown = False
-
     @staticmethod
     def _name_str(named_obj):
         try:
@@ -1171,10 +1162,16 @@ class SpoolerPanel(wx.Panel):
             self.on_device_update(None)
 
     def pane_show(self):
+        self.shown = True
         self.list_job_history.load_column_widths()
         self.list_job_spool.load_column_widths()
+        self.context.schedule(self.timerjob)
+        self.refresh_spooler_list()
 
     def pane_hide(self):
+        self.context.unschedule(self.timerjob)
+        self.shown = False
+
         self.list_job_history.save_column_widths()
         self.list_job_spool.save_column_widths()
 

meerk40t/gui/themes.py

@@ -31,6 +31,9 @@ def color_distance(c1:wx.Colour, c2:wx.Colour) -> bool:
     # print (f"Distance from {c1.GetAsString()} to {c2.GetAsString()} = {sqrt(sq_dist)}")
     return sqrt(sq_dist)
 
+def inverted_color(c1:wx.Colour) -> wx.Colour:
+    return wx.Colour(255-c1.red, 255-c1.green, 255-c1.blue, c1.alpha)
+
 def is_a_bright_color(c1):
     return color_distance(c1, wx.BLACK) > color_distance(c1, wx.WHITE)
 
@@ -132,6 +135,10 @@ class Themes(Service):
         tp["inactive_fg"] = wx.SystemSettings.GetColour(wx.SYS_COLOUR_INACTIVECAPTIONTEXT)
         # for key, col in tp.items():
         #     print (f'tp["{key}"] = wx.Colour({col.red}, {col.green}, {col.blue}, {col.alpha})')
+        for p1, p2 in (("label_bg", "label_fg"), ("button_bg", "button_fg"), ("text_bg", "text_fg"), ("list_bg", "list_fg")):
+            inv_col = inverted_color(tp[p2])
+            if color_distance(tp[p2], tp[p1]) < color_distance(inv_col, tp[p1]):
+                tp[p2] = inv_col
         if system() != "Darwin":
             # Alas, Darwin does not properly support overloading of colors...
             if not self.dark and is_a_dark_color(tp["win_bg"]):
@@ -166,7 +173,6 @@ class Themes(Service):
                 tp["highlight"] = wx.Colour(0, 0, 255)
                 tp["inactive_bg"] = wx.Colour(46, 46, 46)
                 tp["inactive_fg"] = base_fg
-
         tp["pause_bg"] = (
             wx.Colour(87, 87, 0) if self._dark else wx.Colour(200, 200, 0)
         )

meerk40t/gui/tips.py

@@ -11,7 +11,6 @@ import webbrowser
 
 import wx
 
-from ..kernel import get_safe_path
 from .icons import (
     icon_outline,
     icon_youtube,
@@ -43,7 +42,7 @@ class TipPanel(wx.Panel):
         self.tip_image = ""
         self.tips = []
 
-        safe_dir = os.path.realpath(get_safe_path(self.context.kernel.name))
+        safe_dir = self.context.kernel.os_information["WORKDIR"]
         self.local_file = os.path.join(safe_dir, "tips.txt")
 
         self.setup_tips()
@@ -538,7 +537,7 @@ class TipPanel(wx.Panel):
         Check for existence of a subdirectory to store images
         and create it if not found
         """
-        safe_dir = os.path.realpath(get_safe_path(self.context.kernel.name))
+        safe_dir = self.context.kernel.os_information["WORKDIR"]
         cache_dir = os.path.join(safe_dir, "tip_images")
         if not os.path.exists(cache_dir):
             try: