Merge remote branch 'kliment/master' into experimental
commit
6453dbb175
|
@ -413,7 +413,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
|
||||||
|
|
||||||
uts.Add(self.rescanbtn,wx.TOP|wx.LEFT,5)
|
uts.Add(self.rescanbtn,wx.TOP|wx.LEFT,5)
|
||||||
self.serialport = wx.ComboBox(self.panel, -1,
|
self.serialport = wx.ComboBox(self.panel, -1,
|
||||||
choices=[],
|
choices=self.scanserial(),
|
||||||
style=wx.CB_DROPDOWN|wx.CB_READONLY, pos=(50,0))
|
style=wx.CB_DROPDOWN|wx.CB_READONLY, pos=(50,0))
|
||||||
self.rescanports()
|
self.rescanports()
|
||||||
uts.Add(self.serialport)
|
uts.Add(self.serialport)
|
||||||
|
|
34
test.py
34
test.py
|
@ -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()
|
|
Loading…
Reference in New Issue