Merge pull request #5305 from Ultimaker/CL-1250_set_cloud_buildplate

CL-1250 set cloud build plate
This commit is contained in:
Ian Paschal 2019-02-15 10:28:07 +01:00 committed by GitHub
commit 61b84bdcfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions

View File

@ -44,7 +44,7 @@ class PrinterOutputModel(QObject):
self._printer_state = "unknown" self._printer_state = "unknown"
self._is_preheating = False self._is_preheating = False
self._printer_type = "" self._printer_type = ""
self._buildplate_name = "" self._buildplate = ""
self._printer_configuration.extruderConfigurations = [extruder.extruderConfiguration for extruder in self._printer_configuration.extruderConfigurations = [extruder.extruderConfiguration for extruder in
self._extruders] self._extruders]
@ -86,12 +86,12 @@ class PrinterOutputModel(QObject):
@pyqtProperty(str, notify = buildplateChanged) @pyqtProperty(str, notify = buildplateChanged)
def buildplate(self) -> str: def buildplate(self) -> str:
return self._buildplate_name return self._buildplate
def updateBuildplateName(self, buildplate_name: str) -> None: def updateBuildplate(self, buildplate: str) -> None:
if self._buildplate_name != buildplate_name: if self._buildplate != buildplate:
self._buildplate_name = buildplate_name self._buildplate = buildplate
self._printer_configuration.buildplateConfiguration = self._buildplate_name self._printer_configuration.buildplateConfiguration = self._buildplate
self.buildplateChanged.emit() self.buildplateChanged.emit()
self.configurationChanged.emit() self.configurationChanged.emit()

View File

@ -65,6 +65,7 @@ class CloudClusterPrinterStatus(BaseCloudModel):
model.updateName(self.friendly_name) model.updateName(self.friendly_name)
model.updateType(self.machine_variant) model.updateType(self.machine_variant)
model.updateState(self.status if self.enabled else "disabled") model.updateState(self.status if self.enabled else "disabled")
model.updateBuildplate(self.build_plate.type if self.build_plate else "glass")
for configuration, extruder_output, extruder_config in \ for configuration, extruder_output, extruder_config in \
zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations): zip(self.configuration, model.extruders, model.printerConfiguration.extruderConfigurations):

View File

@ -627,7 +627,7 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
# Do not store the build plate information that comes from connect if the current printer has not build plate information # Do not store the build plate information that comes from connect if the current printer has not build plate information
if "build_plate" in data and machine_definition.getMetaDataEntry("has_variant_buildplates", False): if "build_plate" in data and machine_definition.getMetaDataEntry("has_variant_buildplates", False):
printer.updateBuildplateName(data["build_plate"]["type"]) printer.updateBuildplate(data["build_plate"]["type"])
if not data["enabled"]: if not data["enabled"]:
printer.updateState("disabled") printer.updateState("disabled")
else: else: