3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

GCodeProfileReader plugin properly returns a profile

Browse source 
Instead of setting the profile as the current profile, return the resulting profile.

Contributes to issue CURA-34.
This commit is contained in:
Ghostkeeper 2015-12-15 12:48:41 +01:00
parent 1f35c25b80
commit 065b954cad
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/GCodeProfileReader/GCodeProfileReader.py
View file

@ -2,6 +2,7 @@
# Cura is released under the terms of the AGPLv3 or higher. # Cura is released under the terms of the AGPLv3 or higher.
from UM.Application import Application #To get the current profile that should be updated with the settings from the g-code. from UM.Application import Application #To get the current profile that should be updated with the settings from the g-code.
from UM.Settings.Profile import Profile
from UM.Settings.ProfileReader import ProfileReader from UM.Settings.ProfileReader import ProfileReader
import re #Regular expressions for parsing escape characters in the settings. import re #Regular expressions for parsing escape characters in the settings.
@ -29,6 +30,7 @@ class GCodeProfileReader(ProfileReader):
serialised += line[len(prefix):-1] #Remove the prefix and the newline from the line, and add it to the rest. serialised += line[len(prefix):-1] #Remove the prefix and the newline from the line, and add it to the rest.
except IOError as e: except IOError as e:
Logger.log("e", "Unable to open file %s for reading: %s", file_name, str(e)) Logger.log("e", "Unable to open file %s for reading: %s", file_name, str(e))
return None
#Unescape the serialised profile. #Unescape the serialised profile.
escape_characters = { #Which special characters (keys) are replaced by what escape character (values). escape_characters = { #Which special characters (keys) are replaced by what escape character (values).
@ -42,5 +44,9 @@ class GCodeProfileReader(ProfileReader):
serialised = pattern.sub(lambda m: escape_characters[re.escape(m.group(0))], serialised) #Perform the replacement with a regular expression. serialised = pattern.sub(lambda m: escape_characters[re.escape(m.group(0))], serialised) #Perform the replacement with a regular expression.
#Apply the changes to the current profile. #Apply the changes to the current profile.
profile = Application.getInstance().getMachineManager().getActiveProfile() profile = Profile(machine_manager = Application.getInstance().getMachineManager(), read_only = False)
profile.unserialise(serialised) try:
profile.unserialise(serialised)
except Exception as e: #Not a valid g-code file.
return None
return profile