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

Remove MachineManager.activeVariantNames

Browse source 
CURA-6865
This commit is contained in:
Lipu Fei 2019-10-08 15:16:25 +02:00
parent 570dfdab4b
commit fb368a4788
3 changed files with 3 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cura/Settings/MachineManager.py
View file

@ -1111,21 +1111,6 @@ class MachineManager(QObject):
def currentRootMaterialId(self) -> Dict[str, str]: def currentRootMaterialId(self) -> Dict[str, str]:
return self._current_root_material_id return self._current_root_material_id
## Return the variant names in the extruder stack(s).
## For the variant in the global stack, use activeVariantBuildplateName
@pyqtProperty("QVariant", notify = activeVariantChanged)
def activeVariantNames(self) -> Dict[str, str]:
result = {}
active_stacks = ExtruderManager.getInstance().getActiveExtruderStacks()
for stack in active_stacks:
variant_container = stack.variant
position = stack.getMetaDataEntry("position")
if variant_container and variant_container != empty_variant_container:
result[position] = variant_container.getName()
return result
# Sets all quality and quality_changes containers to empty_quality and empty_quality_changes containers # Sets all quality and quality_changes containers to empty_quality and empty_quality_changes containers
# for all stacks in the currently active machine. # for all stacks in the currently active machine.
# #

5
resources/qml/Menus/NozzleMenu.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2017 Ultimaker B.V. // Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.10
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import UM 1.2 as UM import UM 1.2 as UM
@ -28,7 +28,8 @@ Menu
text: model.hotend_name text: model.hotend_name
checkable: true checkable: true
checked: { checked: {
return Cura.MachineManager.activeVariantNames[extruderIndex] == model.hotend_name var extruder = Cura.MachineManager.activeMachine.extruderList[extruderIndex]
return extruder.variant.name == model.hotend_name
} }
exclusiveGroup: group exclusiveGroup: group

12
tests/TestMachineManager.py
View file

@ -99,18 +99,6 @@ def test_allActiveMaterialIds(machine_manager, extruder_manager):
assert machine_manager.allActiveMaterialIds == {"extruder_1": "material_1", "extruder_2": "material_2"} assert machine_manager.allActiveMaterialIds == {"extruder_1": "material_1", "extruder_2": "material_2"}
def test_activeVariantNames(machine_manager, extruder_manager):
extruder_1 = createMockedExtruder("extruder_1")
extruder_2 = createMockedExtruder("extruder_2")
extruder_1.getMetaDataEntry = MagicMock(return_value = "0")
extruder_2.getMetaDataEntry = MagicMock(return_value= "2")
extruder_1.variant = createMockedInstanceContainer("variant_1", "variant_name_1")
extruder_2.variant = createMockedInstanceContainer("variant_2", "variant_name_2")
extruder_manager.getActiveExtruderStacks = MagicMock(return_value=[extruder_1, extruder_2])
assert machine_manager.activeVariantNames == {"0": "variant_name_1", "2": "variant_name_2"}
def test_globalVariantName(machine_manager, application): def test_globalVariantName(machine_manager, application):
global_stack = application.getGlobalContainerStack() global_stack = application.getGlobalContainerStack()
global_stack.variant = createMockedInstanceContainer("beep", "zomg") global_stack.variant = createMockedInstanceContainer("beep", "zomg")