3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Rename to selected_position

Browse source
This commit is contained in:
Lipu Fei 2018-03-01 16:26:12 +01:00
parent a81d124aae
commit 71e8478419
2 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
cura/Machines/Models/QualitySettingsModel.py
View file

@ -35,7 +35,8 @@ class QualitySettingsModel(ListModel):
self._application = Application.getInstance() self._application = Application.getInstance()
self._quality_manager = self._application.getQualityManager() self._quality_manager = self._application.getQualityManager()
self._extruder_position = "" self._selected_position = "" # empty string means GlobalStack
# strings such as "0", "1", etc. mean extruder positions
self._selected_quality_item = None # The selected quality in the quality management page self._selected_quality_item = None # The selected quality in the quality management page
self._i18n_catalog = None self._i18n_catalog = None
@ -43,18 +44,18 @@ class QualitySettingsModel(ListModel):
self._update() self._update()
extruderPositionChanged = pyqtSignal() selectedPositionChanged = pyqtSignal()
selectedQualityItemChanged = pyqtSignal() selectedQualityItemChanged = pyqtSignal()
def setExtruderPosition(self, extruder_position): def setSelectedPosition(self, selected_position):
if extruder_position != self._extruder_position: if selected_position != self._selected_position:
self._extruder_position = extruder_position self._selected_position = selected_position
self.extruderPositionChanged.emit() self.selectedPositionChanged.emit()
self._update() self._update()
@pyqtProperty(str, fset = setExtruderPosition, notify = extruderPositionChanged) @pyqtProperty(str, fset = setSelectedPosition, notify = selectedPositionChanged)
def extruderPosition(self): def selectedPosition(self):
return self._extruder_position return self._selected_position
def setSelectedQualityItem(self, selected_quality_item): def setSelectedQualityItem(self, selected_quality_item):
if selected_quality_item != self._selected_quality_item: if selected_quality_item != self._selected_quality_item:
@ -79,18 +80,18 @@ class QualitySettingsModel(ListModel):
quality_group = self._selected_quality_item["quality_group"] quality_group = self._selected_quality_item["quality_group"]
quality_changes_group = self._selected_quality_item["quality_changes_group"] quality_changes_group = self._selected_quality_item["quality_changes_group"]
if self._extruder_position == "": if self._selected_position == "":
quality_node = quality_group.node_for_global quality_node = quality_group.node_for_global
else: else:
quality_node = quality_group.nodes_for_extruders.get(self._extruder_position) quality_node = quality_group.nodes_for_extruders.get(self._selected_position)
settings_keys = quality_group.getAllKeys() settings_keys = quality_group.getAllKeys()
quality_containers = [quality_node.getContainer()] quality_containers = [quality_node.getContainer()]
if quality_changes_group is not None: if quality_changes_group is not None:
if self._extruder_position == "": if self._selected_position == "":
quality_changes_node = quality_changes_group.node_for_global quality_changes_node = quality_changes_group.node_for_global
else: else:
quality_changes_node = quality_changes_group.nodes_for_extruders.get(self._extruder_position) quality_changes_node = quality_changes_group.nodes_for_extruders.get(self._selected_position)
if quality_changes_node is not None: # it can be None if number of extruders are changed during runtime if quality_changes_node is not None: # it can be None if number of extruders are changed during runtime
try: try:
quality_containers.insert(0, quality_changes_node.getContainer()) quality_containers.insert(0, quality_changes_node.getContainer())
@ -117,7 +118,7 @@ class QualitySettingsModel(ListModel):
profile_value = new_value profile_value = new_value
# Global tab should use resolve (if there is one) # Global tab should use resolve (if there is one)
if self._extruder_position == "": if self._selected_position == "":
resolve_value = global_container_stack.getProperty(definition.key, "resolve") resolve_value = global_container_stack.getProperty(definition.key, "resolve")
if resolve_value is not None and definition.key in settings_keys: if resolve_value is not None and definition.key in settings_keys:
profile_value = resolve_value profile_value = resolve_value
@ -125,10 +126,10 @@ class QualitySettingsModel(ListModel):
if profile_value is not None: if profile_value is not None:
break break
if not self._extruder_position: if not self._selected_position:
user_value = global_container_stack.userChanges.getProperty(definition.key, "value") user_value = global_container_stack.userChanges.getProperty(definition.key, "value")
else: else:
extruder_stack = global_container_stack.extruders[self._extruder_position] extruder_stack = global_container_stack.extruders[self._selected_position]
user_value = extruder_stack.userChanges.getProperty(definition.key, "value") user_value = extruder_stack.userChanges.getProperty(definition.key, "value")
if profile_value is None and user_value is None: if profile_value is None and user_value is None:

2
resources/qml/Preferences/ProfileTab.qml
View file

@ -85,7 +85,7 @@ Tab
model: Cura.QualitySettingsModel model: Cura.QualitySettingsModel
{ {
id: qualitySettings id: qualitySettings
extruderPosition: base.extruderPosition selectedPosition: base.extruderPosition
selectedQualityItem: base.qualityItem selectedQualityItem: base.qualityItem
} }