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

T553: Fixed job name

Browse source
This commit is contained in:
Victor Larchenko 2016-10-21 15:26:34 +06:00 • committed by Youness Alaoui
parent 4ba8033c2a
commit 9da00563e5
2 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/PrintInformation.py
View file

@ -49,6 +49,8 @@ class PrintInformation(QObject):
self._material_lengths = []
self._material_weights = []
self._pre_sliced = False
self._backend = Application.getInstance().getBackend()
if self._backend:
self._backend.printDurationMessage.connect(self._onPrintDurationMessage)
@ -122,7 +124,9 @@ class PrintInformation(QObject):
def createJobName(self, base_name):
base_name = self._stripAccents(base_name)
self._setAbbreviatedMachineName()
if Preferences.getInstance().getValue("cura/jobname_prefix"):
if self._pre_sliced:
return "Pre-sliced_" + base_name
elif Preferences.getInstance().getValue("cura/jobname_prefix"):
return self._abbr_machine + "_" + base_name
else:
return base_name
@ -150,4 +154,4 @@ class PrintInformation(QObject):
## Utility method that strips accents from characters (eg: â -> a)
def _stripAccents(self, str):
return ''.join(char for char in unicodedata.normalize('NFD', str) if unicodedata.category(char) != 'Mn')
return ''.join(char for char in unicodedata.normalize('NFD', str) if unicodedata.category(char) != 'Mn')

52
plugins/GCODEReader/GCODEReader.py
View file

@ -58,35 +58,33 @@ class GCODEReader(MeshReader):
except:
return None
def onSceneChanged(self, obj):
scene = Application.getInstance().getController().getScene()
def parent_changed(self, node):
if node.getParent() is None:
scene = Application.getInstance().getController().getScene()
def findAny():
for node in DepthFirstIterator(scene.getRoot()):
if hasattr(node, "gcode"):
return True
return False
def findAny():
for node1 in DepthFirstIterator(scene.getRoot()):
if hasattr(node1, "gcode") and getattr(node1, "gcode") is True:
return True
return False
if not findAny():
# Preferences.getInstance().setValue("cura/jobname_prefix", True)
backend = Application.getInstance().getBackend()
backend._pauseSlicing = False
Application.getInstance().setHideSettings(False)
#Application.getInstance().getPrintInformation()._setAbbreviatedMachineName()
else:
backend = Application.getInstance().getBackend()
backend._pauseSlicing = True
backend.backendStateChange.emit(3)
Application.getInstance().getPrintInformation()._abbr_machine = "Pre-sliced"
Application.getInstance().setHideSettings(True)
if not findAny():
backend._pauseSlicing = False
Application.getInstance().setHideSettings(False)
Application.getInstance().getPrintInformation()._pre_sliced = False
else:
backend._pauseSlicing = True
backend.backendStateChange.emit(3)
Application.getInstance().getPrintInformation()._pre_sliced = True
Application.getInstance().setHideSettings(True)
def read(self, file_name):
scene_node = None
extension = os.path.splitext(file_name)[1]
if extension.lower() in self._supported_extensions:
scene = Application.getInstance().getController().getScene()
scene.sceneChanged.connect(self.onSceneChanged)
# for node in DepthFirstIterator(scene.getRoot()):
# if node.callDecoration("getLayerData"):
# node.getParent().removeChild(node)
@ -245,7 +243,12 @@ class GCODEReader(MeshReader):
decorator.setLayerData(layer_mesh)
scene_node.addDecorator(decorator)
Application.getInstance().getPrintInformation()._abbr_machine = "Pre-sliced"
Application.getInstance().getPrintInformation()._pre_sliced = True
scene_node.parentChanged.connect(self.parent_changed)
scene_node_parent = Application.getInstance().getBuildVolume()
scene_node.setParent(scene_node_parent)
@ -256,6 +259,8 @@ class GCODEReader(MeshReader):
scene_node.setPosition(Vector(-machine_width / 2, 0, machine_depth / 2))
# mesh_builder = MeshBuilder()
# mesh_builder.setFileName(file_name)
#
@ -264,11 +269,6 @@ class GCODEReader(MeshReader):
# scene_node.setMeshData(mesh_builder.build())
# scene_node.setMeshData(MeshData(file_name=file_name))
Preferences.getInstance().setValue("cura/jobname_prefix", True)
view = Application.getInstance().getController().getActiveView()
if view.getPluginId() == "LayerView":
view.resetLayerData()