T466: Added logging

This commit is contained in:
Victor Larchenko 2016-11-05 16:05:43 +06:00 committed by Youness Alaoui
parent a8dcdef4dd
commit 1932437b07

View file

@ -10,6 +10,7 @@ from UM.Math.Vector import Vector
from UM.Math.AxisAlignedBox import AxisAlignedBox
from UM.Application import Application
from UM.Message import Message
from UM.Logger import Logger
from UM.i18n import i18nCatalog
catalog = i18nCatalog("cura")
@ -78,6 +79,7 @@ class GCODEReader(MeshReader):
extension = os.path.splitext(file_name)[1]
if extension.lower() in self._supported_extensions:
Logger.log("d", "Preparing to load %s" % file_name)
Application.getInstance().deleteAll()
scene_node = SceneNode()
@ -95,6 +97,8 @@ class GCODEReader(MeshReader):
glist = getattr(Application.getInstance().getController().getScene(), "gcode_list")
glist.clear()
Logger.log("d", "Opening file %s" % file_name)
file = open(file_name, "r")
file_lines = 0
@ -120,6 +124,8 @@ class GCODEReader(MeshReader):
message.setProgress(0)
message.show()
Logger.log("d", "Parsing %s" % file_name)
def CreatePolygon():
countvalid = False
for point in current_path:
@ -162,7 +168,6 @@ class GCODEReader(MeshReader):
for line in file:
current_line += 1
if current_line % file_step == 0:
# print(current_line/file_lines*100)
message.setProgress(math.floor(current_line/file_lines*100))
if len(line) == 0:
continue
@ -219,15 +224,20 @@ class GCODEReader(MeshReader):
current_z += z
if len(current_path) > 1:
CreatePolygon()
if CreatePolygon():
current_layer += 1
layer_mesh = layer_data.build()
decorator = LayerDataDecorator.LayerDataDecorator()
decorator.setLayerData(layer_mesh)
scene_node.addDecorator(decorator)
Logger.log("d", "Finished parsing %s" % file_name)
message.hide()
if current_layer == 0:
Logger.log("w", "File %s don't contain any valid layers" % file_name)
Application.getInstance().getPrintInformation()._pre_sliced = True
scene_node.parentChanged.connect(self.parent_changed)
@ -247,4 +257,6 @@ class GCODEReader(MeshReader):
view.setLayer(999999)
view.calculateMaxLayers()
Logger.log("d", "Loaded %s" % file_name)
return scene_node