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), flag=wx.ALIGN_CENTER)\r
+ self.sizer.Add(self.statusText, (0,0))\r
self.sizer.Add(self.progressGauge, (1, 0), flag=wx.EXPAND)\r
self.sizer.Add(self.progressGauge2, (2, 0), flag=wx.EXPAND)\r
\r
resultFile = open(self.resultFilename, "w")\r
put = profile.setTempOverride\r
for action in self.actionList:\r
+ wx.CallAfter(self.SetTitle, "Building: [%d/%d]" % (self.actionList.index(action) + 1, len(self.actionList)))\r
p = subprocess.Popen(action.sliceCmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)\r
line = p.stdout.readline()\r
\r
\r
self.abort = True\r
sliceTime = time.time() - self.sliceStartTime\r
- status = "Slicing took: %02d:%02d\n" % (sliceTime / 60, sliceTime % 60)\r
- status = "Filament: %.2fm %.2fg\n" % (gcode.extrusionAmount / 1000, gcode.calculateWeight() * 1000)\r
- status += "Print time: %02d:%02d\n" % (int(gcode.totalMoveTimeMinute / 60), int(gcode.totalMoveTimeMinute % 60))\r
+ status = "Build: %s" % (self.resultFilename)\r
+ status += "\nSlicing took: %02d:%02d" % (sliceTime / 60, sliceTime % 60)\r
+ status += "\nFilament: %.2fm %.2fg" % (gcode.extrusionAmount / 1000, gcode.calculateWeight() * 1000)\r
+ status += "\nPrint time: %02d:%02d" % (int(gcode.totalMoveTimeMinute / 60), int(gcode.totalMoveTimeMinute % 60))\r
cost = gcode.calculateCost()\r
if cost != False:\r
- status += "Cost: %s\n" % (cost)\r
+ status += "\nCost: %s" % (cost)\r
wx.CallAfter(self.statusText.SetLabel, status)\r
- \r
wx.CallAfter(self.abortButton.SetLabel, 'Close')\r
+ wx.CallAfter(self.Layout)\r
+ wx.CallAfter(self.Fit)\r
\r
class preferencesDialog(configBase.configWindowBase):\r
def __init__(self, parent):\r