3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-10-10 23:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-06-03 10:06:41 +02:00
commit 3d47e3528a
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/CuraApplication.py
View file

@ -723,10 +723,12 @@ class CuraApplication(QtApplication):
def _onActiveMachineChanged(self): def _onActiveMachineChanged(self):
pass pass
fileLoaded = pyqtSignal()
def _onFileLoaded(self, job): def _onFileLoaded(self, job):
node = job.getResult() node = job.getResult()
if node != None: if node != None:
self.setJobName(os.path.basename(job.getFileName())) self.fileLoaded.emit(job.getFileName())
node.setSelectable(True) node.setSelectable(True)
node.setName(os.path.basename(job.getFileName())) node.setName(os.path.basename(job.getFileName()))
op = AddSceneNodeOperation(node, self.getController().getScene().getRoot()) op = AddSceneNodeOperation(node, self.getController().getScene().getRoot())

1
cura/PrintInformation.py
View file

@ -52,6 +52,7 @@ class PrintInformation(QObject):
self._job_name = "" self._job_name = ""
Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged) Application.getInstance().globalContainerStackChanged.connect(self._onGlobalStackChanged)
Application.getInstance().fileLoaded.connect(self.setJobName)
currentPrintTimeChanged = pyqtSignal() currentPrintTimeChanged = pyqtSignal()