c

xmarduel · Apr 9, 2023 · 1670d79 · 1670d79
1 parent af3626b
commit 1670d79
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/gcodeviewer/widgets/glwidget_container.py b/gcodeviewer/widgets/glwidget_container.py
@@ -149,7 +149,7 @@ def loadFile(self, fileName):
         self.loadData(gcode)
 
     def loadData(self, gcode: str):
-        data = gcode.split("\r\n")
+        data = gcode.split("\n")
 
         time = QElapsedTimer()
         time.start()

diff --git a/pycut.py b/pycut.py
@@ -397,7 +397,6 @@ def cb_save_gcode(self):
             filename = "pycut_%s_%s.nc" % (jobname, opname)
 
             gcode = self.job.gcode
-            gcode = gcode.replace('\r\n', '\n')
 
             if os.path.exists(filename):
                 k = 1

diff --git a/svgviewer.py b/svgviewer.py
@@ -705,7 +705,7 @@ def augment(self, svg_paths: List[SvgPath]) -> str:
             for key, value in shape.attrib.items():
                 svg_attrs += ' %s="%s"' % (key, value)
 
-            all_paths += '<%s %s/>\r\n' % (tag, svg_attrs)
+            all_paths += '<%s %s/>\n' % (tag, svg_attrs)
 
         for k, svg_path in enumerate(svg_paths):
             p_id = svg_path.p_id
@@ -730,7 +730,7 @@ def augment(self, svg_paths: List[SvgPath]) -> str:
                 'd_def': d_def
             }
 
-            all_paths += path + '\r\n'
+            all_paths += path + '\n'
 
         root = etree.fromstring(self.svg)
         root_attrib = root.attrib