meerk40t 0.9.7050__py2.py3-none-any.whl → 0.9.7900__py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (68) hide show
  1. meerk40t/balormk/controller.py +3 -3
  2. meerk40t/balormk/device.py +7 -0
  3. meerk40t/balormk/driver.py +23 -14
  4. meerk40t/balormk/galvo_commands.py +18 -3
  5. meerk40t/balormk/gui/balorconfig.py +6 -0
  6. meerk40t/balormk/livelightjob.py +36 -14
  7. meerk40t/camera/camera.py +1 -0
  8. meerk40t/camera/gui/camerapanel.py +154 -58
  9. meerk40t/camera/plugin.py +46 -5
  10. meerk40t/core/elements/branches.py +90 -20
  11. meerk40t/core/elements/elements.py +59 -37
  12. meerk40t/core/elements/trace.py +10 -6
  13. meerk40t/core/node/node.py +2 -0
  14. meerk40t/core/plotplanner.py +7 -4
  15. meerk40t/device/gui/defaultactions.py +78 -14
  16. meerk40t/dxf/dxf_io.py +42 -0
  17. meerk40t/grbl/controller.py +245 -35
  18. meerk40t/grbl/device.py +102 -26
  19. meerk40t/grbl/driver.py +8 -2
  20. meerk40t/grbl/gui/grblconfiguration.py +6 -0
  21. meerk40t/grbl/gui/grblcontroller.py +1 -1
  22. meerk40t/gui/about.py +7 -0
  23. meerk40t/gui/choicepropertypanel.py +20 -30
  24. meerk40t/gui/devicepanel.py +27 -16
  25. meerk40t/gui/icons.py +15 -0
  26. meerk40t/gui/laserpanel.py +102 -54
  27. meerk40t/gui/materialtest.py +12 -2
  28. meerk40t/gui/mkdebug.py +268 -9
  29. meerk40t/gui/navigationpanels.py +65 -7
  30. meerk40t/gui/propertypanels/operationpropertymain.py +185 -91
  31. meerk40t/gui/scenewidgets/elementswidget.py +7 -1
  32. meerk40t/gui/scenewidgets/selectionwidget.py +24 -9
  33. meerk40t/gui/simulation.py +1 -1
  34. meerk40t/gui/statusbarwidgets/shapepropwidget.py +50 -40
  35. meerk40t/gui/statusbarwidgets/statusbar.py +2 -2
  36. meerk40t/gui/toolwidgets/toolmeasure.py +1 -1
  37. meerk40t/gui/toolwidgets/toolnodeedit.py +4 -1
  38. meerk40t/gui/toolwidgets/tooltabedit.py +9 -7
  39. meerk40t/gui/wxmeerk40t.py +2 -0
  40. meerk40t/gui/wxmmain.py +23 -9
  41. meerk40t/gui/wxmribbon.py +36 -0
  42. meerk40t/gui/wxutils.py +66 -42
  43. meerk40t/kernel/inhibitor.py +120 -0
  44. meerk40t/kernel/kernel.py +38 -0
  45. meerk40t/lihuiyu/controller.py +33 -3
  46. meerk40t/lihuiyu/device.py +99 -4
  47. meerk40t/lihuiyu/driver.py +62 -5
  48. meerk40t/lihuiyu/gui/lhycontrollergui.py +69 -24
  49. meerk40t/lihuiyu/gui/lhydrivergui.py +6 -0
  50. meerk40t/lihuiyu/laserspeed.py +17 -10
  51. meerk40t/lihuiyu/parser.py +23 -0
  52. meerk40t/main.py +1 -1
  53. meerk40t/moshi/gui/moshidrivergui.py +7 -0
  54. meerk40t/newly/controller.py +3 -2
  55. meerk40t/newly/device.py +23 -2
  56. meerk40t/newly/driver.py +8 -3
  57. meerk40t/newly/gui/newlyconfig.py +7 -0
  58. meerk40t/ruida/gui/ruidaconfig.py +7 -0
  59. meerk40t/tools/geomstr.py +68 -48
  60. meerk40t/tools/rasterplotter.py +0 -5
  61. meerk40t/tools/ttfparser.py +155 -82
  62. {meerk40t-0.9.7050.dist-info → meerk40t-0.9.7900.dist-info}/METADATA +1 -1
  63. {meerk40t-0.9.7050.dist-info → meerk40t-0.9.7900.dist-info}/RECORD +68 -67
  64. {meerk40t-0.9.7050.dist-info → meerk40t-0.9.7900.dist-info}/LICENSE +0 -0
  65. {meerk40t-0.9.7050.dist-info → meerk40t-0.9.7900.dist-info}/WHEEL +0 -0
  66. {meerk40t-0.9.7050.dist-info → meerk40t-0.9.7900.dist-info}/entry_points.txt +0 -0
  67. {meerk40t-0.9.7050.dist-info → meerk40t-0.9.7900.dist-info}/top_level.txt +0 -0
  68. {meerk40t-0.9.7050.dist-info → meerk40t-0.9.7900.dist-info}/zip-safe +0 -0
@@ -31,9 +31,9 @@ from meerk40t.gui.scene.scene import (
31
31
  from meerk40t.gui.scene.sceneconst import HITCHAIN_HIT_AND_DELEGATE
32
32
  from meerk40t.gui.scene.widget import Widget
33
33
  from meerk40t.gui.wxutils import (
34
- dip_size,
35
34
  StaticBoxSizer,
36
35
  create_menu_for_node,
36
+ dip_size,
37
37
  get_gc_full_scale,
38
38
  get_matrix_scale,
39
39
  wxButton,
@@ -178,6 +178,7 @@ def process_event(
178
178
  else:
179
179
  return RESPONSE_CHAIN
180
180
 
181
+
181
182
  def update_elements(scene):
182
183
  elements = scene.context.elements
183
184
  with elements.undofree():
@@ -267,7 +268,9 @@ class BorderWidget(Widget):
267
268
  gc.StrokeLine(sx * center_x, sy * 0, sx * center_x, sy * self.top)
268
269
  gc.StrokeLine(sx * 0, sy * center_y, sx * self.left, sy * center_y)
269
270
  if self.show_rb:
270
- gc.StrokeLine(sx * center_x, sy * self.bottom, sx * center_x, sy * bed_h)
271
+ gc.StrokeLine(
272
+ sx * center_x, sy * self.bottom, sx * center_x, sy * bed_h
273
+ )
271
274
  gc.StrokeLine(sx * self.right, sy * center_y, sx * bed_w, sy * center_y)
272
275
 
273
276
  mypen.SetStyle(wx.PENSTYLE_DOT)
@@ -308,7 +311,9 @@ class BorderWidget(Widget):
308
311
  # Show Y-Value
309
312
  s_txt = str(Length(amount=self.top, digits=2, preferred_units=units))
310
313
  (t_width, t_height) = gc.GetTextExtent(s_txt)
311
- distance = 0.25 * t_height # No text in the way, so a minimal gap suffices
314
+ distance = (
315
+ 0.25 * t_height
316
+ ) # No text in the way, so a minimal gap suffices
312
317
  pos = self.top / 2.0 - t_height / 2
313
318
  if pos + t_height + distance >= self.top:
314
319
  pos = self.top - t_height - distance
@@ -325,7 +330,7 @@ class BorderWidget(Widget):
325
330
  rpos = bed_h - self.bottom
326
331
  s_txt = str(Length(amount=rpos, digits=2, preferred_units=units))
327
332
  (t_width, t_height) = gc.GetTextExtent(s_txt)
328
- distance = 1.5 * t_height # There's text in the way
333
+ distance = 1.5 * t_height # There's text in the way
329
334
  pos = self.bottom + rpos / 2 - t_height / 2
330
335
  if pos - t_height - distance <= self.bottom:
331
336
  pos = self.bottom + distance
@@ -804,7 +809,7 @@ class CornerWidget(Widget):
804
809
  # dx = position[4]
805
810
  # dy = position[5]
806
811
 
807
- if event == 1: # End
812
+ if event == 1: # End
808
813
  update_elements(self.scene)
809
814
  elif event == -1:
810
815
  self.scene.pane.modif_active = True
@@ -1474,7 +1479,9 @@ class MoveWidget(Widget):
1474
1479
  e.text = elements.wordlist_delta(copy_node.text, delta_wordlist)
1475
1480
  e.altered()
1476
1481
  changed_nodes.append(e)
1477
- elif elements.copy_increases_wordlist_references and hasattr(e, "mktext"):
1482
+ elif elements.copy_increases_wordlist_references and hasattr(
1483
+ e, "mktext"
1484
+ ):
1478
1485
  e.mktext = elements.wordlist_delta(e.mktext, delta_wordlist)
1479
1486
  e.altered()
1480
1487
  changed_nodes.append(e)
@@ -1629,7 +1636,7 @@ class MoveWidget(Widget):
1629
1636
 
1630
1637
  # Return the coordinates of the two points
1631
1638
  return min_dist, p1[min_indices[0][0]], p2[min_indices[0][1]]
1632
- except Exception: # out of memory eg
1639
+ except Exception: # out of memory eg
1633
1640
  return None, None, None
1634
1641
 
1635
1642
  b = elements._emphasized_bounds
@@ -1673,7 +1680,9 @@ class MoveWidget(Widget):
1673
1680
  if seg_type in NON_GEOMETRY_TYPES:
1674
1681
  continue
1675
1682
  if np.isnan(start) or np.isnan(end):
1676
- print (f"Strange, encountered within selectionwidget a segment with type: {seg_type} and start={start}, end={end} - coming from element type {e.type}\nPlease inform the developers")
1683
+ print(
1684
+ f"Strange, encountered within selectionwidget a segment with type: {seg_type} and start={start}, end={end} - coming from element type {e.type}\nPlease inform the developers"
1685
+ )
1677
1686
  continue
1678
1687
  if start != last:
1679
1688
  xx = start.real
@@ -1762,7 +1771,9 @@ class MoveWidget(Widget):
1762
1771
  move_to(lastdx, lastdy, interim=False)
1763
1772
  else:
1764
1773
  move_to(
1765
- lastdx - self.master.offset_x, lastdy - self.master.offset_y, interim=False
1774
+ lastdx - self.master.offset_x,
1775
+ lastdy - self.master.offset_y,
1776
+ interim=False,
1766
1777
  )
1767
1778
  self.check_for_magnets()
1768
1779
  # if abs(self.total_dx) + abs(self.total_dy) > 1e-3:
@@ -2715,11 +2726,13 @@ class SelectionWidget(Widget):
2715
2726
  smallest = bool(self.scene.context.select_smallest) != bool(
2716
2727
  "ctrl" in modifiers
2717
2728
  )
2729
+ use_files = bool(self.scene.context.file_selection)
2718
2730
  elements.set_emphasized_by_position(
2719
2731
  space_pos,
2720
2732
  keep_old_selection=False,
2721
2733
  use_smallest=smallest,
2722
2734
  exit_over_selection=True,
2735
+ force_filenodes_too=use_files,
2723
2736
  )
2724
2737
  # Check if reference is still existing
2725
2738
  self.scene.pane.validate_reference()
@@ -2735,11 +2748,13 @@ class SelectionWidget(Widget):
2735
2748
  smallest = bool(self.scene.context.select_smallest) != bool(
2736
2749
  "ctrl" in modifiers
2737
2750
  )
2751
+ use_files = bool(self.scene.context.file_selection)
2738
2752
  elements.set_emphasized_by_position(
2739
2753
  space_pos,
2740
2754
  keep_old_selection=False,
2741
2755
  use_smallest=smallest,
2742
2756
  exit_over_selection=True,
2757
+ force_filenodes_too=use_files,
2743
2758
  )
2744
2759
  elements.signal("activate_selected_nodes", 0)
2745
2760
  return RESPONSE_CONSUME
@@ -1133,8 +1133,8 @@ class SimulationPanel(wx.Panel, Job):
1133
1133
  self.btn_redo_it.Reparent(self.subpanel_optimize)
1134
1134
 
1135
1135
  self.checkbox_optimize.SetMinSize(dip_size(self, -1, 23))
1136
- opt_sizer.Add(self.options_optimize, 1, wx.EXPAND, 0)
1137
1136
  opt_sizer.Add(self.checkbox_optimize, 0, wx.EXPAND, 0)
1137
+ opt_sizer.Add(self.options_optimize, 1, wx.EXPAND, 0)
1138
1138
  opt_sizer.Add(self.btn_redo_it, 0, wx.EXPAND, 0)
1139
1139
  self.subpanel_optimize.SetSizer(opt_sizer)
1140
1140
  self.subpanel_optimize.Layout()
@@ -1,7 +1,7 @@
1
1
  import wx
2
2
 
3
3
  from meerk40t.core.elements.element_types import elem_nodes
4
- from meerk40t.core.units import Length, UNITS_PER_PIXEL
4
+ from meerk40t.core.units import UNITS_PER_PIXEL, Length
5
5
  from meerk40t.gui.icons import (
6
6
  icon_cap_butt,
7
7
  icon_cap_round,
@@ -41,38 +41,40 @@ class LinecapWidget(StatusBarWidget):
41
41
  )
42
42
  )
43
43
  self.btn_cap_butt = wxStaticBitmap(
44
- self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
44
+ self.parent,
45
+ id=wx.ID_ANY,
46
+ size=wx.Size(self.height, -1),
47
+ style=wx.BORDER_RAISED,
45
48
  )
46
- isize = int(max(20, self.parent.available_height - 4) * self.context.root.bitmap_correction_scale)
47
-
48
- self.btn_cap_butt.SetBitmap(
49
- icon_cap_butt.GetBitmap(
50
- resize=isize, buffer=1
51
- )
49
+ isize = int(
50
+ max(20, self.parent.available_height - 4)
51
+ * self.context.root.bitmap_correction_scale
52
52
  )
53
+
54
+ self.btn_cap_butt.SetBitmap(icon_cap_butt.GetBitmap(resize=isize, buffer=1))
53
55
  self.btn_cap_butt.SetMaxSize(wx.Size(50, -1))
54
56
  self.btn_cap_butt.SetToolTip(_("Set the end of the lines to a butt-shape"))
55
57
  self.btn_cap_butt.Bind(wx.EVT_LEFT_DOWN, self.on_cap_butt)
56
58
 
57
59
  self.btn_cap_round = wxStaticBitmap(
58
- self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
59
- )
60
- self.btn_cap_round.SetBitmap(
61
- icon_cap_round.GetBitmap(
62
- resize=isize, buffer=1
63
- )
60
+ self.parent,
61
+ id=wx.ID_ANY,
62
+ size=wx.Size(self.height, -1),
63
+ style=wx.BORDER_RAISED,
64
64
  )
65
+ self.btn_cap_round.SetBitmap(icon_cap_round.GetBitmap(resize=isize, buffer=1))
65
66
  self.btn_cap_round.SetMaxSize(wx.Size(50, -1))
66
67
  self.btn_cap_round.SetToolTip(_("Set the end of the lines to a round-shape"))
67
68
  self.btn_cap_round.Bind(wx.EVT_LEFT_DOWN, self.on_cap_round)
68
69
 
69
70
  self.btn_cap_square = wxStaticBitmap(
70
- self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
71
+ self.parent,
72
+ id=wx.ID_ANY,
73
+ size=wx.Size(self.height, -1),
74
+ style=wx.BORDER_RAISED,
71
75
  )
72
76
 
73
- self.btn_cap_square.SetBitmap(
74
- icon_cap_square.GetBitmap(resize=isize, buffer=1)
75
- )
77
+ self.btn_cap_square.SetBitmap(icon_cap_square.GetBitmap(resize=isize, buffer=1))
76
78
  self.btn_cap_square.SetMaxSize(wx.Size(50, -1))
77
79
  self.btn_cap_square.SetToolTip(_("Set the end of the lines to a square-shape"))
78
80
  self.btn_cap_square.Bind(wx.EVT_LEFT_DOWN, self.on_cap_square)
@@ -116,16 +118,14 @@ class LinejoinWidget(StatusBarWidget):
116
118
  )
117
119
  )
118
120
  isize = int(
119
- max(20, self.parent.available_height - 4) *
120
- self.context.root.bitmap_correction_scale
121
+ max(20, self.parent.available_height - 4)
122
+ * self.context.root.bitmap_correction_scale
121
123
  )
122
124
  self.btn_join_bevel = wxStaticBitmap(
123
125
  self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED
124
126
  )
125
127
 
126
- self.btn_join_bevel.SetBitmap(
127
- icon_join_bevel.GetBitmap(resize=isize, buffer=1)
128
- )
128
+ self.btn_join_bevel.SetBitmap(icon_join_bevel.GetBitmap(resize=isize, buffer=1))
129
129
  self.btn_join_bevel.SetMaxSize(wx.Size(50, -1))
130
130
  self.btn_join_bevel.SetToolTip(_("Set the join of the lines to a bevel-shape"))
131
131
  self.btn_join_bevel.Bind(wx.EVT_LEFT_DOWN, self.on_join_bevel)
@@ -133,9 +133,7 @@ class LinejoinWidget(StatusBarWidget):
133
133
  self.btn_join_round = wxStaticBitmap(
134
134
  self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED
135
135
  )
136
- self.btn_join_round.SetBitmap(
137
- icon_join_round.GetBitmap(resize=isize, buffer=1)
138
- )
136
+ self.btn_join_round.SetBitmap(icon_join_round.GetBitmap(resize=isize, buffer=1))
139
137
  self.btn_join_round.SetMaxSize(wx.Size(50, -1))
140
138
  self.btn_join_round.SetToolTip(_("Set the join of lines to a round-shape"))
141
139
  self.btn_join_round.Bind(wx.EVT_LEFT_DOWN, self.on_join_round)
@@ -143,9 +141,7 @@ class LinejoinWidget(StatusBarWidget):
143
141
  self.btn_join_miter = wxStaticBitmap(
144
142
  self.parent, id=wx.ID_ANY, size=wx.Size(25, -1), style=wx.BORDER_RAISED
145
143
  )
146
- self.btn_join_miter.SetBitmap(
147
- icon_join_miter.GetBitmap(resize=isize, buffer=1)
148
- )
144
+ self.btn_join_miter.SetBitmap(icon_join_miter.GetBitmap(resize=isize, buffer=1))
149
145
  self.btn_join_miter.SetMaxSize(wx.Size(50, -1))
150
146
  self.btn_join_miter.SetToolTip(_("Set the join of lines to a miter-shape"))
151
147
  self.btn_join_miter.Bind(wx.EVT_LEFT_DOWN, self.on_join_miter)
@@ -207,12 +203,15 @@ class FillruleWidget(StatusBarWidget):
207
203
  )
208
204
  )
209
205
  isize = int(
210
- max(20, self.parent.available_height - 4) *
211
- self.context.root.bitmap_correction_scale
206
+ max(20, self.parent.available_height - 4)
207
+ * self.context.root.bitmap_correction_scale
212
208
  )
213
209
 
214
210
  self.btn_fill_nonzero = wxStaticBitmap(
215
- self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
211
+ self.parent,
212
+ id=wx.ID_ANY,
213
+ size=wx.Size(self.height, -1),
214
+ style=wx.BORDER_RAISED,
216
215
  )
217
216
  self.btn_fill_nonzero.SetMaxSize(wx.Size(50, -1))
218
217
  self.btn_fill_nonzero.SetBitmap(
@@ -222,7 +221,10 @@ class FillruleWidget(StatusBarWidget):
222
221
  self.btn_fill_nonzero.Bind(wx.EVT_LEFT_DOWN, self.on_fill_nonzero)
223
222
 
224
223
  self.btn_fill_evenodd = wxStaticBitmap(
225
- self.parent, id=wx.ID_ANY, size=wx.Size(self.height, -1), style=wx.BORDER_RAISED
224
+ self.parent,
225
+ id=wx.ID_ANY,
226
+ size=wx.Size(self.height, -1),
227
+ style=wx.BORDER_RAISED,
226
228
  )
227
229
  self.btn_fill_evenodd.SetBitmap(
228
230
  icon_fill_evenodd.GetBitmap(resize=isize, buffer=1)
@@ -289,18 +291,27 @@ class PositionWidget(StatusBarWidget):
289
291
  self.parent, wx.ID_ANY, label=self.units[self.unit_index]
290
292
  )
291
293
  icon_size = int(
292
- max(20, self.parent.available_height - 4) *
293
- self.context.root.bitmap_correction_scale
294
+ max(20, self.parent.available_height - 8)
295
+ * self.context.root.bitmap_correction_scale
294
296
  )
295
297
 
296
- self.button_lock_ratio = wxStaticBitmap(self.parent, id=wx.ID_ANY, size=wx.Size(icon_size, -1), style=wx.BORDER_RAISED)
298
+ self.button_lock_ratio = wxStaticBitmap(
299
+ self.parent,
300
+ id=wx.ID_ANY,
301
+ size=wx.Size(icon_size, -1),
302
+ style=wx.BORDER_RAISED,
303
+ )
297
304
  self.bitmap_locked = icons8_lock.GetBitmap(resize=icon_size, use_theme=False)
298
- self.bitmap_unlocked = icons8_unlock.GetBitmap(resize=icon_size, use_theme=False)
305
+ self.bitmap_unlocked = icons8_unlock.GetBitmap(
306
+ resize=icon_size, use_theme=False
307
+ )
299
308
 
300
309
  self.offset_index = 0 # 0 to 8 tl tc tr cl cc cr bl bc br
301
310
  self.offset_x = 0.0
302
311
  self.offset_y = 0.0
303
- self.button_param = wxStaticBitmap(self.parent, id=wx.ID_ANY, size=wx.Size(icon_size, -1), style=wx.BORDER_RAISED)
312
+ self.button_param = wxStaticBitmap(
313
+ self.parent, id=wx.ID_ANY, size=wx.Size(icon_size, -1), style=wx.BORDER_NONE
314
+ )
304
315
  self.pos_bitmaps = self.calculate_icons(icon_size)
305
316
  self.button_param.SetBitmap(self.pos_bitmaps[self.offset_index])
306
317
 
@@ -369,8 +380,7 @@ class PositionWidget(StatusBarWidget):
369
380
  )
370
381
 
371
382
  self._lock_ratio = True
372
- self.lock_ratio = self.context.lock_active
373
-
383
+ self.lock_ratio = self.context.lock_active
374
384
 
375
385
  @property
376
386
  def units_name(self):
@@ -1,7 +1,7 @@
1
1
  import wx
2
2
 
3
3
  from meerk40t.gui.icons import icons8_circled_right
4
- from meerk40t.gui.wxutils import wxStaticBitmap, dip_size
4
+ from meerk40t.gui.wxutils import dip_size, wxStaticBitmap
5
5
 
6
6
  _ = wx.GetTranslation
7
7
 
@@ -61,7 +61,7 @@ class CustomStatusBar(wx.StatusBar):
61
61
  @property
62
62
  def available_height(self):
63
63
  sb_size = self.GetSize()
64
- return sb_size[1]
64
+ return max(1, sb_size[1] - 2)
65
65
 
66
66
  def Clear(self):
67
67
  """
@@ -40,7 +40,7 @@ class MeasureTool(PointListTool):
40
40
  return
41
41
  mat_fact = get_gc_scale(gc)
42
42
  try:
43
- font_size = 10.0 / mat_fact
43
+ font_size = 10.0 * self.magnification / mat_fact
44
44
  except ZeroDivisionError:
45
45
  font_size = 5000
46
46
  if font_size > 1e8:
@@ -907,7 +907,10 @@ class EditTool(ToolWidget):
907
907
  path.approximate_arcs_with_cubics()
908
908
  except AttributeError:
909
909
  return
910
- newnode = node.replace_node(path=path, type="elem path")
910
+ try:
911
+ newnode = node.replace_node(path=path, type="elem path")
912
+ except ValueError:
913
+ return
911
914
  for item in oldstuff:
912
915
  setattr(newnode, item[0], item[1])
913
916
  newnode.altered()
@@ -11,7 +11,7 @@ from meerk40t.gui.scene.sceneconst import (
11
11
  RESPONSE_DROP,
12
12
  )
13
13
  from meerk40t.gui.toolwidgets.toolwidget import ToolWidget
14
- from meerk40t.gui.wxutils import get_gc_scale
14
+ from meerk40t.gui.wxutils import get_gc_scale, dip_size
15
15
 
16
16
  _ = wx.GetTranslation
17
17
 
@@ -35,6 +35,7 @@ class SimpleSlider:
35
35
  trailer = ""
36
36
  self.trailer = trailer
37
37
  self.no_value_display = False
38
+ self.magnification = dip_size(scene.gui, 100, 100)[1] / 100
38
39
 
39
40
  @property
40
41
  def value(self):
@@ -77,7 +78,7 @@ class SimpleSlider:
77
78
  """
78
79
  gc.PushState()
79
80
  s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
80
- offset = self.pt_offset / s
81
+ offset = self.pt_offset * self.magnification / s
81
82
 
82
83
  mypen = wx.Pen(wx.LIGHT_GREY)
83
84
  sx = get_gc_scale(gc)
@@ -119,7 +120,7 @@ class SimpleSlider:
119
120
  if not self.trailer.startswith("%"):
120
121
  symbol += " "
121
122
  symbol += _(self.trailer)
122
- font_size = 10 / s
123
+ font_size = 10 * self.magnification / s
123
124
  if font_size < 1.0:
124
125
  font_size = 1.0
125
126
  try:
@@ -146,7 +147,7 @@ class SimpleSlider:
146
147
 
147
148
  def hit(self, xpos, ypos):
148
149
  s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
149
- offset = self.pt_offset / s
150
+ offset = self.pt_offset * self.magnification / s
150
151
  inside = bool(abs(self.ptx - xpos) <= offset and abs(self.pty - ypos) <= offset)
151
152
  return inside
152
153
 
@@ -177,6 +178,7 @@ class TabEditTool(ToolWidget):
177
178
  slider = SimpleSlider(0, self.scene, minval, maxval, 0, 0, self.slider_size, info )
178
179
  slider.no_value_display = True
179
180
  self.sliders.append(slider)
181
+ self.magnification = dip_size(scene.gui, 100, 100)[1] / 100
180
182
 
181
183
  def reset(self):
182
184
  self.points.clear()
@@ -358,7 +360,7 @@ class TabEditTool(ToolWidget):
358
360
  if len(self.sliders) == 0:
359
361
  return
360
362
  s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
361
- offset = self.pt_offset / s
363
+ offset = self.pt_offset * self.magnification / s
362
364
  width = self.slider_size / s
363
365
  x = bb[0]
364
366
  y = bb[1]
@@ -377,7 +379,7 @@ class TabEditTool(ToolWidget):
377
379
  """
378
380
  gc.PushState()
379
381
  s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
380
- offset = self.pt_offset / s
382
+ offset = self.pt_offset * self.magnification / s
381
383
  gc.SetPen(wx.RED_PEN)
382
384
  gc.SetBrush(wx.RED_BRUSH)
383
385
  for index, g in enumerate(self.points):
@@ -424,7 +426,7 @@ class TabEditTool(ToolWidget):
424
426
  return RESPONSE_CHAIN
425
427
  self.scene.pane.tool_active = True
426
428
  self.scene.pane.modif_active = True
427
- offset = self.pt_offset
429
+ offset = self.pt_offset * self.magnification
428
430
  s = math.sqrt(abs(self.scene.widget_root.scene_widget.matrix.determinant))
429
431
  offset /= s
430
432
  xp = space_pos[0]
@@ -1065,6 +1065,7 @@ class wxMeerK40t(wx.App, Module):
1065
1065
  register_panel_debugger,
1066
1066
  register_panel_icon,
1067
1067
  register_panel_window,
1068
+ register_panel_plotter,
1068
1069
  )
1069
1070
 
1070
1071
  kernel.register("wxpane/debug_tree", register_panel_debugger)
@@ -1072,6 +1073,7 @@ class wxMeerK40t(wx.App, Module):
1072
1073
  kernel.register("wxpane/debug_icons", register_panel_icon)
1073
1074
  kernel.register("wxpane/debug_shutdown", register_panel_crash)
1074
1075
  kernel.register("wxpane/debug_window", register_panel_window)
1076
+ kernel.register("wxpane/debug_plotter", register_panel_plotter)
1075
1077
 
1076
1078
  from meerk40t.gui.utilitywidgets.debugwidgets import register_widget_icon
1077
1079
 
meerk40t/gui/wxmmain.py CHANGED
@@ -1241,6 +1241,20 @@ class MeerK40t(MWindow):
1241
1241
  "page": "Scene",
1242
1242
  "section": "General",
1243
1243
  },
1244
+ {
1245
+ "attr": "file_selection",
1246
+ "object": context.root,
1247
+ "default": True,
1248
+ "type": bool,
1249
+ "label": _("Treat file selection as group selection"),
1250
+ "tip": _(
1251
+ "Active: Single click within the boundaries of the contained elements of a filenode selects all elements within the file"
1252
+ )
1253
+ + "\n"
1254
+ + _("Inactive: filenodes will not be used for selection"),
1255
+ "page": "Scene",
1256
+ "section": "General",
1257
+ },
1244
1258
  ]
1245
1259
  context.kernel.register_choices("preferences", choices)
1246
1260
 
@@ -3002,7 +3016,7 @@ class MeerK40t(MWindow):
3002
3016
 
3003
3017
  @context.console_command("dialog_gear", hidden=True)
3004
3018
  def gear(**kwargs):
3005
- dlg = wx.TextEntryDialog(gui, _("Enter Forced Gear"), _("Gear Entry"), "")
3019
+ dlg = wx.TextEntryDialog(gui, _("Enter Forced Gear"), _("Gear Entry"), "0")
3006
3020
  dlg.SetValue("")
3007
3021
 
3008
3022
  if dlg.ShowModal() == wx.ID_OK:
@@ -3545,6 +3559,7 @@ class MeerK40t(MWindow):
3545
3559
  if hasattr(context.kernel.busyinfo, "reparent"):
3546
3560
  context.kernel.busyinfo.reparent(self)
3547
3561
 
3562
+ @signal_listener("pane")
3548
3563
  @lookup_listener("pane")
3549
3564
  def dynamic_fill_pane_menu(self, new=None, old=None):
3550
3565
  def toggle_pane(pane_toggle):
@@ -3620,15 +3635,14 @@ class MeerK40t(MWindow):
3620
3635
  pane_name = pane.name
3621
3636
  except AttributeError:
3622
3637
  pane_name = suffix_path
3623
-
3624
- pane_caption = pane_name[0].upper() + pane_name[1:] + "."
3625
- try:
3638
+ pane_caption = ""
3639
+ src = "default"
3640
+ if hasattr(pane, "control") and hasattr(pane.control, "caption"):
3641
+ pane_caption = pane.control.caption
3642
+ elif hasattr(pane, "caption"):
3626
3643
  pane_caption = pane.caption
3627
- except AttributeError:
3628
- pass
3629
3644
  if not pane_caption:
3630
3645
  pane_caption = pane_name[0].upper() + pane_name[1:] + "."
3631
-
3632
3646
  menu_item = menu_context.Append(wx.ID_ANY, pane_caption, "", wx.ITEM_CHECK)
3633
3647
  menu_item.SetHelp(helptext)
3634
3648
  self.Bind(
@@ -5611,7 +5625,7 @@ class MeerK40t(MWindow):
5611
5625
  Zoom scene to bed size.
5612
5626
  """
5613
5627
  zoom = self.context.zoom_margin
5614
- self.context(f"scene focus -a {-zoom}% {-zoom}% {zoom+100}% {zoom+100}%\n")
5628
+ self.context(f"scene focus -a {-zoom}% {-zoom}% {zoom + 100}% {zoom + 100}%\n")
5615
5629
 
5616
5630
  def update_statusbar(self, text):
5617
5631
  self.main_statusbar.SetStatusText(text, 0)
@@ -5701,7 +5715,7 @@ class MeerK40t(MWindow):
5701
5715
  return
5702
5716
  helptext = menuitem.GetHelp()
5703
5717
  if not helptext:
5704
- helptext = f'{menuitem.GetItemLabelText()} ({_("No help text")})'
5718
+ helptext = f"{menuitem.GetItemLabelText()} ({_('No help text')})"
5705
5719
  self.update_statusbar(helptext)
5706
5720
  except RuntimeError:
5707
5721
  pass
meerk40t/gui/wxmribbon.py CHANGED
@@ -678,6 +678,42 @@ class MKRibbonBarPanel(RibbonBarPanel):
678
678
  self.apply_enable_rules()
679
679
  self.redrawn()
680
680
 
681
+ @signal_listener("icon;label")
682
+ def on_label_update(self, origin, node=None, *args):
683
+ """
684
+ Signal to update the icon or label of a button.
685
+ This is used to update the icon or label of a button when it changes.
686
+ """
687
+ if node is None or len(args) == 0:
688
+ return
689
+ if not isinstance(node, (list, tuple)):
690
+ node = [node]
691
+ newlabel = None
692
+ newtooltip = None
693
+ if isinstance(args[0], (list, tuple)):
694
+ newlabel = args[0][0] if len(args[0]) > 0 else None
695
+ newtooltip = args[0][1] if len(args[0]) > 1 else None
696
+ else:
697
+ newlabel = args[0] # First argument is the new label
698
+ if newlabel is None and newtooltip is None:
699
+ return
700
+ for page in self.pages:
701
+ for panel in page.panels:
702
+ for button in panel.buttons:
703
+ if button.identifier in node:
704
+ button.label = newlabel if newlabel is not None else button.label
705
+ button.tip = (
706
+ newtooltip if newtooltip is not None else button.tip
707
+ )
708
+ if "multi" in button.button_dict:
709
+ for subbutton in button.button_dict["multi"]:
710
+ if subbutton["identifier"] in node:
711
+ if newlabel is not None:
712
+ subbutton["label"] = newlabel
713
+ if newtooltip is not None:
714
+ subbutton["tip"] = newtooltip
715
+ self.redrawn()
716
+
681
717
  @signal_listener("tool_changed")
682
718
  def on_tool_changed(self, origin, newtool=None, *args):
683
719
  # Signal provides a tuple with (togglegroup, id)