Fix the print window resizing (no longer move the cancel button). Fix the reporting...

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 5a1ef33859359c917954700fc28b14e21b727bbe..18ff413ba5d452ec4a696a3863c7e737ea103f22 100644 (file)
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -130,7 +130,7 @@ class printWindow(wx.Frame):
                self.sizer.Add(self.pauseButton, pos=(3,1))\r
                self.sizer.Add(self.cancelButton, pos=(4,1))\r
                self.sizer.Add(self.machineLogButton, pos=(5,1))\r
-               self.sizer.Add(self.progress, pos=(6,0), span=(1,2), flag=wx.EXPAND)\r
+               self.sizer.Add(self.progress, pos=(6,0), span=(1,7), flag=wx.EXPAND)\r
 \r
                nb = wx.Notebook(self.panel)\r
                self.sizer.Add(nb, pos=(0,3), span=(6,4), flag=wx.EXPAND)\r
@@ -263,7 +263,7 @@ class printWindow(wx.Frame):
                        self.camPreview.timer.Start(500)\r
                        self.camPreview.Bind(wx.EVT_ERASE_BACKGROUND, self.OnCameraEraseBackground)\r
 \r
-               self.sizer.AddGrowableRow(3)\r
+               self.sizer.AddGrowableRow(5)\r
                self.sizer.AddGrowableCol(3)\r
                \r
                self.Bind(wx.EVT_CLOSE, self.OnClose)\r
@@ -622,6 +622,6 @@ class LogWindow(wx.Frame):
        def __init__(self, logText):\r
                super(LogWindow, self).__init__(None, title="Machine 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.SetSize((500,400))\r
                self.Centre()\r
                self.Show(True)\r

diff --git a/Cura/util/machineCom.py b/Cura/util/machineCom.py
index f8ac66f1c699695775ea0c6d7250d3dd3bd805b3..2be74533084bc494271f387742da0d0612a2ca95 100644 (file)
--- a/Cura/util/machineCom.py
+++ b/Cura/util/machineCom.py
@@ -280,10 +280,10 @@ class MachineCom(object):
                                        line = line.rstrip() + self._readline()
                                self._errorValue = line
                                self._changeState(self.STATE_ERROR)
-                       if 'T:' in line:
-                               self._temp = float(re.search("[0-9\.]*", line.split('T:')[1]).group(0))
-                               if 'B:' in line:
-                                       self._bedTemp = float(re.search("[0-9\.]*", line.split('B:')[1]).group(0))
+                       if ' T:' in line:
+                               self._temp = float(re.search("[0-9\.]*", line.split(' T:')[1]).group(0))
+                               if ' B:' in line:
+                                       self._bedTemp = float(re.search("[0-9\.]*", line.split(' B:')[1]).group(0))
                                self._callback.mcTempUpdate(self._temp, self._bedTemp)
                        elif line.strip() != 'ok':
                                self._callback.mcMessage(line)
@@ -369,8 +369,7 @@ class MachineCom(object):
                if ret == '':
                        #self._log("Recv: TIMEOUT")
                        return ''
-               if ret != 'ok\n':
-                       self._log("Recv: %s" % (unicode(ret, 'ascii', 'replace').encode('ascii', 'replace').rstrip()))
+               self._log("Recv: %s" % (unicode(ret, 'ascii', 'replace').encode('ascii', 'replace').rstrip()))
                return ret
        
        def close(self, isError = False):
@@ -388,8 +387,7 @@ class MachineCom(object):
        def _sendCommand(self, cmd):
                if self._serial == None:
                        return
-               if not cmd.startswith('N'):
-                       self._log('Send: %s' % (cmd))
+               self._log('Send: %s' % (cmd))
                try:
                        #TODO: This can throw a write timeout exception, but we do not want timeout on writes. Find a fix for this.
                        #       Oddly enough, the write timeout is not even set and thus we should not get a write timeout.