meerk40t 0.9.3001__py2.py3-none-any.whl → 0.9.7020__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 (446) hide show
  1. meerk40t/__init__.py +1 -1
  2. meerk40t/balormk/balor_params.py +167 -167
  3. meerk40t/balormk/clone_loader.py +457 -457
  4. meerk40t/balormk/controller.py +1566 -1512
  5. meerk40t/balormk/cylindermod.py +64 -0
  6. meerk40t/balormk/device.py +966 -1959
  7. meerk40t/balormk/driver.py +778 -591
  8. meerk40t/balormk/galvo_commands.py +1194 -0
  9. meerk40t/balormk/gui/balorconfig.py +237 -111
  10. meerk40t/balormk/gui/balorcontroller.py +191 -184
  11. meerk40t/balormk/gui/baloroperationproperties.py +116 -115
  12. meerk40t/balormk/gui/corscene.py +845 -0
  13. meerk40t/balormk/gui/gui.py +179 -147
  14. meerk40t/balormk/livelightjob.py +466 -382
  15. meerk40t/balormk/mock_connection.py +131 -109
  16. meerk40t/balormk/plugin.py +133 -135
  17. meerk40t/balormk/usb_connection.py +306 -301
  18. meerk40t/camera/__init__.py +1 -1
  19. meerk40t/camera/camera.py +514 -397
  20. meerk40t/camera/gui/camerapanel.py +1241 -1095
  21. meerk40t/camera/gui/gui.py +58 -58
  22. meerk40t/camera/plugin.py +441 -399
  23. meerk40t/ch341/__init__.py +27 -27
  24. meerk40t/ch341/ch341device.py +628 -628
  25. meerk40t/ch341/libusb.py +595 -589
  26. meerk40t/ch341/mock.py +171 -171
  27. meerk40t/ch341/windriver.py +157 -157
  28. meerk40t/constants.py +13 -0
  29. meerk40t/core/__init__.py +1 -1
  30. meerk40t/core/bindalias.py +550 -539
  31. meerk40t/core/core.py +47 -47
  32. meerk40t/core/cutcode/cubiccut.py +73 -73
  33. meerk40t/core/cutcode/cutcode.py +315 -312
  34. meerk40t/core/cutcode/cutgroup.py +141 -137
  35. meerk40t/core/cutcode/cutobject.py +192 -185
  36. meerk40t/core/cutcode/dwellcut.py +37 -37
  37. meerk40t/core/cutcode/gotocut.py +29 -29
  38. meerk40t/core/cutcode/homecut.py +29 -29
  39. meerk40t/core/cutcode/inputcut.py +34 -34
  40. meerk40t/core/cutcode/linecut.py +33 -33
  41. meerk40t/core/cutcode/outputcut.py +34 -34
  42. meerk40t/core/cutcode/plotcut.py +335 -335
  43. meerk40t/core/cutcode/quadcut.py +61 -61
  44. meerk40t/core/cutcode/rastercut.py +168 -148
  45. meerk40t/core/cutcode/waitcut.py +34 -34
  46. meerk40t/core/cutplan.py +1843 -1316
  47. meerk40t/core/drivers.py +330 -329
  48. meerk40t/core/elements/align.py +801 -669
  49. meerk40t/core/elements/branches.py +1858 -1507
  50. meerk40t/core/elements/clipboard.py +229 -219
  51. meerk40t/core/elements/element_treeops.py +4595 -2837
  52. meerk40t/core/elements/element_types.py +125 -105
  53. meerk40t/core/elements/elements.py +4315 -3617
  54. meerk40t/core/elements/files.py +117 -64
  55. meerk40t/core/elements/geometry.py +473 -224
  56. meerk40t/core/elements/grid.py +467 -316
  57. meerk40t/core/elements/materials.py +158 -94
  58. meerk40t/core/elements/notes.py +50 -38
  59. meerk40t/core/elements/offset_clpr.py +934 -912
  60. meerk40t/core/elements/offset_mk.py +963 -955
  61. meerk40t/core/elements/penbox.py +339 -267
  62. meerk40t/core/elements/placements.py +300 -83
  63. meerk40t/core/elements/render.py +785 -687
  64. meerk40t/core/elements/shapes.py +2618 -2092
  65. meerk40t/core/elements/testcases.py +105 -0
  66. meerk40t/core/elements/trace.py +651 -563
  67. meerk40t/core/elements/tree_commands.py +415 -409
  68. meerk40t/core/elements/undo_redo.py +116 -58
  69. meerk40t/core/elements/wordlist.py +319 -200
  70. meerk40t/core/exceptions.py +9 -9
  71. meerk40t/core/laserjob.py +220 -220
  72. meerk40t/core/logging.py +63 -63
  73. meerk40t/core/node/blobnode.py +83 -86
  74. meerk40t/core/node/bootstrap.py +105 -103
  75. meerk40t/core/node/branch_elems.py +40 -31
  76. meerk40t/core/node/branch_ops.py +45 -38
  77. meerk40t/core/node/branch_regmark.py +48 -41
  78. meerk40t/core/node/cutnode.py +29 -32
  79. meerk40t/core/node/effect_hatch.py +375 -257
  80. meerk40t/core/node/effect_warp.py +398 -0
  81. meerk40t/core/node/effect_wobble.py +441 -309
  82. meerk40t/core/node/elem_ellipse.py +404 -309
  83. meerk40t/core/node/elem_image.py +1082 -801
  84. meerk40t/core/node/elem_line.py +358 -292
  85. meerk40t/core/node/elem_path.py +259 -201
  86. meerk40t/core/node/elem_point.py +129 -102
  87. meerk40t/core/node/elem_polyline.py +310 -246
  88. meerk40t/core/node/elem_rect.py +376 -286
  89. meerk40t/core/node/elem_text.py +445 -418
  90. meerk40t/core/node/filenode.py +59 -40
  91. meerk40t/core/node/groupnode.py +138 -74
  92. meerk40t/core/node/image_processed.py +777 -766
  93. meerk40t/core/node/image_raster.py +156 -113
  94. meerk40t/core/node/layernode.py +31 -31
  95. meerk40t/core/node/mixins.py +135 -107
  96. meerk40t/core/node/node.py +1427 -1304
  97. meerk40t/core/node/nutils.py +117 -114
  98. meerk40t/core/node/op_cut.py +463 -335
  99. meerk40t/core/node/op_dots.py +296 -251
  100. meerk40t/core/node/op_engrave.py +414 -311
  101. meerk40t/core/node/op_image.py +755 -369
  102. meerk40t/core/node/op_raster.py +787 -522
  103. meerk40t/core/node/place_current.py +37 -40
  104. meerk40t/core/node/place_point.py +329 -126
  105. meerk40t/core/node/refnode.py +58 -47
  106. meerk40t/core/node/rootnode.py +225 -219
  107. meerk40t/core/node/util_console.py +48 -48
  108. meerk40t/core/node/util_goto.py +84 -65
  109. meerk40t/core/node/util_home.py +61 -61
  110. meerk40t/core/node/util_input.py +102 -102
  111. meerk40t/core/node/util_output.py +102 -102
  112. meerk40t/core/node/util_wait.py +65 -65
  113. meerk40t/core/parameters.py +709 -707
  114. meerk40t/core/planner.py +875 -785
  115. meerk40t/core/plotplanner.py +656 -652
  116. meerk40t/core/space.py +120 -113
  117. meerk40t/core/spoolers.py +706 -705
  118. meerk40t/core/svg_io.py +1836 -1549
  119. meerk40t/core/treeop.py +534 -445
  120. meerk40t/core/undos.py +278 -124
  121. meerk40t/core/units.py +784 -680
  122. meerk40t/core/view.py +393 -322
  123. meerk40t/core/webhelp.py +62 -62
  124. meerk40t/core/wordlist.py +513 -504
  125. meerk40t/cylinder/cylinder.py +247 -0
  126. meerk40t/cylinder/gui/cylindersettings.py +41 -0
  127. meerk40t/cylinder/gui/gui.py +24 -0
  128. meerk40t/device/__init__.py +1 -1
  129. meerk40t/device/basedevice.py +322 -123
  130. meerk40t/device/devicechoices.py +50 -0
  131. meerk40t/device/dummydevice.py +163 -128
  132. meerk40t/device/gui/defaultactions.py +618 -602
  133. meerk40t/device/gui/effectspanel.py +114 -0
  134. meerk40t/device/gui/formatterpanel.py +253 -290
  135. meerk40t/device/gui/warningpanel.py +337 -260
  136. meerk40t/device/mixins.py +13 -13
  137. meerk40t/dxf/__init__.py +1 -1
  138. meerk40t/dxf/dxf_io.py +766 -554
  139. meerk40t/dxf/plugin.py +47 -35
  140. meerk40t/external_plugins.py +79 -79
  141. meerk40t/external_plugins_build.py +28 -28
  142. meerk40t/extra/cag.py +112 -116
  143. meerk40t/extra/coolant.py +403 -0
  144. meerk40t/extra/encode_detect.py +204 -0
  145. meerk40t/extra/ezd.py +1165 -1165
  146. meerk40t/extra/hershey.py +834 -340
  147. meerk40t/extra/imageactions.py +322 -316
  148. meerk40t/extra/inkscape.py +628 -622
  149. meerk40t/extra/lbrn.py +424 -424
  150. meerk40t/extra/outerworld.py +283 -0
  151. meerk40t/extra/param_functions.py +1542 -1556
  152. meerk40t/extra/potrace.py +257 -253
  153. meerk40t/extra/serial_exchange.py +118 -0
  154. meerk40t/extra/updater.py +602 -453
  155. meerk40t/extra/vectrace.py +147 -146
  156. meerk40t/extra/winsleep.py +83 -83
  157. meerk40t/extra/xcs_reader.py +597 -0
  158. meerk40t/fill/fills.py +781 -335
  159. meerk40t/fill/patternfill.py +1061 -1061
  160. meerk40t/fill/patterns.py +614 -567
  161. meerk40t/grbl/control.py +87 -87
  162. meerk40t/grbl/controller.py +990 -903
  163. meerk40t/grbl/device.py +1084 -768
  164. meerk40t/grbl/driver.py +989 -771
  165. meerk40t/grbl/emulator.py +532 -497
  166. meerk40t/grbl/gcodejob.py +783 -767
  167. meerk40t/grbl/gui/grblconfiguration.py +373 -298
  168. meerk40t/grbl/gui/grblcontroller.py +485 -271
  169. meerk40t/grbl/gui/grblhardwareconfig.py +269 -153
  170. meerk40t/grbl/gui/grbloperationconfig.py +105 -0
  171. meerk40t/grbl/gui/gui.py +147 -116
  172. meerk40t/grbl/interpreter.py +44 -44
  173. meerk40t/grbl/loader.py +22 -22
  174. meerk40t/grbl/mock_connection.py +56 -56
  175. meerk40t/grbl/plugin.py +294 -264
  176. meerk40t/grbl/serial_connection.py +93 -88
  177. meerk40t/grbl/tcp_connection.py +81 -79
  178. meerk40t/grbl/ws_connection.py +112 -0
  179. meerk40t/gui/__init__.py +1 -1
  180. meerk40t/gui/about.py +2042 -296
  181. meerk40t/gui/alignment.py +1644 -1608
  182. meerk40t/gui/autoexec.py +199 -0
  183. meerk40t/gui/basicops.py +791 -670
  184. meerk40t/gui/bufferview.py +77 -71
  185. meerk40t/gui/busy.py +232 -133
  186. meerk40t/gui/choicepropertypanel.py +1662 -1469
  187. meerk40t/gui/consolepanel.py +706 -542
  188. meerk40t/gui/devicepanel.py +687 -581
  189. meerk40t/gui/dialogoptions.py +110 -107
  190. meerk40t/gui/executejob.py +316 -306
  191. meerk40t/gui/fonts.py +90 -90
  192. meerk40t/gui/functionwrapper.py +252 -0
  193. meerk40t/gui/gui_mixins.py +729 -0
  194. meerk40t/gui/guicolors.py +205 -182
  195. meerk40t/gui/help_assets/help_assets.py +218 -201
  196. meerk40t/gui/helper.py +154 -0
  197. meerk40t/gui/hersheymanager.py +1440 -846
  198. meerk40t/gui/icons.py +3422 -2747
  199. meerk40t/gui/imagesplitter.py +555 -508
  200. meerk40t/gui/keymap.py +354 -344
  201. meerk40t/gui/laserpanel.py +897 -806
  202. meerk40t/gui/laserrender.py +1470 -1232
  203. meerk40t/gui/lasertoolpanel.py +805 -793
  204. meerk40t/gui/magnetoptions.py +436 -0
  205. meerk40t/gui/materialmanager.py +2944 -0
  206. meerk40t/gui/materialtest.py +1722 -1694
  207. meerk40t/gui/mkdebug.py +646 -359
  208. meerk40t/gui/mwindow.py +163 -140
  209. meerk40t/gui/navigationpanels.py +2605 -2467
  210. meerk40t/gui/notes.py +143 -142
  211. meerk40t/gui/opassignment.py +414 -410
  212. meerk40t/gui/operation_info.py +310 -299
  213. meerk40t/gui/plugin.py +500 -328
  214. meerk40t/gui/position.py +714 -669
  215. meerk40t/gui/preferences.py +901 -650
  216. meerk40t/gui/propertypanels/attributes.py +1461 -1131
  217. meerk40t/gui/propertypanels/blobproperty.py +117 -114
  218. meerk40t/gui/propertypanels/consoleproperty.py +83 -80
  219. meerk40t/gui/propertypanels/gotoproperty.py +77 -0
  220. meerk40t/gui/propertypanels/groupproperties.py +223 -217
  221. meerk40t/gui/propertypanels/hatchproperty.py +489 -469
  222. meerk40t/gui/propertypanels/imageproperty.py +2244 -1384
  223. meerk40t/gui/propertypanels/inputproperty.py +59 -58
  224. meerk40t/gui/propertypanels/opbranchproperties.py +82 -80
  225. meerk40t/gui/propertypanels/operationpropertymain.py +1890 -1638
  226. meerk40t/gui/propertypanels/outputproperty.py +59 -58
  227. meerk40t/gui/propertypanels/pathproperty.py +389 -380
  228. meerk40t/gui/propertypanels/placementproperty.py +1214 -383
  229. meerk40t/gui/propertypanels/pointproperty.py +140 -136
  230. meerk40t/gui/propertypanels/propertywindow.py +313 -181
  231. meerk40t/gui/propertypanels/rasterwizardpanels.py +996 -912
  232. meerk40t/gui/propertypanels/regbranchproperties.py +76 -0
  233. meerk40t/gui/propertypanels/textproperty.py +770 -755
  234. meerk40t/gui/propertypanels/waitproperty.py +56 -55
  235. meerk40t/gui/propertypanels/warpproperty.py +121 -0
  236. meerk40t/gui/propertypanels/wobbleproperty.py +255 -204
  237. meerk40t/gui/ribbon.py +2471 -2210
  238. meerk40t/gui/scene/scene.py +1100 -1051
  239. meerk40t/gui/scene/sceneconst.py +22 -22
  240. meerk40t/gui/scene/scenepanel.py +439 -349
  241. meerk40t/gui/scene/scenespacewidget.py +365 -365
  242. meerk40t/gui/scene/widget.py +518 -505
  243. meerk40t/gui/scenewidgets/affinemover.py +215 -215
  244. meerk40t/gui/scenewidgets/attractionwidget.py +315 -309
  245. meerk40t/gui/scenewidgets/bedwidget.py +120 -97
  246. meerk40t/gui/scenewidgets/elementswidget.py +137 -107
  247. meerk40t/gui/scenewidgets/gridwidget.py +785 -745
  248. meerk40t/gui/scenewidgets/guidewidget.py +765 -765
  249. meerk40t/gui/scenewidgets/laserpathwidget.py +66 -66
  250. meerk40t/gui/scenewidgets/machineoriginwidget.py +86 -86
  251. meerk40t/gui/scenewidgets/nodeselector.py +28 -28
  252. meerk40t/gui/scenewidgets/rectselectwidget.py +592 -346
  253. meerk40t/gui/scenewidgets/relocatewidget.py +33 -33
  254. meerk40t/gui/scenewidgets/reticlewidget.py +83 -83
  255. meerk40t/gui/scenewidgets/selectionwidget.py +2958 -2756
  256. meerk40t/gui/simpleui.py +362 -333
  257. meerk40t/gui/simulation.py +2451 -2094
  258. meerk40t/gui/snapoptions.py +208 -203
  259. meerk40t/gui/spoolerpanel.py +1227 -1180
  260. meerk40t/gui/statusbarwidgets/defaultoperations.py +480 -353
  261. meerk40t/gui/statusbarwidgets/infowidget.py +520 -483
  262. meerk40t/gui/statusbarwidgets/opassignwidget.py +356 -355
  263. meerk40t/gui/statusbarwidgets/selectionwidget.py +172 -171
  264. meerk40t/gui/statusbarwidgets/shapepropwidget.py +754 -236
  265. meerk40t/gui/statusbarwidgets/statusbar.py +272 -260
  266. meerk40t/gui/statusbarwidgets/statusbarwidget.py +268 -270
  267. meerk40t/gui/statusbarwidgets/strokewidget.py +267 -251
  268. meerk40t/gui/themes.py +200 -78
  269. meerk40t/gui/tips.py +590 -0
  270. meerk40t/gui/toolwidgets/circlebrush.py +35 -35
  271. meerk40t/gui/toolwidgets/toolcircle.py +248 -242
  272. meerk40t/gui/toolwidgets/toolcontainer.py +82 -77
  273. meerk40t/gui/toolwidgets/tooldraw.py +97 -90
  274. meerk40t/gui/toolwidgets/toolellipse.py +219 -212
  275. meerk40t/gui/toolwidgets/toolimagecut.py +25 -132
  276. meerk40t/gui/toolwidgets/toolline.py +39 -144
  277. meerk40t/gui/toolwidgets/toollinetext.py +79 -236
  278. meerk40t/gui/toolwidgets/toollinetext_inline.py +296 -0
  279. meerk40t/gui/toolwidgets/toolmeasure.py +163 -216
  280. meerk40t/gui/toolwidgets/toolnodeedit.py +2088 -2074
  281. meerk40t/gui/toolwidgets/toolnodemove.py +92 -94
  282. meerk40t/gui/toolwidgets/toolparameter.py +754 -668
  283. meerk40t/gui/toolwidgets/toolplacement.py +108 -108
  284. meerk40t/gui/toolwidgets/toolpoint.py +68 -59
  285. meerk40t/gui/toolwidgets/toolpointlistbuilder.py +294 -0
  286. meerk40t/gui/toolwidgets/toolpointmove.py +183 -0
  287. meerk40t/gui/toolwidgets/toolpolygon.py +288 -403
  288. meerk40t/gui/toolwidgets/toolpolyline.py +38 -196
  289. meerk40t/gui/toolwidgets/toolrect.py +211 -207
  290. meerk40t/gui/toolwidgets/toolrelocate.py +72 -72
  291. meerk40t/gui/toolwidgets/toolribbon.py +598 -113
  292. meerk40t/gui/toolwidgets/tooltabedit.py +546 -0
  293. meerk40t/gui/toolwidgets/tooltext.py +98 -89
  294. meerk40t/gui/toolwidgets/toolvector.py +213 -204
  295. meerk40t/gui/toolwidgets/toolwidget.py +39 -39
  296. meerk40t/gui/usbconnect.py +98 -91
  297. meerk40t/gui/utilitywidgets/buttonwidget.py +18 -18
  298. meerk40t/gui/utilitywidgets/checkboxwidget.py +90 -90
  299. meerk40t/gui/utilitywidgets/controlwidget.py +14 -14
  300. meerk40t/gui/utilitywidgets/cyclocycloidwidget.py +343 -340
  301. meerk40t/gui/utilitywidgets/debugwidgets.py +148 -0
  302. meerk40t/gui/utilitywidgets/handlewidget.py +27 -27
  303. meerk40t/gui/utilitywidgets/harmonograph.py +450 -447
  304. meerk40t/gui/utilitywidgets/openclosewidget.py +40 -40
  305. meerk40t/gui/utilitywidgets/rotationwidget.py +54 -54
  306. meerk40t/gui/utilitywidgets/scalewidget.py +75 -75
  307. meerk40t/gui/utilitywidgets/seekbarwidget.py +183 -183
  308. meerk40t/gui/utilitywidgets/togglewidget.py +142 -142
  309. meerk40t/gui/utilitywidgets/toolbarwidget.py +8 -8
  310. meerk40t/gui/wordlisteditor.py +985 -931
  311. meerk40t/gui/wxmeerk40t.py +1447 -1169
  312. meerk40t/gui/wxmmain.py +5644 -4112
  313. meerk40t/gui/wxmribbon.py +1591 -1076
  314. meerk40t/gui/wxmscene.py +1631 -1453
  315. meerk40t/gui/wxmtree.py +2416 -2089
  316. meerk40t/gui/wxutils.py +1769 -1099
  317. meerk40t/gui/zmatrix.py +102 -102
  318. meerk40t/image/__init__.py +1 -1
  319. meerk40t/image/dither.py +429 -0
  320. meerk40t/image/imagetools.py +2793 -2269
  321. meerk40t/internal_plugins.py +150 -130
  322. meerk40t/kernel/__init__.py +63 -12
  323. meerk40t/kernel/channel.py +259 -212
  324. meerk40t/kernel/context.py +538 -538
  325. meerk40t/kernel/exceptions.py +41 -41
  326. meerk40t/kernel/functions.py +463 -414
  327. meerk40t/kernel/jobs.py +100 -100
  328. meerk40t/kernel/kernel.py +3828 -3571
  329. meerk40t/kernel/lifecycles.py +71 -71
  330. meerk40t/kernel/module.py +49 -49
  331. meerk40t/kernel/service.py +147 -147
  332. meerk40t/kernel/settings.py +383 -343
  333. meerk40t/lihuiyu/controller.py +883 -876
  334. meerk40t/lihuiyu/device.py +1181 -1069
  335. meerk40t/lihuiyu/driver.py +1466 -1372
  336. meerk40t/lihuiyu/gui/gui.py +127 -106
  337. meerk40t/lihuiyu/gui/lhyaccelgui.py +377 -363
  338. meerk40t/lihuiyu/gui/lhycontrollergui.py +741 -651
  339. meerk40t/lihuiyu/gui/lhydrivergui.py +470 -446
  340. meerk40t/lihuiyu/gui/lhyoperationproperties.py +238 -237
  341. meerk40t/lihuiyu/gui/tcpcontroller.py +226 -190
  342. meerk40t/lihuiyu/interpreter.py +53 -53
  343. meerk40t/lihuiyu/laserspeed.py +450 -450
  344. meerk40t/lihuiyu/loader.py +90 -90
  345. meerk40t/lihuiyu/parser.py +404 -404
  346. meerk40t/lihuiyu/plugin.py +101 -102
  347. meerk40t/lihuiyu/tcp_connection.py +111 -109
  348. meerk40t/main.py +231 -165
  349. meerk40t/moshi/builder.py +788 -781
  350. meerk40t/moshi/controller.py +505 -499
  351. meerk40t/moshi/device.py +495 -442
  352. meerk40t/moshi/driver.py +862 -696
  353. meerk40t/moshi/gui/gui.py +78 -76
  354. meerk40t/moshi/gui/moshicontrollergui.py +538 -522
  355. meerk40t/moshi/gui/moshidrivergui.py +87 -75
  356. meerk40t/moshi/plugin.py +43 -43
  357. meerk40t/network/console_server.py +140 -57
  358. meerk40t/network/kernelserver.py +10 -9
  359. meerk40t/network/tcp_server.py +142 -140
  360. meerk40t/network/udp_server.py +103 -77
  361. meerk40t/network/web_server.py +404 -0
  362. meerk40t/newly/controller.py +1158 -1144
  363. meerk40t/newly/device.py +874 -732
  364. meerk40t/newly/driver.py +540 -412
  365. meerk40t/newly/gui/gui.py +219 -188
  366. meerk40t/newly/gui/newlyconfig.py +116 -101
  367. meerk40t/newly/gui/newlycontroller.py +193 -186
  368. meerk40t/newly/gui/operationproperties.py +51 -51
  369. meerk40t/newly/mock_connection.py +82 -82
  370. meerk40t/newly/newly_params.py +56 -56
  371. meerk40t/newly/plugin.py +1214 -1246
  372. meerk40t/newly/usb_connection.py +322 -322
  373. meerk40t/rotary/gui/gui.py +52 -46
  374. meerk40t/rotary/gui/rotarysettings.py +240 -232
  375. meerk40t/rotary/rotary.py +202 -98
  376. meerk40t/ruida/control.py +291 -91
  377. meerk40t/ruida/controller.py +138 -1088
  378. meerk40t/ruida/device.py +676 -231
  379. meerk40t/ruida/driver.py +534 -472
  380. meerk40t/ruida/emulator.py +1494 -1491
  381. meerk40t/ruida/exceptions.py +4 -4
  382. meerk40t/ruida/gui/gui.py +71 -76
  383. meerk40t/ruida/gui/ruidaconfig.py +239 -72
  384. meerk40t/ruida/gui/ruidacontroller.py +187 -184
  385. meerk40t/ruida/gui/ruidaoperationproperties.py +48 -47
  386. meerk40t/ruida/loader.py +54 -52
  387. meerk40t/ruida/mock_connection.py +57 -109
  388. meerk40t/ruida/plugin.py +124 -87
  389. meerk40t/ruida/rdjob.py +2084 -945
  390. meerk40t/ruida/serial_connection.py +116 -0
  391. meerk40t/ruida/tcp_connection.py +146 -0
  392. meerk40t/ruida/udp_connection.py +73 -0
  393. meerk40t/svgelements.py +9671 -9669
  394. meerk40t/tools/driver_to_path.py +584 -579
  395. meerk40t/tools/geomstr.py +5583 -4680
  396. meerk40t/tools/jhfparser.py +357 -292
  397. meerk40t/tools/kerftest.py +904 -890
  398. meerk40t/tools/livinghinges.py +1168 -1033
  399. meerk40t/tools/pathtools.py +987 -949
  400. meerk40t/tools/pmatrix.py +234 -0
  401. meerk40t/tools/pointfinder.py +942 -942
  402. meerk40t/tools/polybool.py +941 -940
  403. meerk40t/tools/rasterplotter.py +1660 -547
  404. meerk40t/tools/shxparser.py +1047 -901
  405. meerk40t/tools/ttfparser.py +726 -446
  406. meerk40t/tools/zinglplotter.py +595 -593
  407. {meerk40t-0.9.3001.dist-info → meerk40t-0.9.7020.dist-info}/LICENSE +21 -21
  408. {meerk40t-0.9.3001.dist-info → meerk40t-0.9.7020.dist-info}/METADATA +150 -139
  409. meerk40t-0.9.7020.dist-info/RECORD +446 -0
  410. {meerk40t-0.9.3001.dist-info → meerk40t-0.9.7020.dist-info}/WHEEL +1 -1
  411. {meerk40t-0.9.3001.dist-info → meerk40t-0.9.7020.dist-info}/top_level.txt +0 -1
  412. {meerk40t-0.9.3001.dist-info → meerk40t-0.9.7020.dist-info}/zip-safe +1 -1
  413. meerk40t/balormk/elementlightjob.py +0 -159
  414. meerk40t-0.9.3001.dist-info/RECORD +0 -437
  415. test/bootstrap.py +0 -63
  416. test/test_cli.py +0 -12
  417. test/test_core_cutcode.py +0 -418
  418. test/test_core_elements.py +0 -144
  419. test/test_core_plotplanner.py +0 -397
  420. test/test_core_viewports.py +0 -312
  421. test/test_drivers_grbl.py +0 -108
  422. test/test_drivers_lihuiyu.py +0 -443
  423. test/test_drivers_newly.py +0 -113
  424. test/test_element_degenerate_points.py +0 -43
  425. test/test_elements_classify.py +0 -97
  426. test/test_elements_penbox.py +0 -22
  427. test/test_file_svg.py +0 -176
  428. test/test_fill.py +0 -155
  429. test/test_geomstr.py +0 -1523
  430. test/test_geomstr_nodes.py +0 -18
  431. test/test_imagetools_actualize.py +0 -306
  432. test/test_imagetools_wizard.py +0 -258
  433. test/test_kernel.py +0 -200
  434. test/test_laser_speeds.py +0 -3303
  435. test/test_length.py +0 -57
  436. test/test_lifecycle.py +0 -66
  437. test/test_operations.py +0 -251
  438. test/test_operations_hatch.py +0 -57
  439. test/test_ruida.py +0 -19
  440. test/test_spooler.py +0 -22
  441. test/test_tools_rasterplotter.py +0 -29
  442. test/test_wobble.py +0 -133
  443. test/test_zingl.py +0 -124
  444. {test → meerk40t/cylinder}/__init__.py +0 -0
  445. /meerk40t/{core/element_commands.py → cylinder/gui/__init__.py} +0 -0
  446. {meerk40t-0.9.3001.dist-info → meerk40t-0.9.7020.dist-info}/entry_points.txt +0 -0
@@ -1,652 +1,656 @@
1
- import random
2
-
3
- from meerk40t.tools.zinglplotter import ZinglPlotter
4
-
5
- from ..device.basedevice import (
6
- PLOT_AXIS,
7
- PLOT_DIRECTION,
8
- PLOT_FINISH,
9
- PLOT_JOG,
10
- PLOT_LEFT_UPPER,
11
- PLOT_RAPID,
12
- PLOT_RIGHT_LOWER,
13
- PLOT_SETTING,
14
- PLOT_START,
15
- )
16
- from .parameters import Parameters
17
-
18
- """
19
- The PlotPlanner simplifies the plotting and pulsing modifications routines. These are buffered with plottable elements.
20
- These can be submitted as destination graphics commands, or by submitting a plot routine. Which may yield either 2 or
21
- 3 value coordinates. These are x, y, and on. Where on is a number between 0 and 1 which designates the on-value. In the
22
- graphics commands the move is given a 0 and all other plots are given a 1. All graphics commands take an optional
23
- on-value. If PPI is enabled, fractional on values are made non-fractional by carrying forward the value of on as a
24
- factor applied of the total value.
25
-
26
- All plots are queued and processed in order. This queueing scheme is threadsafe, and should permit one thread reading
27
- the plot values while another thread adds additional items to the queue. If the queue completely empties any processes
28
- being applied to the plot stream are flushed prior to terminating the iterator.
29
-
30
- Provided positions can be gapped or single, with adjacent or distant values. The on value is expected to denote whether
31
- the transition from the current position to the new position should be drawn or not. Values that have an initial value
32
- of zero will remain zero.
33
-
34
- * Singles converts input into single positional shifts. This must be done to process the plot stream.
35
- * PPI does pulses per inch carry forward with the given value.
36
- * Dot Length requires any train of on-values must be of at least the proscribed length.
37
- * Shift moves isolated single-on values to be adjacent to other on-values.
38
- * Groups manipulates the output as max-length changeless orthogonal/diagonal positions.
39
- """
40
-
41
-
42
- class PlotPlanner(Parameters):
43
- def __init__(
44
- self,
45
- settings,
46
- single=True,
47
- ppi=True,
48
- shift=True,
49
- group=True,
50
- **kwargs,
51
- ):
52
- super().__init__(settings, **kwargs)
53
- self.debug = False
54
-
55
- self.abort = False
56
- self.force_shift = False
57
- self.group_enabled = True # Grouped Output Required for Lhymicro-gl.
58
- self.phase_type = 0 # Sequential, random, progressive, static.
59
- self.phase_value = 0
60
-
61
- self.queue = []
62
-
63
- self.single = None
64
- self.ppi = None
65
- self.shift = None
66
- self.group = None
67
-
68
- if single:
69
- self.single = Single(self)
70
- if ppi:
71
- self.ppi = PPI(self)
72
- if shift:
73
- self.shift = Shift(self)
74
- if group:
75
- self.group = Group(self)
76
-
77
- self.pos_x = None
78
- self.pos_y = None
79
- self.settings_then_jog = False
80
-
81
- def push(self, plot):
82
- self.abort = False
83
- self.queue.append(plot)
84
-
85
- def clear(self):
86
- self.queue.clear()
87
- self.abort = True
88
-
89
- def gen(self):
90
- """
91
- Main method of generating the plot stream.
92
-
93
- The plotplanner emits a series of 3 item values. These are x, y and on. For most plotting
94
- the values for on is 0 or 1 for off and on respectively. Values for on greater than 0 give
95
- additional information. This includes an initial jog. Settings change. Major axis. Plot direction.
96
- left_upper position and right_lower position.
97
-
98
- * If new position is not coincident with previous position
99
- * If new position is close
100
- * Plot line if close within current settings
101
- * Flush steps from planner if going to new location or using new settings.
102
- * If new position is far
103
- * Send jog if too far away.
104
- * Send PLOT_SETTING: None, None - if settings have changed.
105
- * Send PLOT_AXIS: major_axis, None - Major axis is horizontal vs. vertical raster
106
- * Send PLOT_DIRECTION: x_dir(), y_dir() - Direction X, Direction Y for initial cut.
107
- * Send PLOT_LEFT_UPPER: left point, upper point - Point at upper left
108
- * Send PLOT_RIGHT_LOWER: right point, left point - Point at lower right
109
- * Send all X, Y points for cut.
110
-
111
- If the next position is too far away and jogging is allowed we jog to the position. This
112
- jog is sent after the previous data is flushed out of the planner.
113
-
114
- cut.settings can be the same object between different cut.
115
-
116
- @return:
117
- """
118
- self.pos_x = None
119
- self.pos_y = None
120
- while len(self.queue):
121
- cut = self.queue.pop(0)
122
- start = cut.start
123
- new_start_x = start[0]
124
- new_start_y = start[1]
125
- assert isinstance(new_start_x, int)
126
- assert isinstance(new_start_y, int)
127
- flush = False
128
- jog = 0
129
- if self.pos_x != new_start_x or self.pos_y != new_start_y:
130
- # This location is disjointed. We must flush and jog.
131
- # Jog is executed in current settings.
132
- if (
133
- self.pos_x is None
134
- or self.raster_step_x != 0
135
- or self.raster_step_y != 0
136
- ):
137
- # First movement or raster_step exists we must rapid_jog.
138
- # Request rapid move new location
139
- flush = True
140
- jog |= PLOT_RAPID
141
- else:
142
- # Slow Jog to position.
143
- distance = self.jog_distance
144
- if (
145
- abs(self.pos_x - new_start_x) < distance
146
- and abs(self.pos_y - new_start_y) < distance
147
- ) or not self.jog_enable:
148
- # Jog distance smaller than threshold. Or jog isn't allowed
149
- def walk():
150
- for event in ZinglPlotter.plot_line(
151
- self.pos_x, self.pos_y, new_start_x, new_start_y
152
- ):
153
- yield event[0], event[1], 0
154
-
155
- yield from self.process_plots(walk())
156
- else:
157
- # Request standard jog new location required.
158
- flush = True
159
- jog |= PLOT_JOG
160
-
161
- # Laser Setting has changed, we must flush the buffer.
162
- if cut.settings is not self.settings:
163
- flush = True
164
-
165
- # Flush executed in current settings.
166
- if flush: # Flush if needed.
167
- yield from self.flush()
168
- self.pos_x = self.single.single_x
169
- self.pos_y = self.single.single_y
170
-
171
- # Jog was needed.
172
- if self.settings_then_jog:
173
- if cut.settings is not self.settings:
174
- self.settings = cut.settings
175
- yield None, None, PLOT_SETTING
176
-
177
- if jog:
178
- yield new_start_x, new_start_y, jog
179
- self.warp(new_start_x, new_start_y)
180
- else:
181
- if jog:
182
- yield new_start_x, new_start_y, jog
183
- self.warp(new_start_x, new_start_y)
184
-
185
- if cut.settings is not self.settings:
186
- self.settings = cut.settings
187
- yield None, None, PLOT_SETTING
188
-
189
- if jog or self.raster_step_x != 0 or self.raster_step_y != 0:
190
- # set the directions. Post Jog, Post Settings.
191
- yield cut.major_axis(), None, PLOT_AXIS
192
- yield cut.x_dir(), cut.y_dir(), PLOT_DIRECTION
193
- yield cut.left(), cut.upper(), PLOT_LEFT_UPPER
194
- yield cut.right(), cut.lower(), PLOT_RIGHT_LOWER
195
-
196
- # Plot the current.
197
- # Current is executed in cut settings.
198
- yield None, None, PLOT_START
199
- yield from self.process_plots(cut.generator())
200
- self.pos_x = self.single.single_x
201
- self.pos_y = self.single.single_y
202
-
203
- if not self.abort:
204
- # If we were not aborted, flush and finish the last positions.
205
- yield from self.flush()
206
- self.pos_x = self.single.single_x
207
- self.pos_y = self.single.single_y
208
-
209
- self.reset()
210
- self.abort = False
211
- yield None, None, PLOT_FINISH
212
-
213
- def process_plots(self, plot):
214
- """
215
- Converts a series of inputs into a series of outputs. There is not a 1:1 input to output conversion.
216
- Processes can buffer data and return None. Processes are required to surrender any buffer they have if the
217
- given sequence ends with, or is None. This flushes out any data.
218
-
219
- If an input sequence still lacks an on-value then the single_default value will be utilized.
220
- Output sequences are iterables of x, y, on positions.
221
-
222
- @param plot: plottable element that should be wrapped
223
- @return: generator to produce plottable elements.
224
- """
225
-
226
- def debug(plot, manipulator):
227
- for q in plot:
228
- print(f"Manipulator: {str(q)}, {str(manipulator)}")
229
- yield q
230
-
231
- if self.single is not None:
232
- plot = self.single.process(plot)
233
- if self.debug:
234
- plot = debug(plot, self.single)
235
- if self.ppi is not None:
236
- plot = self.ppi.process(plot)
237
- if self.debug:
238
- plot = debug(plot, self.ppi)
239
- if self.shift is not None:
240
- plot = self.shift.process(plot)
241
- if self.debug:
242
- plot = debug(plot, self.shift)
243
- if self.group is not None:
244
- plot = self.group.process(plot)
245
- if self.debug:
246
- plot = debug(plot, self.group)
247
- return plot
248
-
249
- def step_move(self, x0, y0, x1, y1):
250
- """
251
- Step move walks a line from a point to another point.
252
- """
253
- for event in ZinglPlotter.plot_line(x0, y0, x1, y1):
254
- yield event[0], event[1], 0
255
- self.pos_x = x1
256
- self.pos_y = y1
257
-
258
- def flush(self):
259
- if self.debug:
260
- print("Flushing PlotPlanner")
261
- yield from self.process_plots(None)
262
-
263
- def warp(self, x, y):
264
- self.pos_x = x
265
- self.pos_y = y
266
- if self.single:
267
- self.single.warp(x, y)
268
- if self.ppi:
269
- self.ppi.warp(x, y)
270
- if self.shift:
271
- self.shift.warp(x, y)
272
- if self.group:
273
- self.group.warp(x, y)
274
-
275
- def reset(self):
276
- if self.single:
277
- self.single.clear()
278
- if self.shift:
279
- self.shift.clear()
280
- if self.ppi:
281
- self.ppi.clear()
282
- if self.group:
283
- self.group.clear()
284
-
285
-
286
- class PlotManipulation:
287
- def __init__(self, planner: PlotPlanner):
288
- self.planner = planner
289
-
290
- def process(self, plot):
291
- pass
292
-
293
- def flush(self):
294
- pass
295
-
296
- def warp(self, x, y):
297
- pass
298
-
299
- def clear(self):
300
- pass
301
-
302
- def flushed(self):
303
- return True
304
-
305
-
306
- class Single(PlotManipulation):
307
- def __init__(self, planner: PlotPlanner):
308
- super().__init__(planner)
309
- self.single_default = 1
310
- self.single_x = None
311
- self.single_y = None
312
-
313
- def __str__(self):
314
- return f"{self.__class__.__name__}({str(self.single_x)},{str(self.single_y)})"
315
-
316
- def process(self, plot):
317
- """
318
- Convert a sequence set of positions into single unit plotted sequences.
319
-
320
- This accepts 3 (X,Y,On) or 2 (X,Y) item events
321
-
322
- single_default sets the default for any unmarked processes.
323
- single_x sets the last known x position this routine has encountered.
324
- single_y sets the last known y position this routine has encountered.
325
-
326
- @param plot: plot generator
327
- @return:
328
- """
329
- if plot is None:
330
- # None calls for a flush routine.
331
- yield from self.flush()
332
- return
333
- for event in plot:
334
- x = event[0]
335
- y = event[1]
336
- if self.single_x is None or self.single_y is None:
337
- # Our single_x or single_y position is not established.
338
- self.single_x = x
339
- self.single_y = y
340
- on = event[2] if len(event) >= 3 else self.single_default
341
-
342
- total_dx = x - self.single_x
343
- total_dy = y - self.single_y
344
- if total_dx == 0 and total_dy == 0:
345
- continue
346
- dx = 1 if total_dx > 0 else 0 if total_dx == 0 else -1
347
- dy = 1 if total_dy > 0 else 0 if total_dy == 0 else -1
348
-
349
- if total_dy * dx != total_dx * dy:
350
- # Check for cross-equality.
351
- raise ValueError(
352
- f"Must be uniformly diagonal or orthogonal: ({total_dx}, {total_dy}) is not."
353
- )
354
- cx = self.single_x
355
- cy = self.single_y
356
- for i in range(1, max(abs(total_dx), abs(total_dy)) + 1):
357
- if self.planner.abort:
358
- self.single_x = None
359
- self.single_y = None
360
- return
361
- self.single_x = cx + (i * dx)
362
- self.single_y = cy + (i * dy)
363
- yield self.single_x, self.single_y, on
364
-
365
- def flush(self):
366
- yield None, None, self.single_default
367
-
368
- def warp(self, x, y):
369
- self.single_x = x
370
- self.single_y = y
371
-
372
- def clear(self):
373
- self.single_x = None
374
- self.single_y = None
375
-
376
-
377
- class PPI(PlotManipulation):
378
- def __init__(self, planner: PlotPlanner):
379
- super().__init__(planner)
380
- self.ppi_total = 0
381
- self.dot_left = 0
382
- self._phase_set = 0
383
-
384
- def __str__(self):
385
- return f"{self.__class__.__name__}({str(self.ppi_total)},{str(self.dot_left)})"
386
-
387
- def process(self, plot):
388
- """
389
- Converts single stepped plots, to apply PPI.
390
-
391
- Implements PPI power modulation.
392
-
393
- @param plot: generator of single stepped plots, with PPI.
394
- @return:
395
- """
396
- px = None
397
- py = None
398
- for x, y, on in plot:
399
- if x is None or y is None:
400
- yield x, y, on
401
- # Sequential, random, progressive, static.
402
- if self.planner.phase_type == 1:
403
- # Random.
404
- self.ppi_total = random.randint(0, 1000)
405
- elif self.planner.phase_type == 2:
406
- # progressive
407
- self._phase_set += self.planner.phase_value
408
- self._phase_set %= 1000
409
- self.ppi_total = self._phase_set
410
- elif self.planner.phase_type == 3:
411
- # static
412
- self._phase_set = self.planner.phase_value
413
- self.ppi_total = self._phase_set
414
- continue
415
- if px is not None and py is not None:
416
- assert abs(px - x) <= 1 or abs(py - y) <= 1
417
- px = x
418
- py = y
419
- # PPI is always on.
420
- self.ppi_total += self.planner.power * on
421
- if on and self.dot_left > 0:
422
- # Process remaining dot_length, must be on or partially on.
423
- self.dot_left -= 1
424
- on = 1
425
- else:
426
- # No dot length.
427
- if self.ppi_total >= 1000.0:
428
- # PPI >= 1000: triggers on.
429
- on = 1
430
- self.ppi_total -= 1000.0 * self.planner.implicit_dotlength
431
- self.dot_left = self.planner.implicit_dotlength - 1
432
- else:
433
- # PPI < 1000: triggers off.
434
- on = 0
435
- yield x, y, on
436
-
437
-
438
- class Shift(PlotManipulation):
439
- def __init__(self, planner: PlotPlanner):
440
- super().__init__(planner)
441
- self.shift_buffer = []
442
- self.shift_pixels = 0
443
-
444
- def __str__(self):
445
- return f"{self.__class__.__name__}({str(self.shift_buffer)},{bin(self.shift_pixels)})"
446
-
447
- def process(self, plot):
448
- """
449
- Tweaks on-values to simplify them into more coherent subsections.
450
-
451
- This code requires a buffer of 4 path plots.
452
-
453
- @param plot: generator of single stepped plots
454
- @return:
455
- """
456
- for x, y, on in plot:
457
- if (x is None or y is None) or (
458
- not self.planner.force_shift and not self.planner.shift_enabled
459
- ):
460
- # If we have an established buffer, flush the buffer.
461
- yield from self.flush()
462
- # Yield the current event.
463
- yield x, y, on
464
- continue
465
-
466
- # Shift() is on.
467
- self.shift_pixels <<= 1
468
- if on:
469
- self.shift_pixels |= 1
470
- self.shift_pixels &= 0b1111
471
-
472
- self.shift_buffer.insert(0, (x, y))
473
- if self.shift_pixels == 0b0101:
474
- self.shift_pixels = 0b0011
475
- elif self.shift_pixels == 0b1010:
476
- self.shift_pixels = 0b1100
477
-
478
- if len(self.shift_buffer) >= 4:
479
- # When buffer is full start popping off values.
480
- bx, by = self.shift_buffer.pop()
481
- bon = (self.shift_pixels >> 3) & 1
482
- yield bx, by, bon
483
- # There are no more plots.
484
-
485
- def flush(self):
486
- while len(self.shift_buffer) > 0:
487
- self.shift_pixels <<= 1
488
- bx, by = self.shift_buffer.pop()
489
- bon = (self.shift_pixels >> 3) & 1
490
- yield bx, by, bon
491
- self.clear()
492
-
493
- def flushed(self):
494
- return not len(self.shift_buffer)
495
-
496
- def warp(self, x, y):
497
- self.clear()
498
-
499
- def clear(self):
500
- self.shift_pixels = 0
501
- self.shift_buffer.clear()
502
-
503
-
504
- class Group(PlotManipulation):
505
- def __init__(self, planner: PlotPlanner):
506
- super().__init__(planner)
507
- self.last_x = None
508
- self.last_y = None
509
- self.last_on = None
510
-
511
- self.group_x = None
512
- self.group_y = None
513
- self.group_on = None
514
-
515
- self.group_dx = 0
516
- self.group_dy = 0
517
-
518
- def __str__(self):
519
- return f"{self.__class__.__name__}({str(self.group_x)},{str(self.group_y)},{str(self.group_dx)},{str(self.group_dy)})"
520
-
521
- def flushed(self):
522
- return (
523
- self.last_x == self.group_x
524
- and self.last_y == self.group_y
525
- and self.last_on == self.group_on
526
- )
527
-
528
- def process(self, plot):
529
- """
530
- Converts a generated series of single stepped plots into grouped orthogonal/diagonal plots.
531
-
532
- group_x, group_y: is the last known inputted. This is not necessarily the current position given by the planner.
533
- If group_dx and group_dy are not zero, then we have buffered a move.
534
-
535
- @param plot: single stepped plots to be grouped into orth/diag sequences.
536
- @return:
537
- """
538
- px = None
539
- py = None
540
- for x, y, on in plot:
541
- if x is None or y is None:
542
- yield from self.flush()
543
- continue
544
- if px is not None and py is not None:
545
- assert abs(px - x) <= 1 or abs(py - y) <= 1
546
- px = x
547
- py = y
548
- if not self.planner.group_enabled:
549
- yield from self.flush()
550
- # Yield the current event.
551
- self.last_x = x
552
- self.last_y = y
553
- self.last_on = on
554
- yield x, y, on
555
- continue
556
- # Group() is enabled
557
- if self.group_x is None:
558
- self.group_x = x
559
- if self.group_y is None:
560
- self.group_y = y
561
- if self.group_on is None:
562
- self.group_on = on
563
- if self.group_dx != 0 or self.group_dy != 0:
564
- if (
565
- x == self.group_x + self.group_dx
566
- and y == self.group_y + self.group_dy
567
- and on == self.group_on
568
- ):
569
- # This is an orthogonal/diagonal step along the same path.
570
- self.group_x = x
571
- self.group_y = y
572
- # Mark the latest position and continue.
573
- continue
574
- # This is non orth-diag point. Must drop a point.
575
- self.last_x = self.group_x
576
- self.last_y = self.group_y
577
- self.last_on = self.group_on
578
- yield self.group_x, self.group_y, self.group_on
579
- # If we do not have a defined direction, set our current direction.
580
- self.group_dx = x - self.group_x
581
- self.group_dy = y - self.group_y
582
- if abs(self.group_dx) > 1 or abs(self.group_dy) > 1:
583
- # The last step was not valid. Group() requires single step values.
584
- raise ValueError(
585
- f"dx({self.group_dx}) or dy({self.group_dy}) exceeds 1"
586
- )
587
- # Save our buffered position.
588
- self.group_x = x
589
- self.group_y = y
590
- self.group_on = on
591
- # There are no more plots.
592
-
593
- def flush(self):
594
- if not self.flushed():
595
- # If we have an established buffer, flush the buffer.
596
- self.group_dx = 0
597
- self.group_dy = 0
598
- self.last_x = self.group_x
599
- self.last_y = self.group_y
600
- self.last_on = self.group_on
601
- if self.group_x is not None and self.group_y is not None:
602
- yield self.group_x, self.group_y, self.group_on
603
-
604
- def warp(self, x, y):
605
- self.group_x = x
606
- self.group_y = y
607
- self.group_dx = 0
608
- self.group_dy = 0
609
- self.last_x = x
610
- self.last_y = y
611
-
612
- def clear(self):
613
- self.group_x = None
614
- self.group_y = None
615
- self.group_dx = 0
616
- self.group_dy = 0
617
-
618
-
619
- def grouped(plot):
620
- """
621
- Converts a generated series of single stepped plots into grouped orthogonal/diagonal plots.
622
-
623
- @param plot: single stepped plots to be grouped into orth/diag sequences.
624
- @return:
625
- """
626
- group_x = None
627
- group_y = None
628
- group_dx = 0
629
- group_dy = 0
630
-
631
- for x, y in plot:
632
- if group_x is None:
633
- group_x = x
634
- if group_y is None:
635
- group_y = y
636
- if x == group_x + group_dx and y == group_y + group_dy:
637
- # This is an orthogonal/diagonal step along the same path.
638
- group_x = x
639
- group_y = y
640
- continue
641
- # This is non orth-diag point. Must drop a point.
642
- yield group_x, group_y
643
- # If we do not have a defined direction, set our current direction.
644
- group_dx = x - group_x
645
- group_dy = y - group_y
646
- if abs(group_dx) > 1 or abs(group_dy) > 1:
647
- # The last step was not valid.
648
- raise ValueError(f"dx({group_dx}) or dy({group_dy}) exceeds 1")
649
- group_x = x
650
- group_y = y
651
- # There are no more plots.
652
- yield group_x, group_y
1
+ import random
2
+
3
+ from meerk40t.tools.zinglplotter import ZinglPlotter
4
+
5
+ from ..device.basedevice import (
6
+ PLOT_AXIS,
7
+ PLOT_DIRECTION,
8
+ PLOT_FINISH,
9
+ PLOT_JOG,
10
+ PLOT_LEFT_UPPER,
11
+ PLOT_RAPID,
12
+ PLOT_RIGHT_LOWER,
13
+ PLOT_SETTING,
14
+ PLOT_START,
15
+ )
16
+ from .parameters import Parameters
17
+
18
+ """
19
+ The PlotPlanner simplifies the plotting and pulsing modifications routines. These are buffered with plottable elements.
20
+ These can be submitted as destination graphics commands, or by submitting a plot routine. Which may yield either 2 or
21
+ 3 value coordinates. These are x, y, and on. Where on is a number between 0 and 1 which designates the on-value. In the
22
+ graphics commands the move is given a 0 and all other plots are given a 1. All graphics commands take an optional
23
+ on-value. If PPI is enabled, fractional on values are made non-fractional by carrying forward the value of on as a
24
+ factor applied of the total value.
25
+
26
+ All plots are queued and processed in order. This queueing scheme is threadsafe, and should permit one thread reading
27
+ the plot values while another thread adds additional items to the queue. If the queue completely empties any processes
28
+ being applied to the plot stream are flushed prior to terminating the iterator.
29
+
30
+ Provided positions can be gapped or single, with adjacent or distant values. The on value is expected to denote whether
31
+ the transition from the current position to the new position should be drawn or not. Values that have an initial value
32
+ of zero will remain zero.
33
+
34
+ * Singles converts input into single positional shifts. This must be done to process the plot stream.
35
+ * PPI does pulses per inch carry forward with the given value.
36
+ * Dot Length requires any train of on-values must be of at least the proscribed length.
37
+ * Shift moves isolated single-on values to be adjacent to other on-values.
38
+ * Groups manipulates the output as max-length changeless orthogonal/diagonal positions.
39
+ """
40
+
41
+
42
+ class PlotPlanner(Parameters):
43
+ def __init__(
44
+ self,
45
+ settings,
46
+ single=True,
47
+ ppi=True,
48
+ shift=True,
49
+ group=True,
50
+ require_uniform_movement = True,
51
+ **kwargs,
52
+ ):
53
+ super().__init__(settings, **kwargs)
54
+ self.debug = False
55
+
56
+ self.abort = False
57
+ self.force_shift = False
58
+ self.group_enabled = True # Grouped Output Required for Lhymicro-gl.
59
+ self.phase_type = 0 # Sequential, random, progressive, static.
60
+ self.phase_value = 0
61
+ self.require_uniform_movement = require_uniform_movement
62
+
63
+ self.queue = []
64
+
65
+ self.single = None
66
+ self.ppi = None
67
+ self.shift = None
68
+ self.group = None
69
+
70
+ if single:
71
+ self.single = Single(self)
72
+ if ppi:
73
+ self.ppi = PPI(self)
74
+ if shift:
75
+ self.shift = Shift(self)
76
+ if group:
77
+ self.group = Group(self)
78
+
79
+ self.pos_x = None
80
+ self.pos_y = None
81
+ self.settings_then_jog = False
82
+
83
+ def push(self, plot):
84
+ self.abort = False
85
+ self.queue.append(plot)
86
+
87
+ def clear(self):
88
+ self.queue.clear()
89
+ self.abort = True
90
+
91
+ def gen(self):
92
+ """
93
+ Main method of generating the plot stream.
94
+
95
+ The plotplanner emits a series of 3 item values. These are x, y and on. For most plotting
96
+ the values for on is 0 or 1 for off and on respectively. Values for on greater than 0 give
97
+ additional information. This includes an initial jog. Settings change. Major axis. Plot direction.
98
+ left_upper position and right_lower position.
99
+
100
+ * If new position is not coincident with previous position
101
+ * If new position is close
102
+ * Plot line if close within current settings
103
+ * Flush steps from planner if going to new location or using new settings.
104
+ * If new position is far
105
+ * Send jog if too far away.
106
+ * Send PLOT_SETTING: None, None - if settings have changed.
107
+ * Send PLOT_AXIS: major_axis, None - Major axis is horizontal vs. vertical raster
108
+ * Send PLOT_DIRECTION: x_dir(), y_dir() - Direction X, Direction Y for initial cut.
109
+ * Send PLOT_LEFT_UPPER: left point, upper point - Point at upper left
110
+ * Send PLOT_RIGHT_LOWER: right point, left point - Point at lower right
111
+ * Send all X, Y points for cut.
112
+
113
+ If the next position is too far away and jogging is allowed we jog to the position. This
114
+ jog is sent after the previous data is flushed out of the planner.
115
+
116
+ cut.settings can be the same object between different cut.
117
+
118
+ @return:
119
+ """
120
+ self.pos_x = None
121
+ self.pos_y = None
122
+ while len(self.queue):
123
+ cut = self.queue.pop(0)
124
+ start = cut.start
125
+ new_start_x = start[0]
126
+ new_start_y = start[1]
127
+ assert isinstance(new_start_x, int)
128
+ assert isinstance(new_start_y, int)
129
+ flush = False
130
+ jog = 0
131
+ if self.pos_x != new_start_x or self.pos_y != new_start_y:
132
+ # This location is disjointed. We must flush and jog.
133
+ # Jog is executed in current settings.
134
+ if (
135
+ self.pos_x is None
136
+ or self.raster_step_x != 0
137
+ or self.raster_step_y != 0
138
+ ):
139
+ # First movement or raster_step exists we must rapid_jog.
140
+ # Request rapid move new location
141
+ flush = True
142
+ jog |= PLOT_RAPID
143
+ else:
144
+ # Slow Jog to position.
145
+ distance = self.jog_distance
146
+ if (
147
+ abs(self.pos_x - new_start_x) < distance
148
+ and abs(self.pos_y - new_start_y) < distance
149
+ ) or not self.jog_enable:
150
+ # Jog distance smaller than threshold. Or jog isn't allowed
151
+ def walk():
152
+ for event in ZinglPlotter.plot_line(
153
+ self.pos_x, self.pos_y, new_start_x, new_start_y
154
+ ):
155
+ yield event[0], event[1], 0
156
+
157
+ yield from self.process_plots(walk())
158
+ else:
159
+ # Request standard jog new location required.
160
+ flush = True
161
+ jog |= PLOT_JOG
162
+
163
+ # Laser Setting has changed, we must flush the buffer.
164
+ if cut.settings is not self.settings:
165
+ flush = True
166
+
167
+ # Flush executed in current settings.
168
+ if flush: # Flush if needed.
169
+ yield from self.flush()
170
+ self.pos_x = self.single.single_x
171
+ self.pos_y = self.single.single_y
172
+
173
+ # Jog was needed.
174
+ if self.settings_then_jog:
175
+ if cut.settings is not self.settings:
176
+ self.settings = cut.settings
177
+ yield None, None, PLOT_SETTING
178
+
179
+ if jog:
180
+ yield new_start_x, new_start_y, jog
181
+ self.warp(new_start_x, new_start_y)
182
+ else:
183
+ if jog:
184
+ yield new_start_x, new_start_y, jog
185
+ self.warp(new_start_x, new_start_y)
186
+
187
+ if cut.settings is not self.settings:
188
+ self.settings = cut.settings
189
+ yield None, None, PLOT_SETTING
190
+
191
+ if jog or self.raster_step_x != 0 or self.raster_step_y != 0:
192
+ # set the directions. Post Jog, Post Settings.
193
+ yield cut.major_axis(), None, PLOT_AXIS
194
+ yield cut.x_dir(), cut.y_dir(), PLOT_DIRECTION
195
+ yield cut.left(), cut.upper(), PLOT_LEFT_UPPER
196
+ yield cut.right(), cut.lower(), PLOT_RIGHT_LOWER
197
+
198
+ # Plot the current.
199
+ # Current is executed in cut settings.
200
+ yield None, None, PLOT_START
201
+ yield from self.process_plots(cut.generator())
202
+ self.pos_x = self.single.single_x
203
+ self.pos_y = self.single.single_y
204
+
205
+ if not self.abort:
206
+ # If we were not aborted, flush and finish the last positions.
207
+ yield from self.flush()
208
+ self.pos_x = self.single.single_x
209
+ self.pos_y = self.single.single_y
210
+
211
+ self.reset()
212
+ self.abort = False
213
+ yield None, None, PLOT_FINISH
214
+
215
+ def process_plots(self, plot):
216
+ """
217
+ Converts a series of inputs into a series of outputs. There is not a 1:1 input to output conversion.
218
+ Processes can buffer data and return None. Processes are required to surrender any buffer they have if the
219
+ given sequence ends with, or is None. This flushes out any data.
220
+
221
+ If an input sequence still lacks an on-value then the single_default value will be utilized.
222
+ Output sequences are iterables of x, y, on positions.
223
+
224
+ @param plot: plottable element that should be wrapped
225
+ @return: generator to produce plottable elements.
226
+ """
227
+
228
+ def debug(plot, manipulator):
229
+ for q in plot:
230
+ print(f"Manipulator: {str(q)}, {str(manipulator)}")
231
+ yield q
232
+
233
+ if self.single is not None:
234
+ plot = self.single.process(plot)
235
+ if self.debug:
236
+ plot = debug(plot, self.single)
237
+ if self.ppi is not None:
238
+ plot = self.ppi.process(plot)
239
+ if self.debug:
240
+ plot = debug(plot, self.ppi)
241
+ if self.shift is not None:
242
+ plot = self.shift.process(plot)
243
+ if self.debug:
244
+ plot = debug(plot, self.shift)
245
+ if self.group is not None:
246
+ plot = self.group.process(plot)
247
+ if self.debug:
248
+ plot = debug(plot, self.group)
249
+ return plot
250
+
251
+ def step_move(self, x0, y0, x1, y1):
252
+ """
253
+ Step move walks a line from a point to another point.
254
+ """
255
+ for event in ZinglPlotter.plot_line(x0, y0, x1, y1):
256
+ yield event[0], event[1], 0
257
+ self.pos_x = x1
258
+ self.pos_y = y1
259
+
260
+ def flush(self):
261
+ if self.debug:
262
+ print("Flushing PlotPlanner")
263
+ yield from self.process_plots(None)
264
+
265
+ def warp(self, x, y):
266
+ self.pos_x = x
267
+ self.pos_y = y
268
+ if self.single:
269
+ self.single.warp(x, y)
270
+ if self.ppi:
271
+ self.ppi.warp(x, y)
272
+ if self.shift:
273
+ self.shift.warp(x, y)
274
+ if self.group:
275
+ self.group.warp(x, y)
276
+
277
+ def reset(self):
278
+ if self.single:
279
+ self.single.clear()
280
+ if self.shift:
281
+ self.shift.clear()
282
+ if self.ppi:
283
+ self.ppi.clear()
284
+ if self.group:
285
+ self.group.clear()
286
+
287
+
288
+ class PlotManipulation:
289
+ def __init__(self, planner: PlotPlanner):
290
+ self.planner = planner
291
+
292
+ def process(self, plot):
293
+ pass
294
+
295
+ def flush(self):
296
+ pass
297
+
298
+ def warp(self, x, y):
299
+ pass
300
+
301
+ def clear(self):
302
+ pass
303
+
304
+ def flushed(self):
305
+ return True
306
+
307
+
308
+ class Single(PlotManipulation):
309
+ def __init__(self, planner: PlotPlanner):
310
+ super().__init__(planner)
311
+ self.planner = planner
312
+ self.single_default = 1
313
+ self.single_x = None
314
+ self.single_y = None
315
+
316
+ def __str__(self):
317
+ return f"{self.__class__.__name__}({str(self.single_x)},{str(self.single_y)})"
318
+
319
+ def process(self, plot):
320
+ """
321
+ Convert a sequence set of positions into single unit plotted sequences.
322
+
323
+ This accepts 3 (X,Y,On) or 2 (X,Y) item events
324
+
325
+ single_default sets the default for any unmarked processes.
326
+ single_x sets the last known x position this routine has encountered.
327
+ single_y sets the last known y position this routine has encountered.
328
+
329
+ @param plot: plot generator
330
+ @return:
331
+ """
332
+ if plot is None:
333
+ # None calls for a flush routine.
334
+ yield from self.flush()
335
+ return
336
+ for event in plot:
337
+ x = event[0]
338
+ y = event[1]
339
+ if self.single_x is None or self.single_y is None:
340
+ # Our single_x or single_y position is not established.
341
+ self.single_x = x
342
+ self.single_y = y
343
+ on = event[2] if len(event) >= 3 else self.single_default
344
+
345
+ total_dx = x - self.single_x
346
+ total_dy = y - self.single_y
347
+ if total_dx == 0 and total_dy == 0:
348
+ continue
349
+ dx = 1 if total_dx > 0 else 0 if total_dx == 0 else -1
350
+ dy = 1 if total_dy > 0 else 0 if total_dy == 0 else -1
351
+
352
+ if total_dy * dx != total_dx * dy and self.planner.require_uniform_movement:
353
+ # Check for cross-equality.
354
+ raise ValueError(
355
+ f"Must be uniformly diagonal or orthogonal: ({total_dx}, {total_dy}) is not."
356
+ )
357
+ cx = self.single_x
358
+ cy = self.single_y
359
+ for i in range(1, max(abs(total_dx), abs(total_dy)) + 1):
360
+ if self.planner.abort:
361
+ self.single_x = None
362
+ self.single_y = None
363
+ return
364
+ self.single_x = cx + (i * dx)
365
+ self.single_y = cy + (i * dy)
366
+ yield self.single_x, self.single_y, on
367
+
368
+ def flush(self):
369
+ yield None, None, self.single_default
370
+
371
+ def warp(self, x, y):
372
+ self.single_x = x
373
+ self.single_y = y
374
+
375
+ def clear(self):
376
+ self.single_x = None
377
+ self.single_y = None
378
+
379
+
380
+ class PPI(PlotManipulation):
381
+ def __init__(self, planner: PlotPlanner):
382
+ super().__init__(planner)
383
+ self.ppi_total = 0
384
+ self.dot_left = 0
385
+ self._phase_set = 0
386
+
387
+ def __str__(self):
388
+ return f"{self.__class__.__name__}({str(self.ppi_total)},{str(self.dot_left)})"
389
+
390
+ def process(self, plot):
391
+ """
392
+ Converts single stepped plots, to apply PPI.
393
+
394
+ Implements PPI power modulation.
395
+
396
+ @param plot: generator of single stepped plots, with PPI.
397
+ @return:
398
+ """
399
+ px = None
400
+ py = None
401
+ for x, y, on in plot:
402
+ if x is None or y is None:
403
+ yield x, y, on
404
+ # Sequential, random, progressive, static.
405
+ if self.planner.phase_type == 1:
406
+ # Random.
407
+ self.ppi_total = random.randint(0, 1000)
408
+ elif self.planner.phase_type == 2:
409
+ # progressive
410
+ self._phase_set += self.planner.phase_value
411
+ self._phase_set %= 1000
412
+ self.ppi_total = self._phase_set
413
+ elif self.planner.phase_type == 3:
414
+ # static
415
+ self._phase_set = self.planner.phase_value
416
+ self.ppi_total = self._phase_set
417
+ continue
418
+ if px is not None and py is not None:
419
+ assert abs(px - x) <= 1 or abs(py - y) <= 1
420
+ px = x
421
+ py = y
422
+ # PPI is always on.
423
+ self.ppi_total += self.planner.power * on
424
+ if on and self.dot_left > 0:
425
+ # Process remaining dot_length, must be on or partially on.
426
+ self.dot_left -= 1
427
+ on = 1
428
+ else:
429
+ # No dot length.
430
+ if self.ppi_total >= 1000.0:
431
+ # PPI >= 1000: triggers on.
432
+ on = 1
433
+ self.ppi_total -= 1000.0 * self.planner.implicit_dotlength
434
+ self.dot_left = self.planner.implicit_dotlength - 1
435
+ else:
436
+ # PPI < 1000: triggers off.
437
+ on = 0
438
+ yield x, y, on
439
+
440
+
441
+ class Shift(PlotManipulation):
442
+ def __init__(self, planner: PlotPlanner):
443
+ super().__init__(planner)
444
+ self.shift_buffer = []
445
+ self.shift_pixels = 0
446
+
447
+ def __str__(self):
448
+ return f"{self.__class__.__name__}({str(self.shift_buffer)},{bin(self.shift_pixels)})"
449
+
450
+ def process(self, plot):
451
+ """
452
+ Tweaks on-values to simplify them into more coherent subsections.
453
+
454
+ This code requires a buffer of 4 path plots.
455
+
456
+ @param plot: generator of single stepped plots
457
+ @return:
458
+ """
459
+ for x, y, on in plot:
460
+ if (x is None or y is None) or (
461
+ not self.planner.force_shift and not self.planner.shift_enabled
462
+ ):
463
+ # If we have an established buffer, flush the buffer.
464
+ yield from self.flush()
465
+ # Yield the current event.
466
+ yield x, y, on
467
+ continue
468
+
469
+ # Shift() is on.
470
+ self.shift_pixels <<= 1
471
+ if on:
472
+ self.shift_pixels |= 1
473
+ self.shift_pixels &= 0b1111
474
+
475
+ self.shift_buffer.insert(0, (x, y))
476
+ if self.shift_pixels == 0b0101:
477
+ self.shift_pixels = 0b0011
478
+ elif self.shift_pixels == 0b1010:
479
+ self.shift_pixels = 0b1100
480
+
481
+ if len(self.shift_buffer) >= 4:
482
+ # When buffer is full start popping off values.
483
+ bx, by = self.shift_buffer.pop()
484
+ bon = (self.shift_pixels >> 3) & 1
485
+ yield bx, by, bon
486
+ # There are no more plots.
487
+
488
+ def flush(self):
489
+ while len(self.shift_buffer) > 0:
490
+ self.shift_pixels <<= 1
491
+ bx, by = self.shift_buffer.pop()
492
+ bon = (self.shift_pixels >> 3) & 1
493
+ yield bx, by, bon
494
+ self.clear()
495
+
496
+ def flushed(self):
497
+ return not len(self.shift_buffer)
498
+
499
+ def warp(self, x, y):
500
+ self.clear()
501
+
502
+ def clear(self):
503
+ self.shift_pixels = 0
504
+ self.shift_buffer.clear()
505
+
506
+
507
+ class Group(PlotManipulation):
508
+ def __init__(self, planner: PlotPlanner):
509
+ super().__init__(planner)
510
+ self.last_x = None
511
+ self.last_y = None
512
+ self.last_on = None
513
+
514
+ self.group_x = None
515
+ self.group_y = None
516
+ self.group_on = None
517
+
518
+ self.group_dx = 0
519
+ self.group_dy = 0
520
+
521
+ def __str__(self):
522
+ return f"{self.__class__.__name__}({str(self.group_x)},{str(self.group_y)},{str(self.group_dx)},{str(self.group_dy)})"
523
+
524
+ def flushed(self):
525
+ return (
526
+ self.last_x == self.group_x
527
+ and self.last_y == self.group_y
528
+ and self.last_on == self.group_on
529
+ )
530
+
531
+ def process(self, plot):
532
+ """
533
+ Converts a generated series of single stepped plots into grouped orthogonal/diagonal plots.
534
+
535
+ group_x, group_y: is the last known inputted. This is not necessarily the current position given by the planner.
536
+ If group_dx and group_dy are not zero, then we have buffered a move.
537
+
538
+ @param plot: single stepped plots to be grouped into orth/diag sequences.
539
+ @return:
540
+ """
541
+ px = None
542
+ py = None
543
+ for x, y, on in plot:
544
+ if x is None or y is None:
545
+ yield from self.flush()
546
+ continue
547
+ if px is not None and py is not None:
548
+ assert abs(px - x) <= 1 or abs(py - y) <= 1
549
+ px = x
550
+ py = y
551
+ if not self.planner.group_enabled:
552
+ yield from self.flush()
553
+ # Yield the current event.
554
+ self.last_x = x
555
+ self.last_y = y
556
+ self.last_on = on
557
+ yield x, y, on
558
+ continue
559
+ # Group() is enabled
560
+ if self.group_x is None:
561
+ self.group_x = x
562
+ if self.group_y is None:
563
+ self.group_y = y
564
+ if self.group_on is None:
565
+ self.group_on = on
566
+ if self.group_dx != 0 or self.group_dy != 0:
567
+ if (
568
+ x == self.group_x + self.group_dx
569
+ and y == self.group_y + self.group_dy
570
+ and on == self.group_on
571
+ ):
572
+ # This is an orthogonal/diagonal step along the same path.
573
+ self.group_x = x
574
+ self.group_y = y
575
+ # Mark the latest position and continue.
576
+ continue
577
+ # This is non orth-diag point. Must drop a point.
578
+ self.last_x = self.group_x
579
+ self.last_y = self.group_y
580
+ self.last_on = self.group_on
581
+ yield self.group_x, self.group_y, self.group_on
582
+ # If we do not have a defined direction, set our current direction.
583
+ self.group_dx = x - self.group_x
584
+ self.group_dy = y - self.group_y
585
+ if abs(self.group_dx) > 1 or abs(self.group_dy) > 1:
586
+ # The last step was not valid. Group() requires single step values.
587
+ raise ValueError(
588
+ f"dx({self.group_dx}) or dy({self.group_dy}) exceeds 1"
589
+ )
590
+ # Save our buffered position.
591
+ self.group_x = x
592
+ self.group_y = y
593
+ self.group_on = on
594
+ # There are no more plots.
595
+
596
+ def flush(self):
597
+ if not self.flushed():
598
+ # If we have an established buffer, flush the buffer.
599
+ self.group_dx = 0
600
+ self.group_dy = 0
601
+ self.last_x = self.group_x
602
+ self.last_y = self.group_y
603
+ self.last_on = self.group_on
604
+ if self.group_x is not None and self.group_y is not None:
605
+ yield self.group_x, self.group_y, self.group_on
606
+
607
+ def warp(self, x, y):
608
+ self.group_x = x
609
+ self.group_y = y
610
+ self.group_dx = 0
611
+ self.group_dy = 0
612
+ self.last_x = x
613
+ self.last_y = y
614
+
615
+ def clear(self):
616
+ self.group_x = None
617
+ self.group_y = None
618
+ self.group_dx = 0
619
+ self.group_dy = 0
620
+
621
+
622
+ def grouped(plot):
623
+ """
624
+ Converts a generated series of single stepped plots into grouped orthogonal/diagonal plots.
625
+
626
+ @param plot: single stepped plots to be grouped into orth/diag sequences.
627
+ @return:
628
+ """
629
+ group_x = None
630
+ group_y = None
631
+ group_dx = 0
632
+ group_dy = 0
633
+
634
+ for x, y in plot:
635
+ if group_x is None:
636
+ group_x = x
637
+ if group_y is None:
638
+ group_y = y
639
+ if x == group_x + group_dx and y == group_y + group_dy:
640
+ # This is an orthogonal/diagonal step along the same path.
641
+ group_x = x
642
+ group_y = y
643
+ continue
644
+ # This is non orth-diag point. Must drop a point.
645
+ yield group_x, group_y
646
+ # If we do not have a defined direction, set our current direction.
647
+ group_dx = x - group_x
648
+ group_dy = y - group_y
649
+ if abs(group_dx) > 1 or abs(group_dy) > 1:
650
+ # The last step was not valid.
651
+ raise ValueError(f"dx({group_dx}) or dy({group_dy}) exceeds 1")
652
+ group_x = x
653
+ group_y = y
654
+ # There are no more plots.
655
+ yield group_x, group_y
656
+