Add show log result to project planner. Make sure the final move on the project plann...

diff --git a/Cura/gui/projectPlanner.py b/Cura/gui/projectPlanner.py
index 8a2fc5d7057eca60e86e8f329a508fb70b076a42..ec1086702ae7fa7f12137d078789ab5b8ba24db4 100644 (file)
--- a/Cura/gui/projectPlanner.py
+++ b/Cura/gui/projectPlanner.py
@@ -566,7 +566,7 @@ class projectPlanner(wx.Frame):
                        action.centerY = item.centerY\r
                        action.extruder = item.extruder\r
                        action.filename = item.filename\r
-                       clearZ = max(clearZ, item.getMaximum().z * item.scale)\r
+                       clearZ = max(clearZ, item.getMaximum().z * item.scale + 5.0)\r
                        action.clearZ = clearZ\r
                        action.leaveResultForNextSlice = False\r
                        action.usePreviousSlice = False\r
@@ -832,11 +832,11 @@ class ProjectSliceProgressWindow(wx.Frame):
                self.progressGauge2 = wx.Gauge(self, -1)\r
                self.progressGauge2.SetRange(len(self.actionList))\r
                self.abortButton = wx.Button(self, -1, "Abort")\r
-               self.sizer.Add(self.statusText, (0,0), span=(1,3))\r
-               self.sizer.Add(self.progressGauge, (1, 0), span=(1,3), flag=wx.EXPAND)\r
-               self.sizer.Add(self.progressGauge2, (2, 0), span=(1,3), flag=wx.EXPAND)\r
+               self.sizer.Add(self.statusText, (0,0), span=(1,4))\r
+               self.sizer.Add(self.progressGauge, (1, 0), span=(1,4), flag=wx.EXPAND)\r
+               self.sizer.Add(self.progressGauge2, (2, 0), span=(1,4), flag=wx.EXPAND)\r
 \r
-               self.sizer.Add(self.abortButton, (3,0), span=(1,3), flag=wx.ALIGN_CENTER)\r
+               self.sizer.Add(self.abortButton, (3,0), span=(1,4), flag=wx.ALIGN_CENTER)\r
                self.sizer.AddGrowableCol(0)\r
                self.sizer.AddGrowableRow(0)\r
 \r
@@ -941,6 +941,7 @@ class ProjectSliceProgressWindow(wx.Frame):
                        wx.CallAfter(self.progressGauge2.SetValue, self.actionList.index(action) + 1)\r
                \r
                resultFile.write(';TYPE:CUSTOM\n')\r
+               resultFile.write('G1 Z%f F%f\n' % self.actionList[-1].clearZ, profile.getProfileSettingFloat('max_z_speed') * 60)\r
                resultFile.write(profile.getAlterationFileContents('end.gcode'))\r
                resultFile.close()\r
                \r
@@ -967,14 +968,17 @@ class ProjectSliceProgressWindow(wx.Frame):
                self.abortButton.Destroy()\r
                self.closeButton = wx.Button(self, -1, "Close")\r
                self.printButton = wx.Button(self, -1, "Print")\r
+               self.logButton = wx.Button(self, -1, "Show log")\r
                self.sizer.Add(self.closeButton, (3,0), span=(1,1))\r
                self.sizer.Add(self.printButton, (3,1), span=(1,1))\r
+               self.sizer.Add(self.logButton, (3,2), span=(1,1))\r
                if exporer.hasExporer():\r
                        self.openFileLocationButton = wx.Button(self, -1, "Open file location")\r
                        self.Bind(wx.EVT_BUTTON, self.OnOpenFileLocation, self.openFileLocationButton)\r
-                       self.sizer.Add(self.openFileLocationButton, (3,2), span=(1,1))\r
+                       self.sizer.Add(self.openFileLocationButton, (3,3), span=(1,1))\r
                self.Bind(wx.EVT_BUTTON, self.OnAbort, self.closeButton)\r
                self.Bind(wx.EVT_BUTTON, self.OnPrint, self.printButton)\r
+               self.Bind(wx.EVT_BUTTON, self.OnShowLog, self.logButton)\r
                self.Layout()\r
                self.Fit()\r
 \r
@@ -984,6 +988,9 @@ class ProjectSliceProgressWindow(wx.Frame):
        def OnPrint(self, e):\r
                printWindow.printFile(self.resultFilename)\r
 \r
+       def OnShowLog(self, e):\r
+               LogWindow('\n'.join(self.progressLog))\r
+\r
 class preferencesDialog(configBase.configWindowBase):\r
        def __init__(self, parent):\r
                super(preferencesDialog, self).__init__(title="Project Planner Preferences")\r
@@ -1019,6 +1026,14 @@ class preferencesDialog(configBase.configWindowBase):
                self.MakeModal(False)\r
                self.Destroy()\r
 \r
+class LogWindow(wx.Frame):\r
+       def __init__(self, logText):\r
+               super(LogWindow, self).__init__(None, title="Slice log")\r
+               self.textBox = wx.TextCtrl(self, -1, logText, style=wx.TE_MULTILINE|wx.TE_DONTWRAP|wx.TE_READONLY)\r
+               self.SetSize((400,300))\r
+               self.Centre()\r
+               self.Show(True)\r
+\r
 def main():\r
        app = wx.App(False)\r
        projectPlanner().Show(True)\r