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

Fix merge conflicts from 3.4

Browse source
This commit is contained in:
Lipu Fei 2018-06-05 09:02:52 +02:00
commit 7f7a195627
13 changed files with 187 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/Settings/MachineManager.py
View file

@ -654,6 +654,15 @@ class MachineManager(QObject):
return ""
@pyqtProperty(str, notify = activeVariantChanged)
def activeVariantId(self) -> str:
if self._active_container_stack:
variant = self._active_container_stack.variant
if variant:
return variant.getId()
return ""
@pyqtProperty(str, notify = activeVariantChanged)
def activeVariantBuildplateName(self) -> str:
if self._global_container_stack: