Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 642 → Rev 643

/VibrationTest/trunk/VibrationTest/VibrationTestGui.py
329,7 → 329,7
self.label_40 = wx.StaticText(self, -1, "Graph Type ")
self.graphTypeChoice = wx.Choice(self, -1, choices=["Raw Signal", "Filtered Signal", "Spectrum"])
self.label_41 = wx.StaticText(self, -1, "Y Axis Range ")
self.yAxisChoice = wx.Choice(self, -1, choices=["25", "50", "100", "200"])
self.yAxisChoice = wx.Choice(self, -1, choices=["25", "50", "75", "100", "200"])
self.copyGraphButton = wx.Button(self, -1, "Copy Graph Data")
self.TestListCtrl = wx.ListCtrl(self, -1, style=wx.LC_REPORT|wx.SUNKEN_BORDER)
 
586,7 → 586,7
title = "Raw Signal: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed)
self.graphCtrl.setLogScale((False,False))
self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y,y))
self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y/2,y/2))
self.graphCtrl.SetEnableGrid('Horizontal')
self.graphCtrl.SetEnableLegend(False)
599,7 → 599,7
title = "Filtered Signal: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed)
self.graphCtrl.setLogScale((False,False))
self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y,y))
self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y/2,y/2))
self.graphCtrl.SetEnableGrid('Horizontal')
self.graphCtrl.SetEnableLegend(False)
681,8 → 681,10
if self.accRollCb.IsChecked(): mp.channels.append(6)
if self.accNickCb.IsChecked(): mp.channels.append(7)
s = self.speedCtrl.GetValue()
if s=="test":
mp.speeds = (100,100,100,100,100, 150,150,150,150,150, 200,200,200,200,200, 100,150,200, 100,150,200, 100,150,200, 100,150,200)
if s=="test1":
mp.speeds = (100,100,100,100,100,100,100,100, 200,200,200,200,200,200,200,200, 100,200, 100,200, 100,200, 100,200)
elif s=="test2":
mp.speeds = (100,100,100,100,100, 150,150,150,150,150, 200,200,200,200,200, 100,150,200, 100,150,200, 100,150,200, 100,150,200)
elif s.count("-") == 1:
# assume from-to:step format
s = s.split("-")
750,9 → 752,9
print "about"
info = wx.AboutDialogInfo()
info.Name = "MK Vibration Test"
info.Version = "0.2"
info.Version = "0.9"
info.Copyright = ""
info.Developers=["Frederic Goddeeris"]
info.Developers=["Frederic Goddeeris Frederic@rc-flight.be"]
info.Description = "Please consult the WIKI page for a complete description of the tool:"
info.WebSite = ("http://www.mikrokopter.de/ucwiki/en/VibrationTest", "VibrationTest WIKI page")
wx.AboutBox(info)