From e27befbea3620344b273784bd3ff621cbd065603 Mon Sep 17 00:00:00 2001 From: Kliment Yanev Date: Mon, 14 Nov 2011 09:14:27 +0100 Subject: [PATCH 1/3] Fix alignment of port button --- pronterface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pronterface.py b/pronterface.py index f280dbb..4e4dda3 100755 --- a/pronterface.py +++ b/pronterface.py @@ -380,7 +380,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): self.rescanbtn=wx.Button(self.panel,-1,_("Port"),pos=(380,0)) self.rescanbtn.Bind(wx.EVT_BUTTON,self.rescanports) - uts.Add(self.rescanbtn,wx.TOP|wx.LEFT,5) + uts.Add(self.rescanbtn,wx.TOP|wx.LEFT,0) self.serialport = wx.ComboBox(self.panel, -1, choices=self.scanserial(), style=wx.CB_DROPDOWN|wx.CB_READONLY, pos=(50,0)) From 6783eb1aa6265bd91f693d6f8d552cdd1bfd1cb8 Mon Sep 17 00:00:00 2001 From: Kliment Yanev Date: Mon, 14 Nov 2011 12:10:19 +0100 Subject: [PATCH 2/3] Fix readline link on Windows --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ba61d6..6bc2982 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,8 @@ Download the following, and install in this order: 1. http://python.org/ftp/python/2.7.2/python-2.7.2.msi 2. http://pypi.python.org/packages/any/p/pyserial/pyserial-2.5.win32.exe 3. http://downloads.sourceforge.net/wxpython/wxPython2.8-win32-unicode-2.8.12.0-py27.exe - 4. http://launchpad.net/pyreadline/1.7/1.7/+download/pyreadline-1.7.zip + 4. http://launchpad.net/pyreadline/1.7/1.7/+download/pyreadline-1.7.win32.exe + ## Ubuntu/Debian `sudo apt-get install python-serial python-wxgtk2.8` From 440a5ca5afd76a0b1fb4e5a4a04ab366ae98cf54 Mon Sep 17 00:00:00 2001 From: Kliment Yanev Date: Mon, 14 Nov 2011 16:20:32 +0100 Subject: [PATCH 3/3] Use CallAfter to prevent mysterious double free or corruption error in wx. --- pronterface.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pronterface.py b/pronterface.py index 4e4dda3..3ac803f 100755 --- a/pronterface.py +++ b/pronterface.py @@ -135,8 +135,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole): wx.CallAfter(i.Enable) # Enable XYButtons and ZButtons - self.xyb.enable() - self.zb.enable() + wx.CallAfter(self.xyb.enable) + wx.CallAfter(self.zb.enable) if self.filename: wx.CallAfter(self.printbtn.Enable) @@ -1327,8 +1327,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole): wx.CallAfter(i.Disable) # Disable XYButtons and ZButtons - self.xyb.disable() - self.zb.disable() + wx.CallAfter(self.xyb.disable) + wx.CallAfter(self.zb.disable) if self.paused: self.p.paused=0