From 3546e54c95215be59e96c6a64be1b00753104f42 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 19 Feb 2018 17:01:26 +0100 Subject: [PATCH] WIP: Cleanup --- .../Models/CustomQualityProfilesModel.py | 3 +-- cura/Machines/Models/QualityProfilesModel.py | 3 +-- cura/Machines/Models/QualitySettingsModel.py | 16 ++++++---------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/cura/Machines/Models/CustomQualityProfilesModel.py b/cura/Machines/Models/CustomQualityProfilesModel.py index 8b6fc2deb6..71a6b6c0f7 100644 --- a/cura/Machines/Models/CustomQualityProfilesModel.py +++ b/cura/Machines/Models/CustomQualityProfilesModel.py @@ -24,8 +24,7 @@ class CustomQualityProfilesModel(QualityProfilesModel): for key in sorted(quality_changes_group_dict): quality_changes_group = quality_changes_group_dict[key] - item = {"id": "TODO", # TODO: probably will be removed - "name": quality_changes_group.name, + item = {"name": quality_changes_group.name, "layer_height": "", "layer_height_without_unit": "", "available": quality_changes_group.is_available, diff --git a/cura/Machines/Models/QualityProfilesModel.py b/cura/Machines/Models/QualityProfilesModel.py index 11127190e1..b30daa85f6 100644 --- a/cura/Machines/Models/QualityProfilesModel.py +++ b/cura/Machines/Models/QualityProfilesModel.py @@ -58,8 +58,7 @@ class QualityProfilesModel(ListModel): layer_height = self._fetchLayerHeight(quality_group) - item = {"id": "TODO", # TODO: probably will be removed - "name": quality_group.name, + item = {"name": quality_group.name, "quality_type": quality_group.quality_type, "layer_height": layer_height + self._layer_height_unit, "layer_height_without_unit": layer_height, diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/Machines/Models/QualitySettingsModel.py index 6353ec841e..6336549270 100644 --- a/cura/Machines/Models/QualitySettingsModel.py +++ b/cura/Machines/Models/QualitySettingsModel.py @@ -1,18 +1,14 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt -from UM.Logger import Logger -import UM.Qt from UM.Application import Application +from UM.Qt.ListModel import ListModel from UM.Settings.ContainerRegistry import ContainerRegistry -import os - -from UM.i18n import i18nCatalog -class QualitySettingsModel(UM.Qt.ListModel.ListModel): +class QualitySettingsModel(ListModel): KeyRole = Qt.UserRole + 1 LabelRole = Qt.UserRole + 2 UnitRole = Qt.UserRole + 3 @@ -45,13 +41,15 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel): self._update() self._quality_manager.qualitiesUpdated.connect(self._update) + extruderPositionChanged = pyqtSignal() + qualityChanged = pyqtSignal() + def setExtruderPosition(self, extruder_position): if extruder_position != self._extruder_position: self._extruder_position = extruder_position self._update() self.extruderPositionChanged.emit() - extruderPositionChanged = pyqtSignal() @pyqtProperty(str, fset = setExtruderPosition, notify = extruderPositionChanged) def extruderPosition(self): return self._extruder_position @@ -62,7 +60,6 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel): self._update() self.qualityChanged.emit() - qualityChanged = pyqtSignal() @pyqtProperty(dict, fset = setQuality, notify = qualityChanged) def quality(self): return self._quality @@ -122,7 +119,6 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel): if profile_value is not None: break - user_value = None if not self._extruder_position: user_value = global_container_stack.userChanges.getProperty(definition.key, "value") else: