Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 720 → Rev 719

/VibrationTest/branches/ParameterTest/VibrationTest/VibrationTestGui.py
69,7 → 69,6
# 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)
82,14 → 81,11
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):
96,7 → 92,6
# 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))
117,8 → 112,6
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):
135,8 → 128,6
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)
162,13 → 153,11
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)
179,7 → 168,7
self.SetSize((600, 450))
# end wxGlade
 
def doLoad(self):
def onLoad(self, event): # wxGlade: MkSettingsDialog.<event_handler>
print "Loading MK Settings"
mk = MkProtocol.MkComm()
186,54 → 175,20
mk.open(comPort=self.app.settings["serialport"].value)
msg = mk.getSettingsMsg()
s = "%d %s" % (msg.getIndex(), msg.getName())
print s
self.statusText.SetLabel(s)
print "Index=",msg.getIndex()
print "Name=",msg.getName()
 
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))
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))
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
 
 
1129,11 → 1084,11
orgSetting = self.mk.getSettingsMsg()
testSettings = copy.deepcopy(orgSetting)
testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_P, I)
testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_I, 120)
# testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_P, I)
# testSettings.setSetting(MkProtocol.SettingsMsg.IDX_GYRO_I, 65)
# 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())
1140,7 → 1095,7
#time.sleep(3)
## DISTURB
msg = MkProtocol.MkMsg(address=2, cmd='f', data=[3, 50])
msg = MkProtocol.MkMsg(address=2, cmd='f', data=[7, 50])
self.mk.sendMsg(msg)
time.sleep(.1)
/VibrationTest/branches/ParameterTest/VibrationTest/VibrationTestGui.wxg
1,7 → 1,7
<?xml version="1.0"?>
<!-- generated by wxGlade 0.6.3 on Sun Dec 20 11:19:47 2009 -->
<!-- generated by wxGlade 0.6.3 on Fri Dec 11 18:40:58 2009 -->
 
<application path="C:\DATA\MK\SVN\Projects\VibrationTest\branches\ParameterTest\VibrationTest\VibrationTestGui.py" name="VibrationTestGui" class="App" option="0" language="python" top_window="frame_1" encoding="ISO-8859-15" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.6" is_template="0">
<application path="D:\Fred\MK\SVN\Projects\VibrationTest\branches\ParameterTest\VibrationTest\VibrationTestGui.py" name="VibrationTestGui" class="App" option="0" language="python" top_window="frame_1" encoding="ISO-8859-15" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.6" is_template="0">
<object class="MainFrame" name="frame_1" base="EditFrame">
<style>wxDEFAULT_FRAME_STYLE</style>
<title>VibrationTest</title>
954,30 → 954,6
<object class="wxBoxSizer" name="sizer_23" base="EditBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<border>0</border>
<option>0</option>
<object class="wxStaticText" name="statusText" base="EditStaticText">
<attribute>1</attribute>
<label>--</label>
<font>
<size>14</size>
<family>default</family>
<style>normal</style>
<weight>bold</weight>
<underlined>0</underlined>
<face></face>
</font>
</object>
</object>
<object class="sizeritem">
<border>0</border>
<option>0</option>
<object class="spacer" name="spacer" base="EditSpacer">
<height>20</height>
<width>20</width>
</object>
</object>
<object class="sizeritem">
<flag>wxEXPAND</flag>
<border>0</border>
<option>1</option>
1241,14 → 1217,6
<width>20</width>
</object>
</object>
<object class="sizeritem">
<border>0</border>
<option>0</option>
<object class="spacer" name="spacer" base="EditSpacer">
<height>20</height>
<width>20</width>
</object>
</object>
</object>
</object>
<object class="sizeritem">
1262,7 → 1230,6
<option>0</option>
<object class="wxButton" name="loadButton" base="EditButton">
<label>Load</label>
<background>#00ff00</background>
<events>
<handler event="EVT_BUTTON">onLoad</handler>
</events>
1281,10 → 1248,6
<option>0</option>
<object class="wxButton" name="storeButton" base="EditButton">
<label>Store</label>
<background>#ff0000</background>
<events>
<handler event="EVT_BUTTON">onStore</handler>
</events>
</object>
</object>
<object class="sizeritem">
1295,16 → 1258,6
<width>20</width>
</object>
</object>
<object class="sizeritem">
<border>0</border>
<option>0</option>
<object class="wxButton" name="defaultButton" base="EditButton">
<label>Default</label>
<events>
<handler event="EVT_BUTTON">onDefault</handler>
</events>
</object>
</object>
</object>
</object>
<object class="sizeritem">