Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 669 → Rev 683

/VibrationTest/trunk/CurrVersion.txt
1,0 → 0,0
1_0
1_1Exp
/VibrationTest/trunk/VibrationTest/VibrationTestGui.py
315,7 → 315,10
# Menu Bar end
self.label_1 = wx.StaticText(self, -1, "Test Description :", style=wx.ALIGN_RIGHT)
self.descrCtrl = wx.TextCtrl(self, -1, "N/A")
self.label_2 = wx.StaticText(self, -1, "Channel(s) :", style=wx.ALIGN_RIGHT)
self.label_1_copy = wx.StaticText(self, -1, "Channel(s) :", style=wx.ALIGN_RIGHT)
self.gyroYawCb = wx.CheckBox(self, -1, "Gyro Yaw")
self.gyroRollCb = wx.CheckBox(self, -1, "Gyro Roll")
self.gyroNickCb = wx.CheckBox(self, -1, "Gyro Nick")
self.accTopCb = wx.CheckBox(self, -1, "ACC Top")
self.accRollCb = wx.CheckBox(self, -1, "ACC Roll")
self.accNickCb = wx.CheckBox(self, -1, "ACC Nick")
363,11 → 366,20
self.label_1.SetMinSize((110, -1))
self.label_1.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.descrCtrl.SetMinSize((350, -1))
self.label_2.SetMinSize((110, -1))
self.label_2.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.label_1_copy.SetMinSize((110, -1))
self.label_1_copy.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.gyroYawCb.SetMinSize((100, -1))
self.gyroYawCb.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.gyroRollCb.SetMinSize((100, -1))
self.gyroRollCb.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.gyroNickCb.SetMinSize((100, -1))
self.gyroNickCb.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.accTopCb.SetMinSize((100, -1))
self.accTopCb.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.accRollCb.SetMinSize((100, -1))
self.accRollCb.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.accRollCb.SetValue(1)
self.accNickCb.SetMinSize((100, -1))
self.accNickCb.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
self.label_3.SetMinSize((110, -1))
self.label_3.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD, 0, ""))
397,7 → 409,10
sizer_7 = wx.BoxSizer(wx.HORIZONTAL)
sizer_13 = wx.BoxSizer(wx.VERTICAL)
sizer_16 = wx.BoxSizer(wx.HORIZONTAL)
sizer_15 = wx.BoxSizer(wx.HORIZONTAL)
sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
sizer_18 = wx.BoxSizer(wx.VERTICAL)
sizer_20 = wx.BoxSizer(wx.HORIZONTAL)
sizer_19 = wx.BoxSizer(wx.HORIZONTAL)
sizer_14 = wx.BoxSizer(wx.HORIZONTAL)
sizer_3.Add((20, 20), 0, 0, 0)
sizer_8.Add((20, 20), 0, 0, 0)
404,16 → 419,24
sizer_14.Add(self.label_1, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_14.Add((20, 20), 0, 0, 0)
sizer_14.Add(self.descrCtrl, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_13.Add(sizer_14, 1, wx.EXPAND, 0)
sizer_13.Add(sizer_14, 0, 0, 0)
sizer_13.Add((20, 5), 0, 0, 0)
sizer_15.Add(self.label_2, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_15.Add((20, 20), 0, 0, 0)
sizer_15.Add(self.accTopCb, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_15.Add((20, 20), 0, 0, 0)
sizer_15.Add(self.accRollCb, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_15.Add((20, 20), 0, 0, 0)
sizer_15.Add(self.accNickCb, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_13.Add(sizer_15, 1, wx.EXPAND, 0)
sizer_10.Add(self.label_1_copy, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
sizer_10.Add((20, 20), 0, 0, 0)
sizer_19.Add(self.gyroYawCb, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_19.Add((20, 20), 0, 0, 0)
sizer_19.Add(self.gyroRollCb, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_19.Add((20, 20), 0, 0, 0)
sizer_19.Add(self.gyroNickCb, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_18.Add(sizer_19, 1, wx.EXPAND, 0)
sizer_20.Add(self.accTopCb, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_20.Add((20, 20), 0, 0, 0)
sizer_20.Add(self.accRollCb, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_20.Add((20, 20), 0, 0, 0)
sizer_20.Add(self.accNickCb, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_18.Add(sizer_20, 1, wx.EXPAND, 0)
sizer_10.Add(sizer_18, 1, wx.EXPAND, 0)
sizer_13.Add(sizer_10, 1, wx.EXPAND, 0)
sizer_13.Add((20, 5), 0, 0, 0)
sizer_16.Add(self.label_3, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_16.Add((20, 20), 0, 0, 0)
422,11 → 445,11
sizer_16.Add(self.label_4, 0, wx.RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
sizer_16.Add((20, 20), 0, 0, 0)
sizer_16.Add(self.speedCtrl, 0, wx.ALIGN_CENTER_VERTICAL, 0)
sizer_13.Add(sizer_16, 1, wx.EXPAND, 0)
sizer_13.Add(sizer_16, 0, wx.EXPAND, 0)
sizer_7.Add(sizer_13, 1, wx.EXPAND, 0)
sizer_7.Add((20, 20), 0, 0, 0)
sizer_7.Add((20, 20), 0, 0, 0)
sizer_9.Add(sizer_7, 1, wx.EXPAND, 0)
sizer_9.Add(sizer_7, 0, 0, 0)
sizer_9.Add(self.bitmap_button_1, 0, 0, 0)
sizer_8.Add(sizer_9, 0, 0, 0)
sizer_17.Add((20, 20), 0, 0, 0)
694,6 → 717,9
 
decoding = "Channel(s)"
mp.channels = []
if self.gyroYawCb.IsChecked(): mp.channels.append(0)
if self.gyroRollCb.IsChecked(): mp.channels.append(1)
if self.gyroNickCb.IsChecked(): mp.channels.append(2)
if self.accTopCb.IsChecked(): mp.channels.append(5)
if self.accRollCb.IsChecked(): mp.channels.append(6)
if self.accNickCb.IsChecked(): mp.channels.append(7)
778,7 → 804,7
print "about"
info = wx.AboutDialogInfo()
info.Name = "MK Vibration Test - "
info.Version = "v1.0 ($Rev$)".replace("$","")
info.Version = "v1.1 (EXPERIMENTAL) ($Rev$)".replace("$","")
info.Copyright = ""
info.Developers=["Frederic Goddeeris (Frederic@rc-flight.be)"]
info.Description = "Please consult the WIKI page for a complete description of the tool:"
/VibrationTest/trunk/VibrationTest/VibrationTestGui.wxg
1,7 → 1,7
<?xml version="1.0"?>
<!-- generated by wxGlade 0.6.3 on Wed Oct 14 07:21:13 2009 -->
<!-- generated by wxGlade 0.6.3 on Thu Nov 05 18:35:57 2009 -->
 
<application path="C:\DATA\MK\SVN\Projects\VibrationTest\trunk\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\trunk\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>
112,9 → 112,8
<object class="wxBoxSizer" name="sizer_9" base="EditBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<flag>wxEXPAND</flag>
<border>0</border>
<option>1</option>
<option>0</option>
<object class="wxBoxSizer" name="sizer_7" base="EditBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
124,9 → 123,8
<object class="wxBoxSizer" name="sizer_13" base="EditBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<flag>wxEXPAND</flag>
<border>0</border>
<option>1</option>
<option>0</option>
<object class="wxBoxSizer" name="sizer_14" base="EditBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
179,13 → 177,13
<flag>wxEXPAND</flag>
<border>0</border>
<option>1</option>
<object class="wxBoxSizer" name="sizer_15" base="EditBoxSizer">
<object class="wxBoxSizer" name="sizer_10" base="EditBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL</flag>
<flag>wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<option>0</option>
<object class="wxStaticText" name="label_2" base="EditStaticText">
<object class="wxStaticText" name="label_1_copy" base="EditStaticText">
<style>wxALIGN_RIGHT</style>
<attribute>1</attribute>
<label>Channel(s) :</label>
209,70 → 207,164
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL</flag>
<flag>wxEXPAND</flag>
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="accTopCb" base="EditCheckBox">
<label>ACC Top</label>
<font>
<size>8</size>
<family>default</family>
<style>normal</style>
<weight>bold</weight>
<underlined>0</underlined>
<face></face>
</font>
<option>1</option>
<object class="wxBoxSizer" name="sizer_18" base="EditBoxSizer">
<orient>wxVERTICAL</orient>
<object class="sizeritem">
<flag>wxEXPAND</flag>
<border>0</border>
<option>1</option>
<object class="wxBoxSizer" name="sizer_19" base="EditBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="gyroYawCb" base="EditCheckBox">
<label>Gyro Yaw</label>
<font>
<size>8</size>
<family>default</family>
<style>normal</style>
<weight>bold</weight>
<underlined>0</underlined>
<face></face>
</font>
<size>100, -1</size>
</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>wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="gyroRollCb" base="EditCheckBox">
<label>Gyro Roll</label>
<font>
<size>8</size>
<family>default</family>
<style>normal</style>
<weight>bold</weight>
<underlined>0</underlined>
<face></face>
</font>
<size>100, -1</size>
</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>wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="gyroNickCb" base="EditCheckBox">
<label>Gyro Nick</label>
<font>
<size>8</size>
<family>default</family>
<style>normal</style>
<weight>bold</weight>
<underlined>0</underlined>
<face></face>
</font>
<size>100, -1</size>
</object>
</object>
</object>
</object>
<object class="sizeritem">
<flag>wxEXPAND</flag>
<border>0</border>
<option>1</option>
<object class="wxBoxSizer" name="sizer_20" base="EditBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">
<flag>wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="accTopCb" base="EditCheckBox">
<label>ACC Top</label>
<font>
<size>8</size>
<family>default</family>
<style>normal</style>
<weight>bold</weight>
<underlined>0</underlined>
<face></face>
</font>
<size>100, -1</size>
</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>wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="accRollCb" base="EditCheckBox">
<checked>1</checked>
<label>ACC Roll</label>
<font>
<size>8</size>
<family>default</family>
<style>normal</style>
<weight>bold</weight>
<underlined>0</underlined>
<face></face>
</font>
<size>100, -1</size>
</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>wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="accNickCb" base="EditCheckBox">
<label>ACC Nick</label>
<font>
<size>8</size>
<family>default</family>
<style>normal</style>
<weight>bold</weight>
<underlined>0</underlined>
<face></face>
</font>
<size>100, -1</size>
</object>
</object>
</object>
</object>
</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>wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="accRollCb" base="EditCheckBox">
<checked>1</checked>
<label>ACC Roll</label>
<font>
<size>8</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>wxALIGN_CENTER_VERTICAL</flag>
<border>0</border>
<option>0</option>
<object class="wxCheckBox" name="accNickCb" base="EditCheckBox">
<label>ACC Nick</label>
<font>
<size>8</size>
<family>default</family>
<style>normal</style>
<weight>bold</weight>
<underlined>0</underlined>
<face></face>
</font>
</object>
</object>
</object>
</object>
<object class="sizeritem">
286,7 → 378,7
<object class="sizeritem">
<flag>wxEXPAND</flag>
<border>0</border>
<option>1</option>
<option>0</option>
<object class="wxBoxSizer" name="sizer_16" base="EditBoxSizer">
<orient>wxHORIZONTAL</orient>
<object class="sizeritem">