Merge branch 'master' of github.com:Ultimaker/Cura

cura/MultiMaterialDecorator.py

@@ -6,3 +6,6 @@ class MultiMaterialDecorator(SceneNodeDecorator):
         
     def isMultiMaterial(self):
         return True
+
+    def __deepcopy__(self, memo):
+        return MultiMaterialDecorator()

plugins/SliceInfoPlugin/SliceInfo.py

@@ -45,6 +45,7 @@ class SliceInfo(Extension):
         Preferences.getInstance().setValue("info/asked_send_slice_info", True)
 
     def _onWriteStarted(self, output_device):
+        try:
             if not Preferences.getInstance().getValue("info/send_slice_info"):
                 Logger.log("d", "'info/send_slice_info' is turned off.")
                 return # Do nothing, user does not want to send data
@@ -115,4 +116,8 @@ class SliceInfo(Extension):
                 Logger.log("i", "Sent anonymous slice info to %s", self.info_url)
                 f.close()
             except Exception as e:
-            Logger.logException("e", e)
+                Logger.logException("e", "An exception occurred while trying to send slice information")
+        except:
+            # 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.
+            pass

plugins/UltimakerMachineActions/UMOCheckupMachineAction.py

@@ -79,7 +79,6 @@ class UMOCheckupMachineAction(MachineAction):
 
     @pyqtProperty(bool, notify = onBedTestCompleted)
     def bedTestCompleted(self):
-        print("zomg?")
         return self._bed_test_completed
 
     @pyqtProperty(bool, notify = onHotendTestCompleted)

plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml

@@ -51,7 +51,6 @@ Cura.MachineAction
                 text: catalog.i18nc("@action:button","Start Printer Check");
                 onClicked:
                 {
-                    //checkupContent.visible = true
                     manager.startCheck()
                 }
             }
@@ -157,6 +156,7 @@ Cura.MachineAction
             {
                 id: nozzleTempLabel
                 width: checkupMachineAction.leftRow
+                height: nozzleTempButton.height
                 anchors.left: parent.left
                 anchors.top: endstopZLabel.bottom
                 wrapMode: Text.WordWrap
@@ -175,15 +175,12 @@ Cura.MachineAction
             {
                 id: nozzleTempButton
                 width: checkupMachineAction.rightRow * 0.3
-                height: nozzleTemp.height
+                height: childrenRect.height
                 anchors.top: nozzleTempLabel.top
                 anchors.left: bedTempStatus.right
                 anchors.leftMargin: UM.Theme.getSize("default_margin").width/2
                 Button
                 {
-                    height: nozzleTemp.height - 2
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.horizontalCenter: parent.horizontalCenter
                     text: catalog.i18nc("@action:button","Start Heating")
                     onClicked:
                     {
@@ -207,10 +204,11 @@ Cura.MachineAction
             {
                 id: bedTempLabel
                 width: checkupMachineAction.leftRow
+                height: bedTempButton.height
                 anchors.left: parent.left
                 anchors.top: nozzleTempLabel.bottom
                 wrapMode: Text.WordWrap
-                text: catalog.i18nc("@label","bed temperature check:")
+                text: catalog.i18nc("@label","Bed temperature check:")
             }
 
             Label
@@ -226,15 +224,12 @@ Cura.MachineAction
             {
                 id: bedTempButton
                 width: checkupMachineAction.rightRow * 0.3
-                height: bedTemp.height
+                height: childrenRect.height
                 anchors.top: bedTempLabel.top
                 anchors.left: bedTempStatus.right
                 anchors.leftMargin: UM.Theme.getSize("default_margin").width/2
                 Button
                 {
-                    height: bedTemp.height - 2
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.horizontalCenter: parent.horizontalCenter
                     text: catalog.i18nc("@action:button","Start Heating")
                     onClicked:
                     {

resources/qml/MonitorButton.qml

@@ -24,7 +24,7 @@ Rectangle
             return UM.Theme.getColor("status_offline")
         else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print")
             return UM.Theme.getColor("status_busy")
-        else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready")
+        else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready" || Cura.MachineManager.printerOutputDevices[0].jobState == "")
             return UM.Theme.getColor("status_ready")
         else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
             return UM.Theme.getColor("status_paused")

resources/qml/Sidebar.qml

@@ -103,7 +103,7 @@ Rectangle
                         return UM.Theme.getIcon("tab_monitor")
                     else if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing" || Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print")
                         return UM.Theme.getIcon("tab_monitor_busy")
-                    else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready")
+                    else if(Cura.MachineManager.printerOutputDevices[0].jobState == "ready" || Cura.MachineManager.printerOutputDevices[0].jobState == "")
                         return UM.Theme.getIcon("tab_monitor_connected")
                     else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
                         return UM.Theme.getIcon("tab_monitor_paused")