Fix timelaps recording support

[cura.git] / Cura / gui / printWindow.py

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 0261b6104092829ab6cf47cac1ec74e150967e21..a9846f09376d192793f6474b0cc2f7917d174881 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -111,7 +111,7 @@ class printWindow(wx.Frame):
                \r
                sb = wx.StaticBox(self.panel, label="Statistics")\r
                boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL)\r
-               self.statsText = wx.StaticText(self.panel, -1, "Filament: ####.##m #.##g\nPrint time: #####:##\nMachine state:\nDetecting baudrateXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")\r
+               self.statsText = wx.StaticText(self.panel, -1, "Filament: ####.##m #.##g\nEstimated print time: #####:##\nMachine state:\nDetecting baudrateXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")\r
                boxsizer.Add(self.statsText, flag=wx.LEFT, border=5)\r
                \r
                self.sizer.Add(boxsizer, pos=(0,0), span=(6,1), flag=wx.EXPAND)\r
@@ -244,7 +244,7 @@ class printWindow(wx.Frame):
                        sizer = wx.GridBagSizer(2, 2)\r
                        self.camPage.SetSizer(sizer)\r
                        \r
-                       self.timelapsEnable = wx.CheckBox(self.camPage, -1, 'Enable timelaps')\r
+                       self.timelapsEnable = wx.CheckBox(self.camPage, -1, 'Enable timelaps movie recording')\r
                        sizer.Add(self.timelapsEnable, pos=(0,0), span=(1,2), flag=wx.EXPAND)\r
                        \r
                        pages = self.cam.propertyPages()\r
@@ -340,7 +340,7 @@ class printWindow(wx.Frame):
                        cost = self.gcode.calculateCost()\r
                        if cost != False:\r
                                status += "Filament cost: %s\n" % (cost)\r
-                       status += "Print time: %02d:%02d\n" % (int(self.gcode.totalMoveTimeMinute / 60), int(self.gcode.totalMoveTimeMinute % 60))\r
+                       status += "Estimated print time: %02d:%02d\n" % (int(self.gcode.totalMoveTimeMinute / 60), int(self.gcode.totalMoveTimeMinute % 60))\r
                if self.machineCom == None or not self.machineCom.isPrinting():\r
                        self.progress.SetValue(0)\r
                        if self.gcodeList != None:\r
@@ -384,8 +384,6 @@ class printWindow(wx.Frame):
                self.UpdateButtonStates()\r
        \r
        def OnCancel(self, e):\r
-               if self.cam != None:\r
-                       self.cam.endTimelaps()\r
                self.pauseButton.SetLabel('Pause')\r
                self.machineCom.cancelPrint()\r
                self.machineCom.sendCommand("M84")\r
@@ -503,6 +501,8 @@ class printWindow(wx.Frame):
                self.temperatureGraph.addPoint(temp, self.temperatureSelect.GetValue(), bedTemp, self.bedTemperatureSelect.GetValue())\r
        \r
        def mcStateChange(self, state):\r
+               if self.machineCom != None and state == self.machineCom.STATE_OPERATIONAL and self.cam != None:\r
+                       self.cam.endTimelaps()\r
                wx.CallAfter(self.UpdateButtonStates)\r
                wx.CallAfter(self.UpdateProgress)\r
        \r
@@ -513,6 +513,7 @@ class printWindow(wx.Frame):
                wx.CallAfter(self.UpdateProgress)\r
        \r
        def mcZChange(self, newZ):\r
+               self.currentZ = newZ\r
                if self.cam != None:\r
                        wx.CallAfter(self.cam.takeNewImage)\r
                        wx.CallAfter(self.camPreview.Refresh)\r