Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLipu Fei <lipu.fei815@gmail.com>2017-11-22 15:09:24 +0300
committerLipu Fei <lipu.fei815@gmail.com>2017-11-22 15:10:09 +0300
commita7a3ba950075cf1d8d4977aa1ea5a649a10045ba (patch)
tree42deb9bb4b1c9f9d12d4cdf924f1bab1969a5505 /cura/PrintInformation.py
parent3823cca93679d6c3e26d4b28ca4f20863c832ed2 (diff)
Always update the job name when a project file is loaded
CURA-4553
Diffstat (limited to 'cura/PrintInformation.py')
-rw-r--r--cura/PrintInformation.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py
index 3cced2f85c..f0c29f5b81 100644
--- a/cura/PrintInformation.py
+++ b/cura/PrintInformation.py
@@ -70,6 +70,7 @@ class PrintInformation(QObject):
Application.getInstance().globalContainerStackChanged.connect(self._updateJobName)
Application.getInstance().fileLoaded.connect(self.setBaseName)
+ Application.getInstance().workspaceLoaded.connect(self.setProjectName)
Preferences.getInstance().preferenceChanged.connect(self._onPreferencesChanged)
self._active_material_container = None
@@ -283,7 +284,11 @@ class PrintInformation(QObject):
return self._base_name
@pyqtSlot(str)
- def setBaseName(self, base_name):
+ def setProjectName(self, name):
+ self.setBaseName(name, is_project_file = True)
+
+ @pyqtSlot(str)
+ def setBaseName(self, base_name, is_project_file = False):
# Ensure that we don't use entire path but only filename
name = os.path.basename(base_name)
@@ -291,15 +296,17 @@ class PrintInformation(QObject):
# extension. This cuts the extension off if necessary.
name = os.path.splitext(name)[0]
+ # if this is a profile file, always update the job name
# name is "" when I first had some meshes and afterwards I deleted them so the naming should start again
is_empty = name == ""
- if is_empty or (self._base_name == "" and self._base_name != name):
+ if is_project_file or (is_empty or (self._base_name == "" and self._base_name != name)):
# remove ".curaproject" suffix from (imported) the file name
if name.endswith(".curaproject"):
name = name[:name.rfind(".curaproject")]
self._base_name = name
self._updateJobName()
+
## Created an acronymn-like abbreviated machine name from the currently active machine name
# Called each time the global stack is switched
def _setAbbreviatedMachineName(self):