| 183,7 → 183,7 |
|---|
| i = (v-vmin)/(vmax-vmin) # 0..1 |
| i *= 2 |
| i = i+1 |
| i = min(max(i,0),5) |
| i = min(max(i,0.1),4.9) |
| self.voltageCtrl.SetSpeedValue(i) |
| |
| |
| 494,6 → 494,7 |
|---|
| 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.graphCtrl.setLogScale((False,False)) |
| self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line, markers], title, "Test", "Vibration Value"), xAxis=(1,max(x,10)), yAxis=(0,y)) |
| self.graphCtrl.SetEnableGrid('Horizontal') |
| |
| 510,6 → 511,7 |
|---|
| line = wx.lib.plot.PolyLine(xydata, legend= 'Raw Data', colour='red', width=2) |
| |
| title = "Raw Signal: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed) |
| self.graphCtrl.setLogScale((False,False)) |
| self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y,y)) |
| self.graphCtrl.SetEnableGrid('Horizontal') |
| |
| 520,6 → 522,7 |
|---|
| 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.graphCtrl.setLogScale((False,False)) |
| self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y,y)) |
| self.graphCtrl.SetEnableGrid('Horizontal') |
| |
| 528,6 → 531,8 |
|---|
| xydata.shape = (nb/2, 2) |
| |
| xydata[:,1] = vibTest.getSpectrum() |
| |
| #print xydata |
| |
| line = wx.lib.plot.PolyLine(xydata, legend= 'Spectrum', colour='red') |
| markers = wx.lib.plot.PolyMarker(xydata, legend= '', colour='red', marker='circle',size=2) |
| 538,8 → 543,10 |
|---|
| filterLine2 = wx.lib.plot.PolyLine(((fc,0),(fc,y)), legend='HP Filter', colour='Black', width=4) |
| |
| title = "Spectrum: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed) |
| self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line,markers, filterLine1, filterLine2], title, "Freq (Hz)", "Acc"), xAxis=(0,200), yAxis= (-0,y)) |
| self.graphCtrl.SetEnableGrid(True) |
| self.graphCtrl.setLogScale((False,False)) |
| self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line,markers, filterLine1, filterLine2], title, "Freq (Hz)", "Acc"), xAxis=(0,300), yAxis= (-0,y)) |
| |
| |
| |
| def OnImport(self, event): # wxGlade: MainFrame.<event_handler> |
| 777,12 → 784,13 |
|---|
| raise Exception("Voltage too low") |
| |
| self._sendEvent("Done !") |
| self._setMotorSpeed(speed, .1) |
| |
| except Exception, e: |
| self._sendEvent("Exception \"%s\"" % e, error=True) |
| |
| self.running = False |
| self._sendEvent("") |
| self._sendEvent("", speed = 0) |
| |
| |
| class VibTest: |
| 867,7 → 875,7 |
|---|
| 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)", 180) |
| self.settings["lpf"] = Setting("LP Filter cutoff (Hz)", 290) |
| self.settings["minvoltage"] = Setting("Minimum Bettery Voltage (0=Automatic) (V) ", 0) |
| self.settings["maxvoltage"] = Setting("Maximum Bettery Voltage (0=Automatic) (V) ", 0) |
| |