- fixed an issue that caused the impossibility to load a GCode file that contained the % symbol even when was loaded in a regular way from the File menu

- re-added the CNC tool diameter entry for the CNCjob object in Selected tab.FCSpinner
- since the CNCjob geometry creation is only useful for graphical purposes and have no impact on the GCode creation I have removed the cascaded union on the GCode geometry therefore speeding up the Gcode display by many factors (perhaps hundreds of times faster)
This commit is contained in:
Marius Stanciu
2019-10-14 22:26:50 +03:00
committed by Marius
parent 5580c49a92
commit d43ec01cdd
5 changed files with 51 additions and 36 deletions

View File

@@ -8909,7 +8909,7 @@ class App(QtCore.QObject):
else:
for filename in filenames:
if filename != '':
self.worker_task.emit({'fcn': self.open_gcode, 'params': [filename]})
self.worker_task.emit({'fcn': self.open_gcode, 'params': [filename, None, True]})
def on_file_openproject(self, checked=None):
"""
@@ -10803,7 +10803,7 @@ class App(QtCore.QObject):
self.inform.emit('[success] %s: %s' %
(_("Opened"), filename))
def open_gcode(self, filename, outname=None, plot=True):
def open_gcode(self, filename, outname=None, force_parsing=None, plot=True):
"""
Opens a G-gcode file, parses it and creates a new object for
it in the program. Thread-safe.
@@ -10824,6 +10824,7 @@ class App(QtCore.QObject):
assert isinstance(app_obj_, App), \
"Initializer expected App, got %s" % type(app_obj_)
app_obj_.inform.emit('%s...' % _("Reading GCode file"))
try:
f = open(filename)
gcode = f.read()
@@ -10835,7 +10836,7 @@ class App(QtCore.QObject):
job_obj.gcode = gcode
ret = job_obj.gcode_parse()
ret = job_obj.gcode_parse(force_parsing=force_parsing)
if ret == "fail":
self.inform.emit('[ERROR_NOTCL] %s' %
_("This is not GCODE"))
@@ -10852,7 +10853,8 @@ class App(QtCore.QObject):
ret = self.new_object("cncjob", name, obj_init, autoselected=False, plot=plot)
if ret == 'fail':
self.inform.emit('[ERROR_NOTCL] %s' %
_("Failed to create CNCJob Object. Probable not a GCode file.\n "
_("Failed to create CNCJob Object. Probable not a GCode file. "
"Try to load it from File menu.\n "
"Attempting to create a FlatCAM CNCJob Object from "
"G-Code file failed during processing"))
return "fail"