Browse Source

Revert "Add enabled state to printer, so that it can be displayed."

This reverts commit dd778f0450219cbc2f7309eeb08bc20065bd51af.
Jaime van Kessel 6 years ago
parent
commit
132366fa61

+ 0 - 11
cura/PrinterOutput/PrinterOutputModel.py

@@ -26,7 +26,6 @@ class PrinterOutputModel(QObject):
     buildplateChanged = pyqtSignal()
     cameraChanged = pyqtSignal()
     configurationChanged = pyqtSignal()
-    enabledChanged = pyqtSignal()
 
     def __init__(self, output_controller: "PrinterOutputController", number_of_extruders: int = 1, parent=None, firmware_version = "") -> None:
         super().__init__(parent)
@@ -44,22 +43,12 @@ class PrinterOutputModel(QObject):
         self._is_preheating = False
         self._printer_type = ""
         self._buildplate_name = None
-        self._enabled = True
 
         self._printer_configuration.extruderConfigurations = [extruder.extruderConfiguration for extruder in
                                                               self._extruders]
 
         self._camera = None
 
-    @pyqtProperty(bool, notify=enabledChanged)
-    def enabled(self) -> bool:
-        return self._enabled
-
-    def updateEnabled(self, enabled: bool) -> None:
-        if self._enabled != enabled:
-            self._enabled = enabled
-            self.enabledChanged.emit()
-
     @pyqtProperty(str, constant = True)
     def firmwareVersion(self):
         return self._firmware_version

+ 1 - 12
plugins/UM3NetworkPrinting/ClusterControlItem.qml

@@ -192,18 +192,7 @@ Component
                                 Label
                                 {
                                     id: activeJobLabel
-                                    text:
-                                    {
-                                        if(!modelData.enabled)
-                                        {
-                                            return catalog.i18nc("@label:status", "Not available")
-                                        }
-                                        if(modelData.activePrintjob != null)
-                                        {
-                                            return modelData.activePrintJob.name
-                                        }
-                                        return catalog.i18nc("@label:status", "Waiting")
-                                    }
+                                    text: modelData.activePrintJob != null ? modelData.activePrintJob.name : "waiting"
                                     anchors.top: machineNameLabel.bottom
                                     width: parent.width
                                     elide: Text.ElideRight

+ 0 - 1
plugins/UM3NetworkPrinting/ClusterMonitorItem.qml

@@ -23,7 +23,6 @@ Component
             name: "cura"
         }
 
-
         Label
         {
             id: manageQueueLabel

+ 0 - 1
plugins/UM3NetworkPrinting/ClusterUM3OutputDevice.py

@@ -595,7 +595,6 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice):
         printer.updateName(data["friendly_name"])
         printer.updateKey(data["uuid"])
         printer.updateType(data["machine_variant"])
-        printer.updateEnabled(data["enabled"])
 
         # 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):