Browse Source

Change monitor progress to percentages

CURA-1036
fieldOfView 8 years ago
parent
commit
7d962e97c4
1 changed files with 2 additions and 2 deletions
  1. 2 2
      resources/qml/MonitorButton.qml

+ 2 - 2
resources/qml/MonitorButton.qml

@@ -65,7 +65,7 @@ Rectangle
 
 
         color: printerConnected ? Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? UM.Theme.getColor("status_paused") : UM.Theme.getColor("status_ready") : UM.Theme.getColor("status_offline")
         color: printerConnected ? Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? UM.Theme.getColor("status_paused") : UM.Theme.getColor("status_ready") : UM.Theme.getColor("status_offline")
         font: UM.Theme.getFont("large")
         font: UM.Theme.getFont("large")
-        text: Math.round(progress * 100) + "%";
+        text: Math.round(progress) + "%";
         visible: printerConnected
         visible: printerConnected
     }
     }
 
 
@@ -83,7 +83,7 @@ Rectangle
 
 
         Rectangle
         Rectangle
         {
         {
-            width: Math.max(parent.width * base.progress)
+            width: Math.max(parent.width * base.progress / 100)
             height: parent.height
             height: parent.height
             color: printerConnected ? Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? UM.Theme.getColor("status_paused") : UM.Theme.getColor("status_ready") : UM.Theme.getColor("status_offline")
             color: printerConnected ? Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? UM.Theme.getColor("status_paused") : UM.Theme.getColor("status_ready") : UM.Theme.getColor("status_offline")
             radius: UM.Theme.getSize("progressbar_radius").width
             radius: UM.Theme.getSize("progressbar_radius").width