Skip to content

Commit f033ac3

Browse files
SW-990 create a feature branch including the attached tickets (mrbeam#1481)
* SW-244 instant job time estimation revamped (mrbeam#1473) * SW-356 add an vector outline to the quicktext to support cutting letters revamped (mrbeam#1474) * SW-289 Drag the laser head cursor in the WorkingArea & Quick Shape "Line" - revamped (mrbeam#1479) * SW-890 svg embedded images are misaligned revamped (mrbeam#1480) * SW-1155 gcode files created via pixel based images sv gs engrave some parts more than once
1 parent 57570cf commit f033ac3

25 files changed

+4709
-2338
lines changed

octoprint_mrbeam/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ def get_assets(self):
636636
"js/helpers/element_helper.js",
637637
"js/helpers/debug_rendering_helper.js",
638638
"js/helpers/working_area_helper.js",
639+
"js/lib/potrace.js",
639640
"js/lib/jquery.tinycolorpicker.js",
640641
"js/lasercutterprofiles.js",
641642
"js/mother_viewmodel.js",
@@ -645,6 +646,7 @@ def get_assets(self):
645646
"js/working_area.js",
646647
"js/camera.js",
647648
"js/lib/snap.svg-min.js",
649+
"js/snap_bugfixes.js",
648650
"js/snap_helpers.js",
649651
"js/lib/dxf.js",
650652
"js/snap-dxf.js",

octoprint_mrbeam/gcodegenerator/converter.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,12 @@ def recursive_search(g, layer):
596596
# path
597597
if i.tag == _add_ns("path", "svg"):
598598
self._handle_node(i, layer)
599+
# TODO: get_path_d method is faulty; It returns None even if path exists
600+
# d = get_path_d(i)
601+
# if not d == None:
602+
# self._handle_node(i, layer)
603+
# else:
604+
# self._log.debug("Skipping path with empty d attribute.")
599605

600606
# rect, line, polygon, polyline, circle, ellipse
601607
elif (

0 commit comments

Comments
 (0)