Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 593 → Rev 594

/VibrationTest/trunk/VibrationTest/VibrationTestGui.py
192,8 → 192,10
 
 
# Configure TestListCtrl
self.TestListCtrl.InsertColumn(0, "Name")
self.TestListCtrl.InsertColumn(1, "Result")
self.TestListCtrl.InsertColumn(0, "Description")
self.TestListCtrl.InsertColumn(1, "Speed")
self.TestListCtrl.InsertColumn(2, "Channel")
self.TestListCtrl.InsertColumn(3, "Result")
 
def DrawPointLabel(self, dc, mDataDict):
"""This is the fuction that defines how the pointLabels are plotted
249,15 → 251,17
 
 
class VibTest:
def __init__(self, name, rawData):
self.name = name
def __init__(self, descr, motor, speed, rawData):
self.descr = descr
self.motor = motor
self.speed = speed
self.rawData = _Numeric.array(rawData)
self.dc = self.rawData.mean()
self.rawData -= self.dc
self.dataLen = len(rawData)
 
def getName(self):
return self.name
def getDescr(self):
return self.Descr
 
def getRawData(self):
return self.rawData
273,12 → 277,12
wx.App.__init__(self, par)
 
 
def AddTest(self, name, rawData):
test = VibTest(name, rawData)
def AddTest(self, descr, motor, speed, rawData):
test = VibTest(descr, motor, speed, rawData)
self.VibTests.append(test)
 
index = self.frame_1.TestListCtrl.InsertStringItem(sys.maxint, test.name)
self.frame_1.TestListCtrl.SetStringItem(index, 1, "OK")
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]
294,7 → 298,7
 
def Import(self):
print "Import"
logfile = open("../Misc/Matlab/Data/unbal200.txt", "r")
logfile = open("./unbal200.txt", "r")
data = None
for line in logfile:
values = line.split(',')
304,11 → 308,12
data = []
for i in range(nbCols):
data.append([])
for i in range(nbCols):
data[i].append(int(values[i]))
else:
for i in range(nbCols):
data[i].append(int(values[i]))
logfile.close()
for i in range(nbCols):
self.AddTest("Imported %d"%i, data[i])
self.AddTest("Imported %d"%i, 0,0, data[i])