Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 719 → Rev 720

/VibrationTest/branches/ParameterTest/VibrationTest/VibrationTestGui.py
69,6 → 69,7
# begin wxGlade: MkSettingsDialog.__init__
kwds["style"] = wx.DEFAULT_FRAME_STYLE
wx.Frame.__init__(self, *args, **kwds)
self.statusText = wx.StaticText(self, -1, "--")
self.label_2 = wx.StaticText(self, -1, "Gyro-P", style=wx.ALIGN_RIGHT)
self.slider_GyroP = wx.Slider(self, -1, 0, 0, 255, style=wx.SL_HORIZONTAL|wx.SL_LABELS)
self.label_2_copy = wx.StaticText(self, -1, "Gyro-I", style=wx.ALIGN_RIGHT)
81,11 → 82,14
self.slider_1_copy_3 = wx.Slider(self, -1, 0, 0, 255, style=wx.SL_HORIZONTAL|wx.SL_LABELS)
self.loadButton = wx.Button(self, -1, "Load")
self.storeButton = wx.Button(self, -1, "Store")
self.defaultButton = wx.Button(self, -1, "Default")
 
self.__set_properties()
self.__do_layout()
 
self.Bind(wx.EVT_BUTTON, self.onLoad, self.loadButton)
self.Bind(wx.EVT_BUTTON, self.onStore, self.storeButton)
self.Bind(wx.EVT_BUTTON, self.onDefault, self.defaultButton)
# end wxGlade
 
def __set_properties(self):
92,6 → 96,7
# begin wxGlade: MkSettingsDialog.__set_properties
self.SetTitle("MK Settings")
self.SetSize((600, 450))
self.statusText.SetFont(wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.label_2.SetMinSize((80, 16))
self.label_2.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.slider_GyroP.SetMinSize((400, -1))
112,6 → 117,8
self.label_2_copy_3.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.slider_1_copy_3.SetMinSize((400, -1))
self.slider_1_copy_3.SetBackgroundColour(wx.Colour(128, 128, 128))
self.loadButton.SetBackgroundColour(wx.Colour(0, 255, 0))
self.storeButton.SetBackgroundColour(wx.Colour(255, 0, 0))
# end wxGlade
 
def __do_layout(self):
128,6 → 135,8
sizer_24 = wx.BoxSizer(wx.HORIZONTAL)
sizer_21.Add((20, 20), 0, 0, 0)
sizer_22.Add((20, 20), 0, 0, 0)
sizer_23.Add(self.statusText, 0, 0, 0)
sizer_23.Add((20, 20), 0, 0, 0)
sizer_24.Add(self.label_2, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
sizer_24.Add((20, 20), 0, 0, 0)
sizer_24.Add(self.slider_GyroP, 0, 0, 0)
153,11 → 162,13
sizer_24_copy_3.Add(self.slider_1_copy_3, 0, 0, 0)
sizer_23.Add(sizer_24_copy_3, 1, wx.EXPAND, 0)
sizer_23.Add((20, 20), 0, 0, 0)
sizer_23.Add((20, 20), 0, 0, 0)
sizer_22.Add(sizer_23, 1, wx.EXPAND, 0)
sizer_25.Add(self.loadButton, 0, 0, 0)
sizer_25.Add((20, 20), 0, 0, 0)
sizer_25.Add(self.storeButton, 0, 0, 0)
sizer_25.Add((20, 20), 0, 0, 0)
sizer_25.Add(self.defaultButton, 0, 0, 0)
sizer_22.Add(sizer_25, 1, wx.EXPAND, 0)
sizer_22.Add((20, 20), 0, 0, 0)
sizer_21.Add(sizer_22, 0, 0, 0)
168,7 → 179,7
self.SetSize((600, 450))
# end wxGlade
 
def onLoad(self, event): # wxGlade: MkSettingsDialog.<event_handler>
def doLoad(self):
print "Loading MK Settings"
mk = MkProtocol.MkComm()
175,20 → 186,54
mk.open(comPort=self.app.settings["serialport"].value)
msg = mk.getSettingsMsg()
print "Index=",msg.getIndex()
print "Name=",msg.getName()
s = "%d %s" % (msg.getIndex(), msg.getName())
print s
self.statusText.SetLabel(s)
 
self.slider_GyroP.SetValue(msg.getSetting(SettingsMsg.IDX_STICK_P))
self.slider_GyroP.SetValue(msg.getSetting(SettingsMsg.IDX_STICK_I))
self.slider_GyroP.SetValue(msg.getSetting(SettingsMsg.IDX_STICK_D))
self.slider_GyroP.SetValue(msg.getSetting(MkProtocol.SettingsMsg.IDX_GYRO_P))
self.slider_GyroI.SetValue(msg.getSetting(MkProtocol.SettingsMsg.IDX_GYRO_I))
self.slider_GyroD.SetValue(msg.getSetting(MkProtocol.SettingsMsg.IDX_GYRO_D))
self.slider_FactorI.SetValue(msg.getSetting(MkProtocol.SettingsMsg.IDX_I_FACTOR))
mk.close()
event.Skip()
 
def doStore(self):
print "Storing MK Settings"
mk = MkProtocol.MkComm()
mk.open(comPort=self.app.settings["serialport"].value)
msg = mk.getSettingsMsg()
msg.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_P, self.slider_GyroP.GetValue())
msg.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_I, self.slider_GyroI.GetValue())
msg.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_D, self.slider_GyroD.GetValue())
msg.setSetting(MkProtocol.SettingsMsg.IDX_I_FACTOR, self.slider_FactorI.GetValue())
mk.sendSettings(msg.getSettings())
def setApp(self, app):
self.app = app
 
 
def onLoad(self, event): # wxGlade: MkSettingsDialog.<event_handler>
self.doLoad()
event.Skip()
 
def onStore(self, event): # wxGlade: MkSettingsDialog.<event_handler>
self.doStore()
event.Skip()
 
def onDefault(self, event): # wxGlade: MkSettingsDialog.<event_handler>
self.slider_GyroP.SetValue(100)
self.slider_GyroI.SetValue(120)
self.slider_GyroD.SetValue(3)
self.slider_FactorI.SetValue(16)
event.Skip()
 
# end of class MkSettingsDialog
 
 
1084,11 → 1129,11
orgSetting = self.mk.getSettingsMsg()
testSettings = copy.deepcopy(orgSetting)
# testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_P, I)
# testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_I, 65)
testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_P, I)
testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_I, 120)
testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_P, 0)
testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_I, I)
# testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_P, 0)
# testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_I, I)
self.mk.sendSettings(testSettings.getSettings())
1095,7 → 1140,7
#time.sleep(3)
## DISTURB
msg = MkProtocol.MkMsg(address=2, cmd='f', data=[7, 50])
msg = MkProtocol.MkMsg(address=2, cmd='f', data=[3, 50])
self.mk.sendMsg(msg)
time.sleep(.1)