Subversion Repositories Projects

Rev

Rev 629 | Rev 633 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 629 Rev 632
Line 542... Line 542...
542
                 fc = self.app.settings["lpf"].value
542
                 fc = self.app.settings["lpf"].value
543
                 filterLine2 = wx.lib.plot.PolyLine(((fc,0),(fc,y)), legend='HP Filter', colour='Black', width=4)
543
                 filterLine2 = wx.lib.plot.PolyLine(((fc,0),(fc,y)), legend='HP Filter', colour='Black', width=4)
Line 544... Line 544...
544
       
544
       
545
                 title = "Spectrum: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed)
545
                 title = "Spectrum: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed)
546
                 self.graphCtrl.SetEnableGrid(True)
546
                 self.graphCtrl.SetEnableGrid(True)
547
                 self.graphCtrl.setLogScale((False,False))
547
                 self.graphCtrl.setLogScale((True,False))
Line 548... Line 548...
548
                 self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line,markers, filterLine1, filterLine2], title, "Freq (Hz)", "Acc"), xAxis=(0,300), yAxis= (-0,y))
548
                 self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line,markers, filterLine1, filterLine2], title, "Freq (Hz)", "Acc"), xAxis=(20,500), yAxis= (0,y))
549
                 
549
                 
Line 873... Line 873...
873
        self.settings["serialport"] = Setting("Serial Port", "COM1")
873
        self.settings["serialport"] = Setting("Serial Port", "COM1")
874
        self.settings["startupspeed"] = Setting("Motor Startup Speed", 25)
874
        self.settings["startupspeed"] = Setting("Motor Startup Speed", 25)
875
        self.settings["startupsettling"] = Setting("Motor Startup Setting time (s)", 3)
875
        self.settings["startupsettling"] = Setting("Motor Startup Setting time (s)", 3)
876
        self.settings["serialport"] = Setting("Serial Port", "COM1")
876
        self.settings["serialport"] = Setting("Serial Port", "COM1")
877
        self.settings["hpf"] = Setting("HP Filter cutoff (Hz)", 50)
877
        self.settings["hpf"] = Setting("HP Filter cutoff (Hz)", 50)
878
        self.settings["lpf"] = Setting("LP Filter cutoff (Hz)", 290)
878
        self.settings["lpf"] = Setting("LP Filter cutoff (Hz)", 400)
879
        self.settings["minvoltage"] = Setting("Minimum Bettery Voltage (0=Automatic) (V) ", 0)
879
        self.settings["minvoltage"] = Setting("Minimum Bettery Voltage (0=Automatic) (V) ", 0)
880
        self.settings["maxvoltage"] = Setting("Maximum Bettery Voltage (0=Automatic) (V) ", 0)
880
        self.settings["maxvoltage"] = Setting("Maximum Bettery Voltage (0=Automatic) (V) ", 0)
Line 881... Line 881...
881
 
881