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

CURA-4552 Change names as indicated in the review and making Marlin the

Browse source 
default flavor. Also fix the case in which the read flavor was not in
the dict.
This commit is contained in:
Diego Prado Gesto 2017-11-28 11:47:34 +01:00
parent cab2e14728
commit 8054bc3d7d
5 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/GCodeReader/GCodeReader.py
View file

@ -7,14 +7,15 @@ from UM.i18n import i18nCatalog
from UM.Preferences import Preferences
catalog = i18nCatalog("cura")
from . import GriffinFlavor, RepRapFlavor
from . import MarlinFlavorParser, RepRapFlavorParser
# Class for loading and parsing G-code files
class GCodeReader(MeshReader):
_flavor_default = "Marlin"
_flavor_keyword = ";FLAVOR:"
_flavor_readers_dict = {"Griffin" : GriffinFlavor.GriffinFlavor(),
"RepRap" : RepRapFlavor.RepRapFlavor()}
_flavor_readers_dict = {"RepRap" : RepRapFlavorParser.RepRapFlavorParser(),
"Marlin" : MarlinFlavorParser.MarlinFlavorParser()}
def __init__(self):
super(GCodeReader, self).__init__()
@ -28,11 +29,15 @@ class GCodeReader(MeshReader):
with open(file_name, "r") as file:
for line in file:
if line[:len(self._flavor_keyword)] == self._flavor_keyword:
self._flavor_reader = self._flavor_readers_dict[line[len(self._flavor_keyword):].rstrip()]
return FileReader.PreReadResult.accepted
try:
self._flavor_reader = self._flavor_readers_dict[line[len(self._flavor_keyword):].rstrip()]
return FileReader.PreReadResult.accepted
except:
# If there is no entry in the dictionary for this flavor, just skip and select the by-default flavor
break
# If no flavor is found in the GCode, then we use the by-default
self._flavor_reader = self._flavor_readers_dict["Griffin"]
self._flavor_reader = self._flavor_readers_dict[self._flavor_default]
return FileReader.PreReadResult.accepted
def read(self, file_name):