CURA-4870 Change the name of the signal to be more related with the

context.
This commit is contained in:
Diego Prado Gesto 2018-03-13 09:41:26 +01:00
parent 39a7f5a53d
commit 54882402ad

View file

@ -22,7 +22,7 @@ class PrinterOutputModel(QObject):
nameChanged = pyqtSignal() nameChanged = pyqtSignal()
headPositionChanged = pyqtSignal() headPositionChanged = pyqtSignal()
keyChanged = pyqtSignal() keyChanged = pyqtSignal()
typeChanged = pyqtSignal() printerTypeChanged = pyqtSignal()
buildplateChanged = pyqtSignal() buildplateChanged = pyqtSignal()
cameraChanged = pyqtSignal() cameraChanged = pyqtSignal()
configurationChanged = pyqtSignal() configurationChanged = pyqtSignal()
@ -41,12 +41,12 @@ class PrinterOutputModel(QObject):
self._firmware_version = firmware_version self._firmware_version = firmware_version
self._printer_state = "unknown" self._printer_state = "unknown"
self._is_preheating = False self._is_preheating = False
self._type = "" self._printer_type = ""
self._buildplate_name = None self._buildplate_name = None
# Update the printer configuration every time any of the extruders changes its configuration # Update the printer configuration every time any of the extruders changes its configuration
for extruder in self._extruders: for extruder in self._extruders:
extruder.extruderConfigurationChanged.connect(self._updatePrinterConfiguration) extruder.extruderConfigurationChanged.connect(self._updatePrinterConfiguration)
self.typeChanged.connect(self._updatePrinterConfiguration) self.printerTypeChanged.connect(self._updatePrinterConfiguration)
self.buildplateChanged.connect(self._updatePrinterConfiguration) self.buildplateChanged.connect(self._updatePrinterConfiguration)
self._camera = None self._camera = None
@ -73,14 +73,14 @@ class PrinterOutputModel(QObject):
def camera(self): def camera(self):
return self._camera return self._camera
@pyqtProperty(str, notify = typeChanged) @pyqtProperty(str, notify = printerTypeChanged)
def type(self): def type(self):
return self._type return self._printer_type
def updateType(self, type): def updateType(self, printer_type):
if self._type != type: if self._printer_type != printer_type:
self._type = type self._printer_type = printer_type
self.typeChanged.emit() self.printerTypeChanged.emit()
@pyqtProperty(str, notify = buildplateChanged) @pyqtProperty(str, notify = buildplateChanged)
def buildplate(self): def buildplate(self):
@ -263,7 +263,7 @@ class PrinterOutputModel(QObject):
return self._printer_configuration return self._printer_configuration
def _updatePrinterConfiguration(self): def _updatePrinterConfiguration(self):
self._printer_configuration.printerType = self._type self._printer_configuration.printerType = self._printer_type
self._printer_configuration.extruderConfigurations = [extruder.extruderConfiguration for extruder in self._extruders] self._printer_configuration.extruderConfigurations = [extruder.extruderConfiguration for extruder in self._extruders]
self._printer_configuration.buildplateConfiguration = self._buildplate_name self._printer_configuration.buildplateConfiguration = self._buildplate_name
self.configurationChanged.emit() self.configurationChanged.emit()