From 41248a51336bf27723f5cb0f8e1bad68d7ef3599 Mon Sep 17 00:00:00 2001 From: Thomas Karl Pietrowski Date: Fri, 16 Sep 2016 14:36:32 +0200 Subject: [PATCH 1/2] SliceInfo: Using HTTPS again The problem seems to be related to our HTTP(S) server. It is expected that the problem will be solved after the weekend. Contributes to CURA-1445 --- plugins/SliceInfoPlugin/SliceInfo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index ab9a75d1da..45b14e3314 100644 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -61,7 +61,7 @@ class SliceInfoJob(Job): # The data is only sent when the user in question gave permission to do so. All data is anonymous and # no model files are being sent (Just a SHA256 hash of the model). class SliceInfo(Extension): - info_url = "http://stats.youmagine.com/curastats/slice" + info_url = "https://stats.youmagine.com/curastats/slice" def __init__(self): super().__init__() @@ -139,4 +139,4 @@ class SliceInfo(Extension): except Exception as e: # We really can't afford to have a mistake here, as this would break the sending of g-code to a device # (Either saving or directly to a printer). The functionality of the slice data is not *that* important. - Logger.log("e", "Exception raised while sending slice info: %s" %(repr(e))) # But we should be notified about these problems of course. \ No newline at end of file + Logger.log("e", "Exception raised while sending slice info: %s" %(repr(e))) # But we should be notified about these problems of course. From 789db04d03a7cc8f4d96b977e0757843e50d3de7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 20 Sep 2016 09:41:04 +0200 Subject: [PATCH 2/2] Inheritance manager now also listens to global property changed CURA-2361 --- cura/Settings/SettingInheritanceManager.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/cura/Settings/SettingInheritanceManager.py b/cura/Settings/SettingInheritanceManager.py index 6bc16c1628..5168fbe9c1 100644 --- a/cura/Settings/SettingInheritanceManager.py +++ b/cura/Settings/SettingInheritanceManager.py @@ -17,9 +17,10 @@ class SettingInheritanceManager(QObject): super().__init__(parent) Application.getInstance().globalContainerStackChanged.connect(self._onGlobalContainerChanged) self._global_container_stack = None - self._onGlobalContainerChanged() self._settings_with_inheritance_warning = [] self._active_container_stack = None + self._onGlobalContainerChanged() + cura.Settings.ExtruderManager.getInstance().activeExtruderChanged.connect(self._onActiveExtruderChanged) self._onActiveExtruderChanged() @@ -58,12 +59,11 @@ class SettingInheritanceManager(QObject): if new_active_stack != self._active_container_stack: # Check if changed self._active_container_stack = new_active_stack - self._update() # Ensure that the settings_with_inheritance_warning list is populated. self._active_container_stack.propertyChanged.connect(self._onPropertyChanged) + self._update() # Ensure that the settings_with_inheritance_warning list is populated. def _onPropertyChanged(self, key, property_name): if property_name == "value" and self._global_container_stack: - definitions = self._global_container_stack.getBottom().findDefinitions(key = key) if not definitions: return @@ -149,7 +149,6 @@ class SettingInheritanceManager(QObject): continue if has_setting_function: break # There is a setting function somewhere, stop looking deeper. - return has_setting_function and has_non_function_value def _update(self): @@ -170,7 +169,12 @@ class SettingInheritanceManager(QObject): self.settingsWithIntheritanceChanged.emit() def _onGlobalContainerChanged(self): + if self._global_container_stack: + self._global_container_stack.propertyChanged.disconnect(self._onPropertyChanged) self._global_container_stack = Application.getInstance().getGlobalContainerStack() + if self._global_container_stack: + self._global_container_stack.propertyChanged.connect(self._onPropertyChanged) + self._onActiveExtruderChanged() @staticmethod def createSettingInheritanceManager(engine=None, script_engine=None):