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

Minor code style fixes

Browse source 
Contributes to issue CURA-5734.
This commit is contained in:
Ghostkeeper 2018-10-10 14:18:37 +02:00
parent 4def636fc9
commit b37252f124
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Machines/Models/SettingVisibilityPresetsModel.py
View file

@ -18,7 +18,7 @@ class SettingVisibilityPresetsModel(QObject):
onItemsChanged = pyqtSignal() onItemsChanged = pyqtSignal()
activePresetChanged = pyqtSignal() activePresetChanged = pyqtSignal()
def __init__(self, preferences, parent = None): def __init__(self, preferences, parent = None):
super().__init__(parent) super().__init__(parent)
self._items = [] # type: List[SettingVisibilityPreset] self._items = [] # type: List[SettingVisibilityPreset]

8
cura/Settings/SettingVisibilityPreset.py
View file

@ -26,15 +26,15 @@ class SettingVisibilityPreset(QObject):
def settings(self) -> List[str]: def settings(self) -> List[str]:
return self._settings return self._settings
@pyqtProperty(str, notify=onIdChanged) @pyqtProperty(str, notify = onIdChanged)
def id(self) -> str: def id(self) -> str:
return self._id return self._id
@pyqtProperty(int, notify=onWeightChanged) @pyqtProperty(int, notify = onWeightChanged)
def weight(self) -> int: def weight(self) -> int:
return self._weight return self._weight
@pyqtProperty(str, notify=onNameChanged) @pyqtProperty(str, notify = onNameChanged)
def name(self) -> str: def name(self) -> str:
return self._name return self._name
@ -66,7 +66,7 @@ class SettingVisibilityPreset(QObject):
Logger.log("e", "[%s] is not a file", file_path) Logger.log("e", "[%s] is not a file", file_path)
return None return None
parser = ConfigParser(allow_no_value=True) # Accept options without any value, parser = ConfigParser(allow_no_value = True) # Accept options without any value,
parser.read([file_path]) parser.read([file_path])
if not parser.has_option("general", "name") or not parser.has_option("general", "weight"): if not parser.has_option("general", "name") or not parser.has_option("general", "weight"):

6
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -115,8 +115,10 @@ UM.PreferencesPage
currentIndex: currentIndex:
{ {
for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i) { for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
if(settingVisibilityPresetsModel.items[i].id == settingVisibilityPresetsModel.activePreset) { {
if(settingVisibilityPresetsModel.items[i].id == settingVisibilityPresetsModel.activePreset)
{
currentIndex = i; currentIndex = i;
return; return;
} }

2
tests/Settings/TestSettingVisibilityPresets.py
View file

@ -49,7 +49,7 @@ def test_setActivePreset():
preferences = Preferences() preferences = Preferences()
visibility_model = SettingVisibilityPresetsModel(preferences) visibility_model = SettingVisibilityPresetsModel(preferences)
visibility_model.activePresetChanged = MagicMock() visibility_model.activePresetChanged = MagicMock()
# Ensure that we start of with basic (since we didn't change anyting just yet!) # Ensure that we start off with basic (since we didn't change anyting just yet!)
assert visibility_model.activePreset == "basic" assert visibility_model.activePreset == "basic"
# Everything should be the same. # Everything should be the same.