| 221,6 → 221,14 |
|---|
| dc.DrawText(s, sx , sy+1) |
| # ----------- |
| |
| |
| def onNewTest(self, test): |
| index = self.TestListCtrl.InsertStringItem(sys.maxint, test.descr) |
| self.TestListCtrl.SetStringItem(index, 1, str(test.speed)) |
| self.TestListCtrl.SetStringItem(index, 2, test.channel) |
| self.TestListCtrl.SetStringItem(index, 3, "OK") |
| |
| |
| def OnTestSelected(self, event): |
| testId = event.m_itemIndex |
| print "Test Selected id=%d" % (testId) |
| 237,7 → 245,9 |
|---|
| xydata.shape = (nb, 2) |
| xydata[:,1] = vibTest.getRawData() |
| line = wx.lib.plot.PolyLine(xydata, legend= 'Raw Data', colour='red') |
| self.client.Draw(wx.lib.plot.PlotGraphics([line],"Graph Title", "Time (ms)", "Acc"), yAxis= (-y,y)) |
| |
| title = "%s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed) |
| self.client.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y,y)) |
| self.client.SetEnableGrid('Horizontal') |
| |
| |
| 251,10 → 261,11 |
|---|
| |
| |
| class VibTest: |
| def __init__(self, descr, motor, speed, rawData): |
| def __init__(self, descr, motor, speed, channel, rawData): |
| self.descr = descr |
| self.motor = motor |
| self.speed = speed |
| self.channel = channel |
| self.rawData = _Numeric.array(rawData) |
| self.dc = self.rawData.mean() |
| self.rawData -= self.dc |
| 277,13 → 288,11 |
|---|
| wx.App.__init__(self, par) |
| |
| |
| def AddTest(self, descr, motor, speed, rawData): |
| test = VibTest(descr, motor, speed, rawData) |
| def AddTest(self, descr, motor, speed, channel, rawData): |
| test = VibTest(descr, motor, speed, channel, rawData) |
| self.VibTests.append(test) |
| self.frame_1.onNewTest(test) |
| |
| index = self.frame_1.TestListCtrl.InsertStringItem(sys.maxint, test.descr) |
| self.frame_1.TestListCtrl.SetStringItem(index, 3, "OK") |
| |
| def getTest(self, testId): |
| return self.VibTests[testId] |
| |
| 297,23 → 306,38 |
|---|
| return 1 |
| |
| def Import(self): |
| print "Import" |
| logfile = open("./unbal200.txt", "r") |
| #filePath = "./unbal200.txt" |
| filePath = "./nikivan.txt" |
| |
| print "Import %s" % filePath |
| |
| logfile = open(filePath, "r") |
| data = None |
| |
| headers = (logfile.readline()).split(',') |
| nbCols = len(headers) |
| print "NbCols =", nbCols |
| |
| data = [] |
| descr = [] |
| speed = [] |
| channel = [] |
| for c in range(nbCols): |
| data.append([]) |
| h = headers[c].split(' ') |
| print h |
| descr.append(h[0]); |
| speed.append(h[1]); |
| channel.append(h[2]); |
| |
| for line in logfile: |
| values = line.split(',') |
| if data == None: |
| nbCols = len(values) |
| print "%d cols" % nbCols |
| data = [] |
| for i in range(nbCols): |
| data.append([]) |
| else: |
| for i in range(nbCols): |
| data[i].append(int(values[i])) |
| for i in range(nbCols): |
| data[i].append(int(values[i])) |
| logfile.close() |
| for i in range(nbCols): |
| self.AddTest("Imported %d"%i, 0,0, data[i]) |
| |
| for c in range(nbCols): |
| self.AddTest(descr[c], 0, int(speed[c]), channel[c], data[c]) |
| |
| |
| |