Merge pull request #4164 from Ultimaker/builtiplexer-output-name

Add the active build plate name to default (not user specified) job name
This commit is contained in:
Diego Prado Gesto 2018-08-01 14:04:58 +02:00 committed by GitHub
commit c842d2f89e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -267,6 +267,7 @@ class PrintInformation(QObject):
new_active_build_plate = self._multi_build_plate_model.activeBuildPlate new_active_build_plate = self._multi_build_plate_model.activeBuildPlate
if new_active_build_plate != self._active_build_plate: if new_active_build_plate != self._active_build_plate:
self._active_build_plate = new_active_build_plate self._active_build_plate = new_active_build_plate
self._updateJobName()
self._initVariablesWithBuildPlate(self._active_build_plate) self._initVariablesWithBuildPlate(self._active_build_plate)
@ -320,6 +321,15 @@ class PrintInformation(QObject):
else: else:
self._job_name = base_name self._job_name = base_name
# In case there are several buildplates, a suffix is attached
if self._multi_build_plate_model.maxBuildPlate > 0:
connector = "_#"
suffix = connector + str(self._active_build_plate + 1)
if connector in self._job_name:
self._job_name = self._job_name.split(connector)[0] # get the real name
if self._active_build_plate != 0:
self._job_name += suffix
self.jobNameChanged.emit() self.jobNameChanged.emit()
@pyqtSlot(str) @pyqtSlot(str)