WebSVN - Projects - Diff - Rev 648 and 649 - /VibrationTest/trunk/VibrationTest/VibrationTestGui.py/

         self.TestListCtrl.SetStringItem(index, 0, test.descr)
         self.TestListCtrl.SetStringItem(index, 1, "%.1f V" %test.voltage)
         self.TestListCtrl.SetStringItem(index, 2, str(test.speed))
         self.TestListCtrl.SetStringItem(index, 3, test.channel)
-        vv = test.getVibValue(self.app.settings["hpf"].value, self.app.settings["lpf"].value)
+        vv = test.getVibValue()
         vvs = "|%s| (%.1f)" % ("----------------------------------------------------------------------------------------------------"[0:min(int(vv+1)/2,100)], vv)
         self.TestListCtrl.SetStringItem(index, 4, vvs)
              cCnt = 0
              for s in tests:
                data = []
                x=1
                for t in s[1:]:
-                 data.append([x,self.app.getTest(t).getVibValue(self.app.settings["hpf"].value, self.app.settings["lpf"].value)])
+                 data.append([x,self.app.getTest(t).getVibValue()])
                  x += 1
                lines.append(wx.lib.plot.PolyLine(data, legend= s[0], colour=COLORS[cCnt], width=2))
                lines.append(wx.lib.plot.PolyMarker(data, legend= "", colour=COLORS[cCnt], marker='circle',size=2))
                maxX = max(maxX, x)
                cCnt += 1
              if self.graphTypeChoice.GetSelection() == 1:
                  xydata = _Numeric.linspace(0,0.09*nb,2*nb)
                  xydata.shape = (nb, 2)
-                 xydata[:,1] = vibTest.getFilteredData(self.app.settings["hpf"].value, self.app.settings["lpf"].value)
+                 xydata[:,1] = vibTest.getFilteredData()
                  line = wx.lib.plot.PolyLine(xydata, legend= 'Raw Data', colour='red', width=2)
     def onAbout(self, event): # wxGlade: MainFrame.<event_handler>
          # First we create and fill the info object
         print "about"
         info = wx.AboutDialogInfo()
         info.Name = "- MK Vibration Test - "
-        info.Version = "v0.9 RC1"
+        info.Version = "v0.9 RC2"
         info.Copyright = ""
         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)
     def onCopyGraphData(self, event): # wxGlade: MainFrame.<event_handler>
         clipdata = wx.TextDataObject()
         txt = ""
         idx = self.TestListCtrl.GetFirstSelected()
         while idx != -1:
-             txt += ("%d\n" % self.app.getTest(idx).getVibValue(self.app.settings["hpf"].value, self.app.settings["lpf"].value))
+             txt += ("%d\n" % self.app.getTest(idx).getVibValue())
              idx = self.TestListCtrl.GetNextSelected(idx)
         clipdata.SetText(txt)
         wx.TheClipboard.Open()
         wx.TheClipboard.SetData(clipdata)
         wx.TheClipboard.Close()
         self._sendEvent("", speed = 0)
+class VibTest:
+    useRms = True
+    fc1 = None
-class VibTest:
+    fc2 = None
     useRms = True
     def __init__(self, descr, voltage, motor, speed, channel, rawData):
         self.fft = _Numeric.fft.rfft(self.rawData)
-        self.spectrum = None
-        self.filteredData = None
-        self.fc1 = None
+        self.spectrum = None
-        self.fc2 = None
+        self.filteredData = None
     def refresh(self):
         self.filteredData = None
         self.vibValue = None
-    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)
+            fc = (float(self.fc1))/(FS/2)*len(tmpfft)
-            print "fc1=%d => fc=%f" % (fc1,fc)
+            print "fc1=%d => fc=%f" % (self.fc1, fc)
             for i in range(0,int(fc)+2):
                 tmpfft[i] = 0
-            fc = (float(fc2))/(FS/2)*len(tmpfft)
+            fc = (float(self.fc2))/(FS/2)*len(tmpfft)
-            print "fc2=%d => fc=%f" % (fc2,fc)
+            print "fc2=%d => fc=%f" % (self.fc2,fc)
             for i in range(int(fc)+2, len(tmpfft)):
-                tmpfft[i] = 0
-            self.filteredData = _Numeric.fft.irfft(tmpfft)
-            self.fc1 = fc1
+                tmpfft[i] = 0
-            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:
+        return self.filteredData
         self.vibValue = None
     def getVibValue(self):
       if self.vibValue == None:
-        fd = self.getFilteredData(fc1, fc2)[100:-100];
+        fd = self.getFilteredData()[100:-100];
         if self.useRms:
     def onSettingsChanged(self, store):
+        if store:
-        if store:
+            self.storeSettings()
             self.storeSettings()
         if self.settings["calcmethod"].value == "rms":
             VibTest.useRms = True
+        else:
+            VibTest.useRms = False
+        VibTest.fc1 = self.settings["hpf"].value
-        else:
+        VibTest.fc2 = self.settings["lpf"].value
             VibTest.useRms = False
         for test in self.VibTests:
             test.refresh()

Subversion Repositories Projects

(root)/VibrationTest/trunk/VibrationTest/VibrationTestGui.py/ - Rev 648 → 649