From 8af0ab8fb4f2c01826b71ee4f5ac4184abc40425 Mon Sep 17 00:00:00 2001 From: Kliment Yanev Date: Sun, 13 Nov 2011 23:31:45 +0100 Subject: [PATCH 1/2] Closes #83 --- test.py | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 test.py diff --git a/test.py b/test.py deleted file mode 100644 index a5ab9f7..0000000 --- a/test.py +++ /dev/null @@ -1,34 +0,0 @@ -import wx, os, math -from bufferedcanvas import * - -from xybuttons import XYButtons -from zbuttons import ZButtons - -class MyFrame(wx.Frame): - def __init__(self, parent, id, title): - wx.Frame.__init__(self, parent, id, title, wx.DefaultPosition, wx.Size(600, 400)) - sizer = wx.BoxSizer() - self.xy = XYButtons(self, moveCallback=self.moveXY) - sizer.Add(self.xy, flag=wx.ALIGN_CENTER) - self.z = ZButtons(self, moveCallback=self.moveZ) - sizer.Add(self.z, flag=wx.ALIGN_CENTER) - - self.SetSizer(sizer) - self.SetBackgroundColour("white") - - def moveXY(self, x, y): - print "got x", x, 'y', y - - def moveZ(self, z): - print "got z", z - - -class MyApp(wx.App): - def OnInit(self): - frame = MyFrame(None, -1, 'test.py') - frame.Show(True) - frame.Centre() - return True - -app = MyApp(0) -app.MainLoop() \ No newline at end of file From 9c36456500ae177acb25c7db1ee88930f4ab94cc Mon Sep 17 00:00:00 2001 From: Kliment Yanev Date: Sun, 13 Nov 2011 23:54:00 +0100 Subject: [PATCH 2/2] Populate port dialog by default --- pronterface.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pronterface.py b/pronterface.py index 3ef8f17..f280dbb 100755 --- a/pronterface.py +++ b/pronterface.py @@ -382,7 +382,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole): uts.Add(self.rescanbtn,wx.TOP|wx.LEFT,5) self.serialport = wx.ComboBox(self.panel, -1, - choices=[], + choices=self.scanserial(), style=wx.CB_DROPDOWN|wx.CB_READONLY, pos=(50,0)) self.rescanports() uts.Add(self.serialport)