WebSVN - Projects - Diff - Rev 614 and 615 - /VibrationTest/trunk/VibrationTest/VibrationTestGui.py

 import mkProto
 CHANNEL_NAMES = ["GyroYaw", "GyroRoll", "GyroNick", "Pressure", "Batt", "AccTop", "AccRoll", "AccNick"]
-CHANNEL_NAMES = ["GyroYaw", "GyroRoll", "GyroNick", "Pressure", "Batt", "AccTop", "AccRoll", "AccNick"]
+FS = 11111
     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)
-        vv = int(test.getVibValue())
+        vv = int(test.getVibValue(self.app.settings["hpf"].value, self.app.settings["lpf"].value))
         vvs = "|%s| (%d)" % ("----------------------------------------------------------------------------------------------------"[0:min(vv,100)], vv)
         self.TestListCtrl.SetStringItem(index, 3, vvs)
              self.graphTypeChoice.Disable()
              x = 1
              data = []
              idx = self.TestListCtrl.GetFirstSelected()
              while idx != -1:
-                 data.append([x,self.app.getTest(idx).getVibValue()])
+                 data.append([x,self.app.getTest(idx).getVibValue(self.app.settings["hpf"].value, self.app.settings["lpf"].value)])
                  x += 1
                  idx = self.TestListCtrl.GetNextSelected(idx)
              line = wx.lib.plot.PolyLine(data, legend= 'Vibrations', colour='red', width=2)
              markers = wx.lib.plot.PolyMarker(data, legend= '', colour='red', marker='circle',size=2)
              title = "Comparing tests"
                  self.client.SetEnableGrid('Horizontal')
              if self.graphTypeChoice.GetSelection() == 1:
                  xydata = _Numeric.linspace(0,0.09*nb,2*nb)
                  xydata.shape = (nb, 2)
-                 xydata[:,1] = vibTest.getFilteredData()
+                 xydata[:,1] = vibTest.getFilteredData(self.app.settings["hpf"].value, self.app.settings["lpf"].value)
                  line = wx.lib.plot.PolyLine(xydata, legend= 'Raw Data', colour='red', width=2)
                  title = "Filtered Signal: %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')
              elif self.graphTypeChoice.GetSelection() == 2:
-                 xydata = _Numeric.linspace(0,5555,nb)
+                 xydata = _Numeric.linspace(0,FS/2,nb)
                  xydata.shape = (nb/2, 2)
+                 xydata[:,1] = vibTest.getSpectrum()
+                 line = wx.lib.plot.PolyLine(xydata, legend= 'Spectrum', colour='red')
+                 markers = wx.lib.plot.PolyMarker(xydata, legend= '', colour='red', marker='circle',size=2)
-                 xydata[:,1] = vibTest.getSpectrum()
+                 fc = self.app.settings["hpf"].value
                  filterLine1 = wx.lib.plot.PolyLine(((fc,0),(fc,y)), legend='HP Filter', colour='Black', width=4)
-                 line = wx.lib.plot.PolyLine(xydata, legend= 'Spectrum', colour='red')
+                 fc = self.app.settings["lpf"].value
-                 markers = wx.lib.plot.PolyMarker(xydata, legend= '', colour='red', marker='circle',size=2)
+                 filterLine2 = wx.lib.plot.PolyLine(((fc,0),(fc,y)), legend='HP Filter', colour='Black', width=4)
         self.fft = _Numeric.fft.rfft(self.rawData)
+        self.spectrum = None
+        self.filteredData = None
-        self.spectrum = None
+        self.fc1 = None
-        self.filteredData = None
+        self.fc2 = None
     def getSpectrum(self):
         if self.spectrum == None:
             self.spectrum = _Numeric.absolute(self.fft[1:self.dataLen/2+1]) / (self.dataLen/2)
         return self.spectrum
+    def getFilteredData(self, fc1, fc2):
+        if self.fc1 != fc1 or self.fc2 != fc2:
+            self.filteredData = None
     def getFilteredData(self):
         if self.filteredData == None:
+            tmpfft = self.fft.copy()
+            fc = (float(fc1))/(FS/2)*len(tmpfft)
-            tmpfft = self.fft.copy()
+            print "fc1=%d => fc=%d" % (fc1,fc)
-            for i in range(0,5):
+            for i in range(0,int(fc)):
+                tmpfft[i] = 0
+            fc = (float(fc2))/(FS/2)*len(tmpfft)
-                tmpfft[i] = 0
+            print "fc2=%d => fc=%d" % (fc2,fc)
-            for i in range(30, len(tmpfft)):
+            for i in range(int(fc), len(tmpfft)):
                 tmpfft[i] = 0
+            self.filteredData = _Numeric.fft.irfft(tmpfft)
+            self.fc1 = fc1
+            self.fc2 = fc2
             self.filteredData = _Numeric.fft.irfft(tmpfft)
         return self.filteredData
+    def getVibValue(self, fc1, fc2):
       if self.fc1 != fc1 or self.fc2 != fc2:
-    def getVibValue(self):
+        self.vibValue = None
       if self.vibValue == None:
-        fd = self.getFilteredData()[100:-100];
+        fd = self.getFilteredData(fc1, fc2)[100:-100];
         self.settings["serialport"] = Setting("Serial Port", "COM1")
         self.settings["startupspeed"] = Setting("Motor Startup Speed", 25)
         self.settings["startupsettling"] = Setting("Motor Startup Setting time (s)", 3)
         self.settings["serialport"] = Setting("Serial Port", "COM1")
         self.settings["hpf"] = Setting("HP Filter cutoff (Hz)", 50)
-        self.settings["lpf"] = Setting("LP Filter cutoff (Hz)", 400)
+        self.settings["lpf"] = Setting("LP Filter cutoff (Hz)", 180)
         self.readSettings()

Subversion Repositories Projects

(root)/VibrationTest/trunk/VibrationTest/VibrationTestGui.py - Rev 614 → 615