Merge branch 'master' into CURA-6793_performance

This commit is contained in:
Ghostkeeper 2019-10-16 15:47:41 +02:00
commit c12817170c
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
31 changed files with 537 additions and 94 deletions

View file

@ -44,6 +44,9 @@ class QualityProfilesDropDownMenuModel(ListModel):
machine_manager.activeVariantChanged.connect(self._onChange)
machine_manager.extruderChanged.connect(self._onChange)
extruder_manager = application.getExtruderManager()
extruder_manager.extrudersChanged.connect(self._onChange)
self._layer_height_unit = "" # This is cached
self._update_timer = QTimer() # type: QTimer