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

meerk40t/gui/scene/scene.py

@@ -27,9 +27,6 @@ from meerk40t.gui.scene.scenespacewidget import SceneSpaceWidget
 from meerk40t.kernel import Job, Module
 from meerk40t.svgelements import Matrix, Point
 
-# TODO: _buffer can be updated partially rather than fully rewritten, especially with some layering.
-
-
 _reused_identity_widget = Matrix()
 XCELLS = 15
 YCELLS = 15
@@ -78,9 +75,22 @@ class SceneToast:
         """
         self.countdown -= 1
         if self.countdown <= 20:
-            self.scene.request_refresh_for_animation()
+            self.scene.invalidate(
+                self.left - 10,
+                self.top - 10,
+                self.right + 10,
+                self.bottom + 10,
+                animate=True,
+            )
         if self.countdown <= 0:
-            self.scene.request_refresh()
+            self.scene.invalidate(
+                self.left - 10,
+                self.top - 10,
+                self.right + 10,
+                self.bottom + 10,
+                animate=False,
+            )
+            # self.scene.request_refresh()
             self.message = None
             self.token = None
         return self.countdown > 0
@@ -212,6 +222,8 @@ class Scene(Module, Job):
         self.colors = self.context.colors
 
         self.screen_refresh_is_requested = True
+        self.clip = wx.Rect(0, 0, 0, 0)
+
         self.background_brush = wx.Brush(self.colors.color_background)
         self.has_background = False
         # If set this color will be used for the scene background (used during burn)
@@ -299,6 +311,13 @@ class Scene(Module, Job):
         except AttributeError:
             pass
 
+    def invalidate(self, min_x, min_y, max_x, max_y, animate=False):
+        self.clip.Union((min_x, min_y, max_x - min_x, max_y - min_y))
+        if animate:
+            self.request_refresh_for_animation()
+        else:
+            self.request_refresh()
+
     def animate(self, widget):
         with self._animate_lock:
             if widget not in self._adding_widgets:
@@ -366,6 +385,13 @@ class Scene(Module, Job):
             self.gui.set_buffer()
             buf = self.gui.scene_buffer
         dc = wx.MemoryDC()
+        if self.clip.width != 0 and self.clip.height != 0:
+            dc.SetClippingRegion(self.clip)
+            self.clip.SetX(0)
+            self.clip.SetY(0)
+            self.clip.SetWidth(0)
+            self.clip.SetHeight(0)
+
         dc.SelectObject(buf)
         if self.overrule_background is None:
             self.background_brush.SetColour(self.colors.color_background)

meerk40t/gui/scenewidgets/elementswidget.py

@@ -73,7 +73,15 @@ class ElementsWidget(Widget):
                 return
         except TypeError:
             return
-        if event_type == "rightdown" and not modifiers:
+        empty_or_right = True
+        if modifiers is not None:
+            for mod in modifiers:
+                if mod == "m_right":
+                    continue
+                empty_or_right = False
+                break
+
+        if event_type == "rightdown" and empty_or_right:
             if not self.scene.pane.tool_active:
                 if self.scene.pane.active_tool != "none":
                     self.scene.context("tool none")
@@ -82,9 +90,9 @@ class ElementsWidget(Widget):
                     self.scene.context.signal("scene_right_click")
                     return RESPONSE_CONSUME
         elif event_type == "rightdown":  # any modifier
-            if self.scene.context.use_toolmenu:
-                self.scene.context("tool_menu")
-                return RESPONSE_CONSUME
+            # if self.scene.context.use_toolmenu:
+            #     self.scene.context("tool_menu")
+            #     return RESPONSE_CONSUME
             return RESPONSE_CHAIN
         elif event_type == "leftclick":
             if self.scene.pane.modif_active:

meerk40t/gui/scenewidgets/gridwidget.py

@@ -290,8 +290,8 @@ class GridWidget(Widget):
 
         self.min_x = max(0, self.min_x)
         self.min_y = max(0, self.min_y)
-        self.max_x = min(float(self.scene.context.device.view.unit_width), self.max_x)
-        self.max_y = min(float(self.scene.context.device.view.unit_height), self.max_y)
+        self.max_x = min(self.scene.context.space.width, self.max_x)
+        self.max_y = min(self.scene.context.space.height, self.max_y)
 
     def calculate_tick_length(self):
         tick_length = float(

meerk40t/gui/scenewidgets/laserpathwidget.py

@@ -19,7 +19,10 @@ class LaserPathWidget(Widget):
 
     def __init__(self, scene):
         Widget.__init__(self, scene, all=False)
-        self.laserpath = [[0, 0] for _ in range(1000)], [[0, 0] for _ in range(1000)]
+        self.buffer_size = 1000
+        self.laserpath = [[0, 0] for _ in range(self.buffer_size)], [
+            [0, 0] for _ in range(self.buffer_size)
+        ]
         self.laserpath_index = 0
 
     def init(self, context):
@@ -42,7 +45,9 @@ class LaserPathWidget(Widget):
         self.laserpath_index = index
 
     def clear_laserpath(self):
-        self.laserpath = [[0, 0] for _ in range(1000)], [[0, 0] for _ in range(1000)]
+        self.laserpath = [[0, 0] for _ in range(self.buffer_size)], [
+            [0, 0] for _ in range(self.buffer_size)
+        ]
         self.laserpath_index = 0
 
     def process_draw(self, gc):

meerk40t/gui/scenewidgets/machineoriginwidget.py

@@ -54,9 +54,13 @@ class MachineOriginWidget(Widget):
         y_dx, y_dy = space.display.iposition(0, 50000)
         ya1_dx, ya1_dy = space.display.iposition(5000, 45000)
         ya2_dx, ya2_dy = space.display.iposition(-5000, 45000)
-        dev0x, dev0y = space.device.view.iposition(0, 0)
         gc.SetBrush(self.brush)
-        gc.DrawRectangle(dev0x - margin, dev0y - margin, margin * 2, margin * 2)
+        try:
+            dev0x, dev0y = space.device.view.iposition(0, 0)
+            gc.DrawRectangle(dev0x - margin, dev0y - margin, margin * 2, margin * 2)
+        except AttributeError:
+            # device view does not exist, so we cannot draw the device machine origin widget
+            pass
 
         gc.SetBrush(wx.NullBrush)
         gc.SetPen(self.x_axis_pen)

meerk40t/gui/scenewidgets/relocatewidget.py

@@ -16,7 +16,7 @@ class RelocateWidget(Widget):
     def __init__(self, scene, x, y):
         size = 10000
         Widget.__init__(self, scene, x - size, y - size, x + size, y + size)
-        self.bitmap = icons.icons8_center_of_gravity_50.GetBitmap()
+        self.bitmap = icons.icons8_center_of_gravity.GetBitmap()
 
     def hit(self):
         return HITCHAIN_HIT

meerk40t/gui/scenewidgets/reticlewidget.py

@@ -28,6 +28,7 @@ class ReticleWidget(Widget):
         """
         context.listen("driver;position", self.on_update_driver)
         context.listen("emulator;position", self.on_update_emulator)
+        context.listen("status;position", self.on_update_status)
 
     def final(self, context):
         """
@@ -35,6 +36,7 @@ class ReticleWidget(Widget):
         """
         context.unlisten("driver;position", self.on_update_driver)
         context.unlisten("emulator;position", self.on_update_emulator)
+        context.unlisten("status;position", self.on_update_status)
 
     def on_update_driver(self, origin, pos):
         """
@@ -50,6 +52,13 @@ class ReticleWidget(Widget):
         self.reticles["e" + origin] = pos[2], pos[3]
         self.scene.request_refresh_for_animation()
 
+    def on_update_status(self, origin, pos):
+        """
+        Update of emulator adds and ensures the location of the e+origin position
+        """
+        self.reticles["s" + origin] = pos[2], pos[3]
+        self.scene.request_refresh_for_animation()
+
     def process_draw(self, gc):
         """
         Draw all the registered reticles.

meerk40t/gui/scenewidgets/selectionwidget.py

@@ -448,7 +448,7 @@ class RotationWidget(Widget):
                 if hasattr(e, "update"):
                     images.append(e)
             for e in images:
-                e.update(None)
+                e.update(self.scene.context)
             self.master.last_angle = None
             self.master.start_angle = None
             self.master.rotated_angle = 0
@@ -732,7 +732,7 @@ class CornerWidget(Widget):
                 if hasattr(e, "update"):
                     images.append(e)
             for e in images:
-                e.update(None)
+                e.update(self.scene.context)
             self.scene.pane.modif_active = False
             self.scene.context.signal("tool_modified")
         elif event == -1:
@@ -981,7 +981,7 @@ class SideWidget(Widget):
                 if hasattr(e, "update"):
                     images.append(e)
             for e in images:
-                e.update(None)
+                e.update(self.scene.context)
             self.scene.pane.modif_active = False
             self.scene.context.signal("tool_modified")
         elif event == -1:
@@ -1210,7 +1210,7 @@ class SkewWidget(Widget):
                 if hasattr(e, "update"):
                     images.append(e)
             for e in images:
-                e.update(None)
+                e.update(self.scene.context)
             self.scene.context.signal("tool_modified")
         elif event == -1:
             self.scene.pane.modif_active = True
@@ -1409,14 +1409,19 @@ class MoveWidget(Widget):
             had_optional = False
             # Need to add stroke and fill, as copy will take the
             # default values for these attributes
-            for optional in ("fill", "stroke"):
+            options = ["fill", "stroke", "wxfont"]
+            for optional in options:
                 if hasattr(e, optional):
                     setattr(copy_node, optional, getattr(e, optional))
-
-            for optional in ("wxfont", "mktext", "mkfont", "mkfontsize"):
+            options = []
+            for prop in dir(e):
+                if prop.startswith("mk"):
+                    options.append(prop)
+            for optional in options:
                 if hasattr(e, optional):
                     setattr(copy_node, optional, getattr(e, optional))
                     had_optional = True
+
             newparent.add_node(copy_node)
             copy_nodes.append(copy_node)
             # The copy remains at the same place, we are moving the originals,

meerk40t/gui/simpleui.py

@@ -11,15 +11,42 @@ import wx
 from wx import aui
 
 from ..core.exceptions import BadFileError
-from .icons import icons8_computer_support_50, icons8_opened_folder_50
+from .icons import get_default_icon_size, icons8_computer_support, icons8_opened_folder
 from .mwindow import MWindow
+from .navigationpanels import Drag, Jog
+from .wxutils import StaticBoxSizer
 
 _ = wx.GetTranslation
 
 
+class JogMovePanel(wx.Panel):
+    def __init__(self, *args, context=None, icon_size=None, **kwds):
+        # begin wxGlade: Jog.__init__
+        kwds["style"] = kwds.get("style", 0) | wx.TAB_TRAVERSAL
+        wx.Panel.__init__(self, *args, **kwds)
+        self.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.SetSizer(self.main_sizer)
+        self.Layout()
+        self.Bind(wx.EVT_SIZE, self.on_resize)
+
+    def on_resize(self, event):
+        wb_size = event.GetSize()
+        panel_size = (wb_size[0] / 2, wb_size[1])
+        for p in self.panels:
+            if hasattr(p, "set_icons"):
+                p.set_icons(dimension=panel_size)
+        self.Layout()
+
+
 class ProjectPanel(wx.Panel):
     """
-    Serves to allow the use of Load Project button. This couldn't be provided natively by any readily availible panel.
+    Serves to allow the use of Load Project button. This couldn't be provided natively by any readily available panel.
     """
 
     name = "Project"
@@ -31,12 +58,43 @@ class ProjectPanel(wx.Panel):
         self.context = context
         self.SetSize((400, 300))
 
-        sizer_buttons = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_buttons = wx.BoxSizer(wx.VERTICAL)
 
         self.button_load = wx.Button(self, wx.ID_ANY, _("Load Project"))
 
-        self.button_load.SetBitmap(icons8_opened_folder_50.GetBitmap())
-        sizer_buttons.Add(self.button_load, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        self.button_load.SetBitmap(
+            icons8_opened_folder.GetBitmap(resize=get_default_icon_size())
+        )
+        info_panel = StaticBoxSizer(self, wx.ID_ANY, "Project-Information", wx.VERTICAL)
+        line1 = wx.BoxSizer(wx.HORIZONTAL)
+        lbl = wx.StaticText(self, wx.ID_ANY, "File:")
+        lbl.SetMinSize(wx.Size(70, -1))
+        self.info_file = wx.TextCtrl(self, wx.ID_ANY, style=wx.TE_READONLY)
+        line1.Add(lbl, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        line1.Add(self.info_file, 1, wx.EXPAND, 0)
+
+        line2 = wx.BoxSizer(wx.HORIZONTAL)
+        lbl = wx.StaticText(self, wx.ID_ANY, "Content:")
+        lbl.SetMinSize(wx.Size(70, -1))
+        self.info_elements = wx.TextCtrl(self, wx.ID_ANY, style=wx.TE_READONLY)
+        self.info_operations = wx.TextCtrl(self, wx.ID_ANY, style=wx.TE_READONLY)
+        line2.Add(lbl, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        line2.Add(self.info_elements, 1, wx.EXPAND, 0)
+        line2.Add(self.info_operations, 1, wx.EXPAND, 0)
+
+        line3 = wx.BoxSizer(wx.HORIZONTAL)
+        lbl = wx.StaticText(self, wx.ID_ANY, "Status:")
+        lbl.SetMinSize(wx.Size(70, -1))
+        self.info_status = wx.TextCtrl(self, wx.ID_ANY, style=wx.TE_READONLY)
+        line3.Add(lbl, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        line3.Add(self.info_status, 1, wx.EXPAND, 0)
+
+        info_panel.Add(line1, 0, wx.EXPAND, 0)
+        info_panel.Add(line2, 0, wx.EXPAND, 0)
+        info_panel.Add(line3, 0, wx.EXPAND, 0)
+        # info_panel.Add(line4, 0, wx.EXPAND, 0)
+        sizer_buttons.Add(self.button_load, 0, 0, 0)
+        sizer_buttons.Add(info_panel, 1, wx.EXPAND, 0)
 
         self.SetSizer(sizer_buttons)
 
@@ -46,6 +104,27 @@ class ProjectPanel(wx.Panel):
         self.Bind(wx.EVT_DROP_FILES, self.on_drop_file)
         # end wxGlade
 
+    def update_info(self, pathname):
+        self.info_file.SetValue(pathname)
+        self.info_elements.SetValue(
+            f"{len(list(self.context.elements.elems()))} elements"
+        )
+        self.info_operations.SetValue(
+            f"{len(list(self.context.elements.ops()))} burn operations"
+        )
+        unass, unburn = self.context.elements.have_unburnable_elements()
+        status = ""
+        if unass:
+            status += "Unassigned elements! "
+        if unburn:
+            status += "Unburnable elements! "
+        if status == "":
+            status = "Ready to burn."
+            self.info_status.SetBackgroundColour(None)
+        else:
+            self.info_status.SetBackgroundColour(wx.YELLOW)
+        self.info_status.SetValue(status)
+
     def on_load(self, event):  # wxGlade: MyFrame.<event_handler>
         # This code should load just specific project files rather than all importable formats.
         files = self.context.elements.load_types()
@@ -57,6 +136,7 @@ class ProjectPanel(wx.Panel):
             pathname = fileDialog.GetPath()
             self.clear_project()
             self.load(pathname)
+            self.update_info(pathname)
         event.Skip()
 
     def clear_project(self):
@@ -75,9 +155,13 @@ class ProjectPanel(wx.Panel):
         accepted = 0
         rejected = 0
         rejected_files = []
+        validpath = ""
         for pathname in event.GetFiles():
             if self.load(pathname):
                 accepted += 1
+                if validpath:
+                    validpath += ","
+                validpath += pathname
             else:
                 rejected += 1
                 rejected_files.append(pathname)
@@ -91,9 +175,12 @@ class ProjectPanel(wx.Panel):
             )
             dlg.ShowModal()
             dlg.Destroy()
+            self.update_info(validpath)
 
     def load(self, pathname):
         def unescaped(filename):
+            import platform
+
             OS_NAME = platform.system()
             if OS_NAME == "Windows":
                 newstring = filename.replace("&", "&&")
@@ -136,7 +223,7 @@ class SimpleUI(MWindow):
         super().__init__(598, 429, *args, **kwds)
 
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_computer_support_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_computer_support.GetBitmap())
         self.SetIcon(_icon)
         # begin wxGlade: Navigation.__set_properties
         self.SetTitle(_("MeerK40t"))
@@ -218,9 +305,9 @@ class SimpleUI(MWindow):
         from meerk40t.gui.laserpanel import LaserPanel
 
         kernel.register("simpleui/laserpanel", (LaserPanel, None))
-        from meerk40t.gui.navigationpanels import Jog
 
-        kernel.register("simpleui/navigation", (Jog, {"icon_size": 20}))
+        kernel.register("simpleui/navigation", (JogMovePanel, None))
+
         from meerk40t.gui.consolepanel import ConsolePanel
 
         kernel.register("simpleui/console", (ConsolePanel, None))

meerk40t/gui/simulation.py

@@ -26,20 +26,21 @@ from ..svgelements import Matrix
 from .choicepropertypanel import ChoicePropertyPanel
 from .icons import (
     STD_ICON_SIZE,
-    icons8_bell_20,
-    icons8_close_window_20,
-    icons8_home_20,
-    icons8_image_50,
-    icons8_input_20,
-    icons8_laser_beam_hazard2_50,
-    icons8_output_20,
-    icons8_pause_50,
-    icons8_play_50,
-    icons8_return_20,
-    icons8_route_50,
-    icons8_stop_gesture_20,
-    icons8_system_task_20,
-    icons8_timer_20,
+    get_default_icon_size,
+    icon_bell,
+    icon_close_window,
+    icon_console,
+    icon_external,
+    icon_internal,
+    icon_return,
+    icon_round_stop,
+    icon_timer,
+    icons8_circled_play,
+    icons8_home_filled,
+    icons8_image,
+    icons8_laser_beam_hazard,
+    icons8_pause,
+    icons8_route,
 )
 from .laserrender import DRAW_MODE_BACKGROUND, LaserRender
 from .mwindow import MWindow
@@ -107,18 +108,18 @@ class OperationsPanel(wx.Panel):
     def setup_state_images(self):
         iconsize = 20
         self.default_images = [
-            ["beep", icons8_bell_20],
-            ["interrupt", icons8_stop_gesture_20],
-            ["quit", icons8_close_window_20],
-            ["wait", icons8_timer_20],
-            ["home", icons8_home_20],
-            ["goto", icons8_return_20],
-            ["origin", icons8_return_20],
-            ["output", icons8_output_20],
-            ["input", icons8_input_20],
-            ["cutcode", icons8_laser_beam_hazard2_50],
+            ["beep", icon_bell],
+            ["interrupt", icon_round_stop],
+            ["quit", icon_close_window],
+            ["wait", icon_timer],
+            ["home", icons8_home_filled],
+            ["goto", icon_return],
+            ["origin", icon_return],
+            ["output", icon_external],
+            ["input", icon_internal],
+            ["cutcode", icons8_laser_beam_hazard],
             # Intentionally the last...
-            ["console", icons8_system_task_20],
+            ["console", icon_console],
         ]
         self.options_images = wx.ImageList()
         self.options_images.Create(width=iconsize, height=iconsize)
@@ -832,10 +833,7 @@ class SimulationPanel(wx.Panel, Job):
         self.panel_optimize.AddPage(self.subpanel_cutcode, _("Cutcode"))
         self.checkbox_optimize = wx.CheckBox(self, wx.ID_ANY, _("Optimize"))
         self.checkbox_optimize.SetToolTip(_("Enable/Disable Optimize"))
-        if optimise_at_start:
-            self.checkbox_optimize.SetValue(1)
-        else:
-            self.checkbox_optimize.SetValue(0)
+        self.checkbox_optimize.SetValue(self.context.planner.do_optimization)
         self.btn_redo_it = wx.Button(self, wx.ID_ANY, _("Recalculate"))
         self.btn_redo_it.Bind(wx.EVT_BUTTON, self.on_redo_it)
 
@@ -977,7 +975,9 @@ class SimulationPanel(wx.Panel, Job):
             _("Time Estimate: Extra Time (ie to swing around)")
         )
         self.text_time_total.SetToolTip(_("Time Estimate: Total Time"))
-        self.button_play.SetBitmap(icons8_play_50.GetBitmap())
+        self.button_play.SetBitmap(
+            icons8_circled_play.GetBitmap(resize=get_default_icon_size())
+        )
         self.text_playback_speed.SetMinSize(dip_size(self, 55, 23))
         # self.combo_device.SetToolTip(_("Select the device"))
         self.button_spool.SetFont(
@@ -990,7 +990,9 @@ class SimulationPanel(wx.Panel, Job):
                 "Segoe UI",
             )
         )
-        self.button_spool.SetBitmap(icons8_route_50.GetBitmap())
+        self.button_spool.SetBitmap(
+            icons8_route.GetBitmap(resize=1.5 * get_default_icon_size())
+        )
         # end wxGlade
 
     def __do_layout(self):
@@ -1547,8 +1549,10 @@ class SimulationPanel(wx.Panel, Job):
         plan = self.plan_name
         if self.checkbox_optimize.GetValue():
             opt = " optimize"
+            self.context.planner.do_optimization = True
         else:
             opt = ""
+            self.context.planner.do_optimization = False
         self.context(
             f"plan{plan} clear\nplan{plan} copy preprocess validate blob preopt{opt}\n"
         )
@@ -1599,12 +1603,16 @@ class SimulationPanel(wx.Panel, Job):
         self.context.signal("refresh_scene", self.widget_scene.name)
 
     def _start(self):
-        self.button_play.SetBitmap(icons8_pause_50.GetBitmap())
+        self.button_play.SetBitmap(
+            icons8_pause.GetBitmap(resize=get_default_icon_size())
+        )
         self.context.schedule(self)
         self.running = True
 
     def _stop(self):
-        self.button_play.SetBitmap(icons8_play_50.GetBitmap())
+        self.button_play.SetBitmap(
+            icons8_circled_play.GetBitmap(resize=get_default_icon_size())
+        )
         self.context.unschedule(self)
         self.running = False
 
@@ -1760,7 +1768,7 @@ class SimulationWidget(Widget):
                         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,
@@ -2035,7 +2043,7 @@ class Simulation(MWindow):
             optimise_at_start=optimise,
         )
         _icon = wx.NullIcon
-        _icon.CopyFromBitmap(icons8_laser_beam_hazard2_50.GetBitmap())
+        _icon.CopyFromBitmap(icons8_laser_beam_hazard.GetBitmap())
         self.SetIcon(_icon)
         self.SetTitle(_("Simulation"))
 
@@ -2055,7 +2063,7 @@ class Simulation(MWindow):
             "button/jobstart/Simulation",
             {
                 "label": _("Simulate"),
-                "icon": icons8_laser_beam_hazard2_50,
+                "icon": icons8_laser_beam_hazard,
                 "tip": _("Simulate the current laser job"),
                 "action": open_simulator,
                 "size": STD_ICON_SIZE,