From b37252f124c76fa06c860fa20de4b6cca85645a1 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 10 Oct 2018 14:18:37 +0200 Subject: [PATCH] Minor code style fixes Contributes to issue CURA-5734. --- cura/Machines/Models/SettingVisibilityPresetsModel.py | 2 +- cura/Settings/SettingVisibilityPreset.py | 8 ++++---- resources/qml/Preferences/SettingVisibilityPage.qml | 6 ++++-- tests/Settings/TestSettingVisibilityPresets.py | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cura/Machines/Models/SettingVisibilityPresetsModel.py b/cura/Machines/Models/SettingVisibilityPresetsModel.py index b5f7fa8626..d9bf105c0b 100644 --- a/cura/Machines/Models/SettingVisibilityPresetsModel.py +++ b/cura/Machines/Models/SettingVisibilityPresetsModel.py @@ -18,7 +18,7 @@ class SettingVisibilityPresetsModel(QObject): onItemsChanged = pyqtSignal() activePresetChanged = pyqtSignal() - def __init__(self, preferences, parent = None): + def __init__(self, preferences, parent = None): super().__init__(parent) self._items = [] # type: List[SettingVisibilityPreset] diff --git a/cura/Settings/SettingVisibilityPreset.py b/cura/Settings/SettingVisibilityPreset.py index b1828362d1..6e75a5a208 100644 --- a/cura/Settings/SettingVisibilityPreset.py +++ b/cura/Settings/SettingVisibilityPreset.py @@ -26,15 +26,15 @@ class SettingVisibilityPreset(QObject): def settings(self) -> List[str]: return self._settings - @pyqtProperty(str, notify=onIdChanged) + @pyqtProperty(str, notify = onIdChanged) def id(self) -> str: return self._id - @pyqtProperty(int, notify=onWeightChanged) + @pyqtProperty(int, notify = onWeightChanged) def weight(self) -> int: return self._weight - @pyqtProperty(str, notify=onNameChanged) + @pyqtProperty(str, notify = onNameChanged) def name(self) -> str: return self._name @@ -66,7 +66,7 @@ class SettingVisibilityPreset(QObject): Logger.log("e", "[%s] is not a file", file_path) 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]) if not parser.has_option("general", "name") or not parser.has_option("general", "weight"): diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml index 90c805f854..8896d0611e 100644 --- a/resources/qml/Preferences/SettingVisibilityPage.qml +++ b/resources/qml/Preferences/SettingVisibilityPage.qml @@ -115,8 +115,10 @@ UM.PreferencesPage currentIndex: { - for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i) { - if(settingVisibilityPresetsModel.items[i].id == settingVisibilityPresetsModel.activePreset) { + for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i) + { + if(settingVisibilityPresetsModel.items[i].id == settingVisibilityPresetsModel.activePreset) + { currentIndex = i; return; } diff --git a/tests/Settings/TestSettingVisibilityPresets.py b/tests/Settings/TestSettingVisibilityPresets.py index 68e8a6eb7b..1209437d25 100644 --- a/tests/Settings/TestSettingVisibilityPresets.py +++ b/tests/Settings/TestSettingVisibilityPresets.py @@ -49,7 +49,7 @@ def test_setActivePreset(): preferences = Preferences() visibility_model = SettingVisibilityPresetsModel(preferences) 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" # Everything should be the same.