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

Fix the usage of protected variables in material models

Browse source
This commit is contained in:
Lipu Fei 2018-03-01 11:55:29 +01:00
parent 580244a546
commit c21174eea8
4 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/Machines/Models/BaseMaterialsModel.py
View file

@ -12,10 +12,9 @@ def getAvailableMaterials(extruder_position: Optional[int] = None):
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
machine_manager = CuraApplication.getInstance().getMachineManager() machine_manager = CuraApplication.getInstance().getMachineManager()
extruder_manager = CuraApplication.getInstance().getExtruderManager() extruder_manager = CuraApplication.getInstance().getExtruderManager()
material_manager = CuraApplication.getInstance().getMaterialManager()
material_manager = CuraApplication.getInstance()._material_manager active_global_stack = machine_manager.activeMachine
active_global_stack = machine_manager._global_container_stack
extruder_stack = extruder_manager.getActiveExtruderStack() extruder_stack = extruder_manager.getActiveExtruderStack()
if extruder_position is not None: if extruder_position is not None:
if active_global_stack is not None: if active_global_stack is not None:

2
cura/Machines/Models/BrandMaterialsModel.py
View file

@ -37,7 +37,7 @@ class BrandMaterialsModel(ListModel):
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
self._machine_manager = CuraApplication.getInstance().getMachineManager() self._machine_manager = CuraApplication.getInstance().getMachineManager()
extruder_manager = CuraApplication.getInstance().getExtruderManager() extruder_manager = CuraApplication.getInstance().getExtruderManager()
material_manager = CuraApplication.getInstance()._material_manager material_manager = CuraApplication.getInstance().getMaterialManager()
self._machine_manager.globalContainerChanged.connect(self._update) self._machine_manager.globalContainerChanged.connect(self._update)
extruder_manager.activeExtruderChanged.connect(self._update) extruder_manager.activeExtruderChanged.connect(self._update)

2
cura/Machines/Models/GenericMaterialsModel.py
View file

@ -12,7 +12,7 @@ class GenericMaterialsModel(BaseMaterialsModel):
from cura.CuraApplication import CuraApplication from cura.CuraApplication import CuraApplication
self._machine_manager = CuraApplication.getInstance().getMachineManager() self._machine_manager = CuraApplication.getInstance().getMachineManager()
self._extruder_manager = CuraApplication.getInstance().getExtruderManager() self._extruder_manager = CuraApplication.getInstance().getExtruderManager()
self._material_manager = CuraApplication.getInstance()._material_manager self._material_manager = CuraApplication.getInstance().getMaterialManager()
self._machine_manager.globalContainerChanged.connect(self._update) self._machine_manager.globalContainerChanged.connect(self._update)
self._extruder_manager.activeExtruderChanged.connect(self._update) self._extruder_manager.activeExtruderChanged.connect(self._update)

2
cura/Machines/Models/MaterialManagementModel.py
View file

@ -53,7 +53,7 @@ class MaterialManagementModel(ListModel):
self._container_registry = CuraApplication.getInstance().getContainerRegistry() self._container_registry = CuraApplication.getInstance().getContainerRegistry()
self._machine_manager = CuraApplication.getInstance().getMachineManager() self._machine_manager = CuraApplication.getInstance().getMachineManager()
extruder_manager = CuraApplication.getInstance().getExtruderManager() extruder_manager = CuraApplication.getInstance().getExtruderManager()
material_manager = CuraApplication.getInstance()._material_manager material_manager = CuraApplication.getInstance().getMaterialManager()
self._machine_manager.globalContainerChanged.connect(self._update) self._machine_manager.globalContainerChanged.connect(self._update)
extruder_manager.activeExtruderChanged.connect(self._update) extruder_manager.activeExtruderChanged.connect(self._update)