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

Move getAvailableMaterials() into MaterialManager

Browse source
This commit is contained in:
Lipu Fei 2018-03-01 15:02:57 +01:00
parent c21174eea8
commit b4c3536999
5 changed files with 31 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
# Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from .BaseMaterialsModel import BaseMaterialsModel, getAvailableMaterials
from .BaseMaterialsModel import BaseMaterialsModel
class GenericMaterialsModel(BaseMaterialsModel):
@ -25,8 +25,9 @@ class GenericMaterialsModel(BaseMaterialsModel):
if global_stack is None:
self.setItems([])
return
extruder_stack = global_stack.extruders[str(self._extruder_position)]
result_dict = getAvailableMaterials(self._extruder_position)
result_dict = self._material_manager.getAvailableMaterialsForMachineExtruder(global_stack, extruder_stack)
if result_dict is None:
self.setItems([])
return