Rev 593 | Rev 596 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 593 | Rev 594 | ||
|---|---|---|---|
| Line 190... | Line 190... | ||
| 190 | self.client.SetFontSizeLegend(7) |
190 | self.client.SetFontSizeLegend(7) |
| 191 | self.client.setLogScale((False,False)) |
191 | self.client.setLogScale((False,False)) |
| Line 192... | Line 192... | ||
| 192 | 192 | ||
| - | 193 | ||
| 193 | 194 | # Configure TestListCtrl |
|
| - | 195 | self.TestListCtrl.InsertColumn(0, "Description") |
|
| 194 | # Configure TestListCtrl |
196 | self.TestListCtrl.InsertColumn(1, "Speed") |
| Line 195... | Line 197... | ||
| 195 | self.TestListCtrl.InsertColumn(0, "Name") |
197 | self.TestListCtrl.InsertColumn(2, "Channel") |
| 196 | self.TestListCtrl.InsertColumn(1, "Result") |
198 | self.TestListCtrl.InsertColumn(3, "Result") |
| 197 | 199 | ||
| 198 | def DrawPointLabel(self, dc, mDataDict): |
200 | def DrawPointLabel(self, dc, mDataDict): |
| Line 247... | Line 249... | ||
| 247 | 249 | ||
| Line 248... | Line 250... | ||
| 248 | # end of class MainFrame |
250 | # end of class MainFrame |
| 249 | 251 | ||
| - | 252 | ||
| - | 253 | class VibTest: |
|
| 250 | 254 | def __init__(self, descr, motor, speed, rawData): |
|
| 251 | class VibTest: |
255 | self.descr = descr |
| 252 | def __init__(self, name, rawData): |
256 | self.motor = motor |
| 253 | self.name = name |
257 | self.speed = speed |
| 254 | self.rawData = _Numeric.array(rawData) |
258 | self.rawData = _Numeric.array(rawData) |
| Line 255... | Line 259... | ||
| 255 | self.dc = self.rawData.mean() |
259 | self.dc = self.rawData.mean() |
| 256 | self.rawData -= self.dc |
260 | self.rawData -= self.dc |
| Line 257... | Line 261... | ||
| 257 | self.dataLen = len(rawData) |
261 | self.dataLen = len(rawData) |
| 258 | 262 | ||
| Line 259... | Line 263... | ||
| 259 | def getName(self): |
263 | def getDescr(self): |
| Line 271... | Line 275... | ||
| 271 | self.VibTests = [] |
275 | self.VibTests = [] |
| Line 272... | Line 276... | ||
| 272 | 276 | ||
| Line 273... | Line 277... | ||
| 273 | wx.App.__init__(self, par) |
277 | wx.App.__init__(self, par) |
| 274 | 278 | ||
| 275 | 279 | ||
| Line 276... | Line 280... | ||
| 276 | def AddTest(self, name, rawData): |
280 | def AddTest(self, descr, motor, speed, rawData): |
| 277 | test = VibTest(name, rawData) |
281 | test = VibTest(descr, motor, speed, rawData) |
| Line 278... | Line 282... | ||
| 278 | self.VibTests.append(test) |
282 | self.VibTests.append(test) |
| 279 | 283 | ||
| Line 280... | Line 284... | ||
| 280 | index = self.frame_1.TestListCtrl.InsertStringItem(sys.maxint, test.name) |
284 | index = self.frame_1.TestListCtrl.InsertStringItem(sys.maxint, test.descr) |
| Line 292... | Line 296... | ||
| 292 | self.frame_1.Show() |
296 | self.frame_1.Show() |
| 293 | return 1 |
297 | return 1 |
| Line 294... | Line 298... | ||
| 294 | 298 | ||
| 295 | def Import(self): |
299 | def Import(self): |
| 296 | print "Import" |
300 | print "Import" |
| 297 | logfile = open("../Misc/Matlab/Data/unbal200.txt", "r") |
301 | logfile = open("./unbal200.txt", "r") |
| 298 | data = None |
302 | data = None |
| 299 | for line in logfile: |
303 | for line in logfile: |
| 300 | values = line.split(',') |
304 | values = line.split(',') |
| 301 | if data == None: |
305 | if data == None: |
| 302 | nbCols = len(values) |
306 | nbCols = len(values) |
| 303 | print "%d cols" % nbCols |
307 | print "%d cols" % nbCols |
| 304 | data = [] |
308 | data = [] |
| 305 | for i in range(nbCols): |
309 | for i in range(nbCols): |
| - | 310 | data.append([]) |
|
| 306 | data.append([]) |
311 | else: |
| 307 | for i in range(nbCols): |
312 | for i in range(nbCols): |
| 308 | data[i].append(int(values[i])) |
313 | data[i].append(int(values[i])) |
| 309 | logfile.close() |
314 | logfile.close() |
| 310 | for i in range(nbCols): |
315 | for i in range(nbCols): |