3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

WIP: Cleanup

Browse source
This commit is contained in:
Lipu Fei 2018-02-19 17:01:26 +01:00
parent faf02424a7
commit 3546e54c95
3 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/Machines/Models/CustomQualityProfilesModel.py
View file

@ -24,8 +24,7 @@ class CustomQualityProfilesModel(QualityProfilesModel):
for key in sorted(quality_changes_group_dict): for key in sorted(quality_changes_group_dict):
quality_changes_group = quality_changes_group_dict[key] quality_changes_group = quality_changes_group_dict[key]
item = {"id": "TODO", # TODO: probably will be removed item = {"name": quality_changes_group.name,
"name": quality_changes_group.name,
"layer_height": "", "layer_height": "",
"layer_height_without_unit": "", "layer_height_without_unit": "",
"available": quality_changes_group.is_available, "available": quality_changes_group.is_available,

3
cura/Machines/Models/QualityProfilesModel.py
View file

@ -58,8 +58,7 @@ class QualityProfilesModel(ListModel):
layer_height = self._fetchLayerHeight(quality_group) layer_height = self._fetchLayerHeight(quality_group)
item = {"id": "TODO", # TODO: probably will be removed item = {"name": quality_group.name,
"name": quality_group.name,
"quality_type": quality_group.quality_type, "quality_type": quality_group.quality_type,
"layer_height": layer_height + self._layer_height_unit, "layer_height": layer_height + self._layer_height_unit,
"layer_height_without_unit": layer_height, "layer_height_without_unit": layer_height,

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

@ -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. # Cura is released under the terms of the LGPLv3 or higher.
from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt from PyQt5.QtCore import pyqtProperty, pyqtSignal, Qt
from UM.Logger import Logger
import UM.Qt
from UM.Application import Application from UM.Application import Application
from UM.Qt.ListModel import ListModel
from UM.Settings.ContainerRegistry import ContainerRegistry 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 KeyRole = Qt.UserRole + 1
LabelRole = Qt.UserRole + 2 LabelRole = Qt.UserRole + 2
UnitRole = Qt.UserRole + 3 UnitRole = Qt.UserRole + 3
@ -45,13 +41,15 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
self._update() self._update()
self._quality_manager.qualitiesUpdated.connect(self._update) self._quality_manager.qualitiesUpdated.connect(self._update)
extruderPositionChanged = pyqtSignal()
qualityChanged = pyqtSignal()
def setExtruderPosition(self, extruder_position): def setExtruderPosition(self, extruder_position):
if extruder_position != self._extruder_position: if extruder_position != self._extruder_position:
self._extruder_position = extruder_position self._extruder_position = extruder_position
self._update() self._update()
self.extruderPositionChanged.emit() self.extruderPositionChanged.emit()
extruderPositionChanged = pyqtSignal()
@pyqtProperty(str, fset = setExtruderPosition, notify = extruderPositionChanged) @pyqtProperty(str, fset = setExtruderPosition, notify = extruderPositionChanged)
def extruderPosition(self): def extruderPosition(self):
return self._extruder_position return self._extruder_position
@ -62,7 +60,6 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
self._update() self._update()
self.qualityChanged.emit() self.qualityChanged.emit()
qualityChanged = pyqtSignal()
@pyqtProperty(dict, fset = setQuality, notify = qualityChanged) @pyqtProperty(dict, fset = setQuality, notify = qualityChanged)
def quality(self): def quality(self):
return self._quality return self._quality
@ -122,7 +119,6 @@ class QualitySettingsModel(UM.Qt.ListModel.ListModel):
if profile_value is not None: if profile_value is not None:
break break
user_value = None
if not self._extruder_position: if not self._extruder_position:
user_value = global_container_stack.userChanges.getProperty(definition.key, "value") user_value = global_container_stack.userChanges.getProperty(definition.key, "value")
else: else: