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

meerk40t/gui/simulation.py

@@ -1,6 +1,6 @@
 import math
 import platform
-from time import perf_counter, sleep
+from time import perf_counter
 
 import wx
 
@@ -280,7 +280,6 @@ class OperationsPanel(wx.Panel):
     def on_text_operation_param(self, event):
         content = self.text_operation_param.GetValue()
         idx = self.list_operations.GetFirstSelected()
-        flag = False
         if idx < 0:
             return
         op = self.cutplan.plan[idx]
@@ -325,7 +324,7 @@ class OperationsPanel(wx.Panel):
                 content = op.command
                 flag = True
             elif isinstance(op, GotoOperation):
-                content = str(op.x) + "," + str(op.y)
+                content = f"{str(op.x)},{str(op.y)}"
                 flag = True
             elif isinstance(op, WaitOperation):
                 content = str(op.wait)
@@ -485,9 +484,7 @@ class CutcodePanel(wx.Panel):
 
         self.cutcode = cutcode
         self.plan_name = plan_name
-        self.list_cutcode = wxListBox(
-            self, wx.ID_ANY, choices=[], style=wx.LB_MULTIPLE
-        )
+        self.list_cutcode = wxListBox(self, wx.ID_ANY, choices=[], style=wx.LB_MULTIPLE)
         self.last_selected = []
         self.display_highlighted_only = False
         # self.text_operation_param = TextCtrl(
@@ -901,15 +898,9 @@ class SimulationPanel(wx.Panel, Job):
 
         self.slider_progress = wx.Slider(self, wx.ID_ANY, self.max, 0, self.max)
         self.slider_progress.SetFocus()
-        self.text_distance_laser = TextCtrl(
-            self, wx.ID_ANY, "", style=wx.TE_READONLY
-        )
-        self.text_distance_travel = TextCtrl(
-            self, wx.ID_ANY, "", style=wx.TE_READONLY
-        )
-        self.text_distance_total = TextCtrl(
-            self, wx.ID_ANY, "", style=wx.TE_READONLY
-        )
+        self.text_distance_laser = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
+        self.text_distance_travel = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
+        self.text_distance_total = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
         self.text_time_laser = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
         self.text_time_travel = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
         self.text_time_extra = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
@@ -923,18 +914,10 @@ class SimulationPanel(wx.Panel, Job):
         self.text_distance_total_step = TextCtrl(
             self, wx.ID_ANY, "", style=wx.TE_READONLY
         )
-        self.text_time_laser_step = TextCtrl(
-            self, wx.ID_ANY, "", style=wx.TE_READONLY
-        )
-        self.text_time_travel_step = TextCtrl(
-            self, wx.ID_ANY, "", style=wx.TE_READONLY
-        )
-        self.text_time_extra_step = TextCtrl(
-            self, wx.ID_ANY, "", style=wx.TE_READONLY
-        )
-        self.text_time_total_step = TextCtrl(
-            self, wx.ID_ANY, "", style=wx.TE_READONLY
-        )
+        self.text_time_laser_step = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
+        self.text_time_travel_step = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
+        self.text_time_extra_step = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
+        self.text_time_total_step = TextCtrl(self, wx.ID_ANY, "", style=wx.TE_READONLY)
         self.button_play = wxButton(self, wx.ID_ANY, "")
         self.button_play.SetToolTip(_("Start the simulation replay"))
         self.slider_playbackspeed = wx.Slider(self, wx.ID_ANY, 180, 0, 310)
@@ -1257,12 +1240,16 @@ class SimulationPanel(wx.Panel, Job):
         try:
             if newvalue:
                 # Slided in ->
-                self.hscene_sizer.Show(sizer=self.voption_sizer, show=False, recursive=True)
+                self.hscene_sizer.Show(
+                    sizer=self.voption_sizer, show=False, recursive=True
+                )
                 self.voption_sizer.Layout()
                 self.btn_slide_options.SetLabel("<")
             else:
                 # Slided out ->
-                self.hscene_sizer.Show(sizer=self.voption_sizer, show=True, recursive=True)
+                self.hscene_sizer.Show(
+                    sizer=self.voption_sizer, show=True, recursive=True
+                )
                 self.voption_sizer.Layout()
                 self.btn_slide_options.SetLabel(">")
             self.hscene_sizer.Layout()
@@ -1316,7 +1303,10 @@ class SimulationPanel(wx.Panel, Job):
         if self.laserspot_display:
             spot_value = getattr(self.context.device, "laserspot", "0.3mm")
             try:
-                scale = 0.5 * (self.context.device.view.native_scale_x + self.context.device.view.native_scale_y)
+                scale = 0.5 * (
+                    self.context.device.view.native_scale_x
+                    + self.context.device.view.native_scale_y
+                )
                 spotwidth_in_scene = float(Length(spot_value))
                 spot_width = spotwidth_in_scene / scale
                 # print (f"Scale for device: {scale}, spot in scene: {spot_value} = {spotwidth_in_scene} -> {spot_width}")
@@ -1560,10 +1550,7 @@ class SimulationPanel(wx.Panel, Job):
         self.slider_progress.SetValue(self.max)
         value = self.slider_playbackspeed.GetValue()
         value = int((10.0 ** (value // 90)) * (1.0 + float(value % 90) / 10.0))
-        if self.radio_cut.GetValue():
-            factor = 0.1  # steps
-        else:
-            factor = 1  # seconds
+        factor = 0.1 if self.radio_cut.GetValue() else 1  # steps / seconds
         self.interval = factor * 100.0 / float(value)
 
     def _refresh_simulated_plan(self):
@@ -1620,12 +1607,11 @@ class SimulationPanel(wx.Panel, Job):
 
         self.update_job.cancel()
         self.context.schedule(self.update_job)
-
+        self.reload_statistics()
         self._startup()
         self.request_refresh()
         self.SetCursor(wx.Cursor(wx.CURSOR_ARROW))
 
-
     @signal_listener("device;modified")
     @signal_listener("plan")
     def on_plan_change(self, origin, plan_name=None, status=None):
@@ -1693,7 +1679,7 @@ class SimulationPanel(wx.Panel, Job):
             self.button_spool.Enable(False)
         except RuntimeError:
             # Control no longer existant
-            return 
+            return
         msg = self.button_spool.GetLabel()
         self.button_spool.SetLabel(_("Calculating"))
         for cut in self.cutcode:
@@ -1701,9 +1687,15 @@ class SimulationPanel(wx.Panel, Job):
                 if hasattr(cut, "_plotcache") and cut._plotcache is not None:
                     continue
                 if isinstance(cut, RasterCut):
-                    cut._plotcache = list(cut.plot.plot())
+                    try:
+                        cut._plotcache = list(cut.plot.plot())
+                    except MemoryError:
+                        cut._plotcache = None
                 elif isinstance(cut, PlotCut):
-                    cut._plotcache = list(cut.plot)
+                    try:
+                        cut._plotcache = list(cut.plot)
+                    except MemoryError:
+                        cut._plotcache = None
                 self.context.signal("refresh_scene", self.widget_scene.name)
         self.reload_statistics()
         try:
@@ -1963,10 +1955,7 @@ class SimulationPanel(wx.Panel, Job):
 
         value = self.slider_playbackspeed.GetValue()
         value = int((10.0 ** (value // 90)) * (1.0 + float(value % 90) / 10.0))
-        if self.radio_cut.GetValue():
-            factor = 0.1  # steps
-        else:
-            factor = 1  # seconds
+        factor = 0.1 if self.radio_cut.GetValue() else 1  # steps / seconds
         self.interval = factor * 100.0 / float(value)
 
         self.text_playback_speed.SetValue(f"{value}%")
@@ -1991,7 +1980,7 @@ class SimulationWidget(Widget):
         self.matrix.post_cat(~scene.context.device.view.matrix)
         self.last_msg = None
         self.raster_as_image = True
-        self.laserspot_width = None # 1 Pixel
+        self.laserspot_width = None  # 1 Pixel
 
     def process_draw(self, gc: wx.GraphicsContext):
         if self.sim.progress < 0:
@@ -2005,7 +1994,9 @@ class SimulationWidget(Widget):
             sim_cut = self.sim.cutcode[:idx]
         else:
             sim_cut = self.sim.cutcode
-        self.renderer.draw_cutcode(sim_cut, gc, 0, 0, self.raster_as_image, laserspot_width=spot_width)
+        self.renderer.draw_cutcode(
+            sim_cut, gc, 0, 0, self.raster_as_image, laserspot_width=spot_width
+        )
         if residual <= 0:
             return
         # We draw interpolated lines to acknowledge we are in the middle of a cut operation
@@ -2022,7 +2013,9 @@ class SimulationWidget(Widget):
                 image = cut.image
                 gc.PushState()
                 matrix = Matrix.scale(cut.step_x, cut.step_y)
-                matrix.post_translate(cut.offset_x + x, cut.offset_y + y)  # Adjust image xy
+                matrix.post_translate(
+                    cut.offset_x + x, cut.offset_y + y
+                )  # Adjust image xy
                 gc.ConcatTransform(wx.GraphicsContext.CreateMatrix(gc, ZMatrix(matrix)))
                 try:
                     cache = cut._cache
@@ -2043,31 +2036,23 @@ class SimulationWidget(Widget):
                     cut._cache_id = id(image)
                 # Set draw - constraint
                 if cut.horizontal:
+                    # mode = "T2B"
+                    clip_w = cut._cache_width
+                    clip_h = int(residual * cut._cache_height)
                     if cut.start_minimum_y:
-                        # mode = "T2B"
-                        clip_w = cut._cache_width
-                        clip_h = int(residual * cut._cache_height)
-                        clip_x = 0
                         clip_y = 0
                     else:
-                        # mode = "B2T"
-                        clip_w = cut._cache_width
-                        clip_h = int(residual * cut._cache_height)
-                        clip_x = 0
                         clip_y = cut._cache_height - clip_h
+                    clip_x = 0
                 else:
+                    # mode = "L2R"
+                    clip_w = int(residual * cut._cache_width)
+                    clip_h = cut._cache_height
+                    clip_y = 0
                     if cut.start_minimum_x:
-                        # mode = "L2R"
-                        clip_w = int(residual * cut._cache_width)
-                        clip_h = cut._cache_height
                         clip_x = 0
-                        clip_y = 0
                     else:
-                        # mode = "R2L"
-                        clip_w = int(residual * cut._cache_width)
-                        clip_h = cut._cache_height
                         clip_x = cut._cache_width - clip_w
-                        clip_y = 0
 
                 # msg = f"Mode: {mode}, Horiz: {cut.horizontal}, from left: {cut.start_on_left}, from top: {cut.start_on_top}"
                 # if msg != self.last_msg:
@@ -2094,8 +2079,16 @@ class SimulationWidget(Widget):
                 gc.PopState()
             else:
                 # We draw the cutcode up to a certain percentage
-                simcut = (self.sim.cutcode[idx], )
-                self.renderer.draw_cutcode(simcut, gc, 0, 0, self.raster_as_image, residual=residual, laserspot_width=spot_width)
+                simcut = (self.sim.cutcode[idx],)
+                self.renderer.draw_cutcode(
+                    simcut,
+                    gc,
+                    0,
+                    0,
+                    self.raster_as_image,
+                    residual=residual,
+                    laserspot_width=spot_width,
+                )
 
             return
             # # We draw a rectangle covering the raster area
@@ -2163,9 +2156,9 @@ class SimulationTravelWidget(Widget):
         self.initvars()
 
     def initvars(self):
-        self.starts = list()
-        self.ends = list()
-        self.pos = list()
+        self.starts = []
+        self.ends = []
+        self.pos = []
         self.starts.append(wx.Point2D(0, 0))
         self.ends.append(wx.Point2D(0, 0))
         prev = None
@@ -2202,8 +2195,8 @@ class SimulationTravelWidget(Widget):
                             self.ends.append(wx.Point2D(m1.real, m1.imag))
             else:
                 end = wx.Point2D(*curr.start)
-                self.starts = list()
-                self.ends = list()
+                self.starts = []
+                self.ends = []
                 self.starts.append(wx.Point2D(0, 0))
                 self.ends.append(end)
             self.pos.append(len(self.starts))
@@ -2297,17 +2290,20 @@ class SimReticleWidget(Widget):
         y = 0
         if (
             # self.sim.progress > 0 and
-            self.sim.cutcode is not None
-            and len(self.sim.cutcode)
+            self.sim.cutcode is not None and len(self.sim.cutcode)
         ):
             idx, residual = self.sim.progress_to_idx(self.sim.progress)
+            if idx >= len(self.sim.cutcode):
+                idx = len(self.sim.cutcode) - 1
+                self.sim.progress = 0
             dx = 0
             dy = 0
             if self.sim.progress != self.sim.max:
-                if idx > 0:
-                    pos = self.sim.cutcode[idx - 1].end
-                else:
-                    pos = self.sim.cutcode[idx].start
+                pos = (
+                    self.sim.cutcode[idx - 1].end
+                    if idx > 0
+                    else self.sim.cutcode[idx].start
+                )
                 if residual > 0:
                     # We could still be traversing or already burning...
                     # We have two time stamps one after travel,
@@ -2399,7 +2395,7 @@ class Simulation(MWindow):
             busy.start()
 
             kernel.console(
-                f"planz copy preprocess validate blob{optpart}\nwindow toggle Simulation z\n"
+                f"planz clear copy preprocess validate blob{optpart}\nwindow toggle Simulation z\n"
             )
             busy.end()
 
@@ -2415,7 +2411,9 @@ class Simulation(MWindow):
             {
                 "label": _("Simulate"),
                 "icon": icons8_laser_beam_hazard,
-                "tip": _("Simulate the current laser job") + "\n" + _("(Right click: no optimisation)"),
+                "tip": _("Simulate the current laser job")
+                + "\n"
+                + _("(Right click: no optimisation)"),
                 "action": open_simulator,
                 "action_right": open_simulator_simple,
                 "rule_enabled": lambda cond: kernel.elements.have_burnable_elements(),

meerk40t/gui/statusbarwidgets/defaultoperations.py

@@ -6,7 +6,8 @@ from meerk40t.core.node.op_image import ImageOpNode
 from meerk40t.core.node.op_raster import RasterOpNode
 from meerk40t.gui.icons import EmptyIcon, icon_library
 from meerk40t.gui.laserrender import swizzlecolor
-from meerk40t.gui.wxutils import wxStaticBitmap, dip_size
+from meerk40t.gui.wxutils import dip_size, wxStaticBitmap
+
 from .statusbarwidget import StatusBarWidget
 
 _ = wx.GetTranslation
@@ -28,24 +29,40 @@ class DefaultOperationWidget(StatusBarWidget):
         self.first_to_show = 0
 
     def node_label(self, node):
-        if isinstance(node, CutOpNode):
-            slabel = "Cut ({percent}, {speed}mm/s)"
-        elif isinstance(node, EngraveOpNode):
-            slabel = "Engrave ({percent}, {speed}mm/s)"
-        elif isinstance(node, RasterOpNode):
-            slabel = "Raster ({percent}, {speed}mm/s)"
-        elif isinstance(node, ImageOpNode):
-            slabel = "Image ({percent}, {speed}mm/s)"
+        percent = ""
+        if hasattr(node, "power"):
+            if getattr(self.context.device, "use_percent_for_power_display", False):
+                percent = f"{node.power / 10.0:.1f}%"
+            else:
+                percent = f"{node.power:.0f}ppi"
+        speed = ""
+        if hasattr(node, "speed"):
+            if getattr(self.context.device, "use_mm_min_for_speed_display", False):
+                speed = f"{node.speed * 60:.0f}mm/min"
+            else:
+                speed = f"{node.speed:.0f}mm/s"
+
+        op_map = {
+            CutOpNode: _("Cut ({percent}, {speed})"),
+            EngraveOpNode: _("Engrave ({percent}, {speed})"),
+            RasterOpNode: _("Raster ({percent}, {speed})"),
+            ImageOpNode: _("Image ({percent}, {speed})"),
+        }
+
+        for op_type, template in op_map.items():
+            if isinstance(node, op_type):
+                slabel = template.format(percent=percent, speed=speed)
+                break
         else:
             slabel = ""
-        slabel = (
+
+        return (
             _("Assign the selection to:")
             + "\n"
             + slabel
             + "\n"
             + _("Right click for options")
         )
-        return slabel
 
     def GenerateControls(self, parent, panelidx, identifier, context):
         def size_it(ctrl, dimen_x, dimen_y):
@@ -337,13 +354,52 @@ class DefaultOperationWidget(StatusBarWidget):
 
         menu.Destroy()
 
+    def _should_activate(self, idx, x, gap, residual):
+        # If no assigned operation, always inactive.
+        if self.assign_operations[idx] is None or idx < self.first_to_show:
+            return False, x, residual
+
+        btn_width = self.buttonsize_x
+        # When this is the last button:
+        if idx == len(self.assign_buttons) - 1 and not residual:
+            if x + btn_width > self.width:
+                return False, x, residual
+            else:
+                return True, x + gap + btn_width, False
+        # For non-last buttons:
+        if x + 2 * btn_width + gap > self.width:
+            return False, x, True
+        return True, x + gap + btn_width, residual
+
+    def _update_button_states(self, x, residual, gap):
+        """
+        Loops through all buttons (assign_buttons) and decides whether to activate or deactivate each one.
+        Conditions for each button:
+
+        - If the corresponding operation (self.assign_operations[idx]) is None, deactivate the button.
+        - Otherwise:
+            - Check if the button fits within the available width (self.width).
+            - If it doesn't fit, mark it as "residual" (indicating more buttons exist off-screen) and deactivate it.
+            - If it fits, activate it and update the horizontal position
+        """
+        for idx, btn in enumerate(self.assign_buttons):
+            active, x, residual = self._should_activate(idx, x, gap, residual)
+            self.SetActive(btn, active)
+        return residual
+
     def Show(self, showit=True):
-        # Callback function that decides whether to show an element or not
+        """
+        Controls the visibility and layout of the operation assignment buttons in the status bar.
+        Updates which buttons are active and visible based on the current page and available width.
+
+        Args:
+            showit (bool): Whether to show the operation assignment controls.
+        """
         if showit:
+            # Determine how many buttons can fit horizontally on the screen
             self.page_size = int(
                 (self.width - 2 * self.buttonsize_x) / self.buttonsize_x
             )
-            # print(f"Page-Size: {self.page_size}, width={self.width}")
             x = 0
             gap = 0
             if self.first_to_show > 0:
@@ -351,36 +407,10 @@ class DefaultOperationWidget(StatusBarWidget):
                 x = self.buttonsize_x + gap
             else:
                 self.SetActive(self.btn_prev, False)
-
             residual = False
-            for idx, btn in enumerate(self.assign_buttons):
-                w = self.buttonsize_x
-                btnflag = False
-                if not residual:
-                    if self.assign_operations[idx] is None:
-                        self.SetActive(btn, False)
-                    else:
-                        if idx < self.first_to_show:
-                            btnflag = False
-                        elif idx == len(self.assign_buttons) - 1:
-                            # The last
-                            if x + w > self.width:
-                                residual = True
-                                btnflag = False
-                            else:
-                                btnflag = True
-                                x += gap + w
-                        else:
-                            if x + w + gap + self.buttonsize_x > self.width:
-                                residual = True
-                                btnflag = False
-                            else:
-                                btnflag = True
-                                x += gap + w
-                self.SetActive(btn, btnflag)
+            residual = self._update_button_states(x, residual, gap)
             self.SetActive(self.btn_next, residual)
             self.SetActive(self.btn_matman, not residual)
-
         else:
             self.SetActive(self.btn_prev, False)
             for btn in self.assign_buttons:
@@ -392,16 +422,19 @@ class DefaultOperationWidget(StatusBarWidget):
 
     def on_prev(self, event):
         self.first_to_show -= self.page_size
-        if self.first_to_show < 0:
-            self.first_to_show = 0
+        self.first_to_show = max(self.first_to_show, 0)
         self.Show(True)
 
     def on_next(self, event):
-        self.first_to_show += self.page_size
+        if (
+            self.first_to_show == 0
+        ):  # We did not have a previous button, so we displayed one more than normal
+            self.first_to_show += self.page_size + 1
+        else:
+            self.first_to_show += self.page_size
         if self.first_to_show + self.page_size >= len(self.assign_buttons):
             self.first_to_show = len(self.assign_buttons) - self.page_size
-        if self.first_to_show < 0:
-            self.first_to_show = 0
+        self.first_to_show = max(self.first_to_show, 0)
         self.Show(True)
 
     def execute_on(self, targetop, use_parent):
@@ -409,9 +442,12 @@ class DefaultOperationWidget(StatusBarWidget):
         data = list(self.context.elements.elems(emphasized=True))
         for node in data:
             add_node = node
-            if use_parent:
-                if node.parent is not None and node.parent.type.startswith("effect"):
-                    add_node = node.parent
+            if (
+                use_parent
+                and node.parent is not None
+                and node.parent.type.startswith("effect")
+            ):
+                add_node = node.parent
             if add_node not in targetdata:
                 targetdata.append(add_node)
 

meerk40t/gui/statusbarwidgets/infowidget.py

@@ -61,7 +61,7 @@ class SimpleInfoWidget(StatusBarWidget):
         self.btn_next.Bind(wx.EVT_LEFT_DOWN, self.on_button_next)
         self.btn_next.Bind(wx.EVT_RIGHT_DOWN, self.on_button_prev)
 
-        self.Add(self.info_text, 5, wx.EXPAND, 0)
+        self.Add(self.info_text, 5, 0, 0)
         self.Add(self.progress_bar, 1, wx.EXPAND, 0)
         self.Add(self.btn_next, 0, wx.EXPAND, 0)
         self.SetActive(self.btn_next, False)
@@ -201,7 +201,7 @@ class InformationWidget(SimpleInfoWidget):
             while new_height > 1024 or new_width > 1024:
                 new_height //= 2
                 new_width //= 2
-                
+
             all_pixel = new_height * new_width
             if all_pixel > 0:
                 try:

meerk40t/gui/tips.py

@@ -22,7 +22,14 @@ from .icons import (
     icons8_manager,
 )
 from .mwindow import MWindow
-from .wxutils import TextCtrl, dip_size, wxButton, wxCheckBox, wxStaticBitmap, wxStaticText
+from .wxutils import (
+    TextCtrl,
+    dip_size,
+    wxButton,
+    wxCheckBox,
+    wxStaticBitmap,
+    wxStaticText,
+)
 
 _ = wx.GetTranslation
 
@@ -98,6 +105,9 @@ class TipPanel(wx.Panel):
         sizer_main.Add(button_sizer, 0, wx.EXPAND, 0)
 
         self.check_startup = wxCheckBox(self, wx.ID_ANY, _("Show tips at startup"))
+        self.check_startup.SetFont(
+            wx.Font(8, wx.FONTFAMILY_SWISS, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL)
+        )
         self.check_startup.SetToolTip(
             _(
                 "Show tips at program start.\n"
@@ -234,6 +244,10 @@ class TipPanel(wx.Panel):
             self.image_tip.Show(True)
             return True
 
+        img_size = self.image_tip.GetSize()
+        if img_size[0] == 0 or img_size[1] == 0:
+            # Invalid display area
+            return False
         # self.image_tip.SetBitmap(wx.NullBitmap)
         self.image_tip.Show(False)
         self.tip_image = path

meerk40t/gui/toolwidgets/toolpointmove.py

@@ -147,6 +147,7 @@ class PointMoveTool(ToolWidget):
 
     def reset(self):
         self.points.clear()
+        self.point_index.clear()
 
     def done(self):
         self.scene.pane.tool_active = False
@@ -156,7 +157,8 @@ class PointMoveTool(ToolWidget):
         self.scene.context("tool none\n")
 
     def tool_change(self):
-        self.points.clear()
+        self.reset()
+
         for node in self.scene.context.elements.flat(emphasized=True):
             if not hasattr(node, "as_geometry"):
                 continue