WebSVN - Projects - Diff - Rev 599 and 600 - /VibrationTest/trunk/VibrationTest/VibrationTestGui.py/

         self.frame_1_menubar.Append(wxglade_tmp_menu, "MK")
         wxglade_tmp_menu = wx.Menu()
         self.frame_1_menubar.Append(wxglade_tmp_menu, "Help")
         self.SetMenuBar(self.frame_1_menubar)
         # Menu Bar end
-        self.Port = wx.StaticText(self, -1, "Port")
+        self.Description = wx.StaticText(self, -1, "Description")
-        self.text_ctrl_1 = wx.TextCtrl(self, -1, "")
+        self.text_ctrl_6 = wx.TextCtrl(self, -1, "Test")
-        self.label_5 = wx.StaticText(self, -1, "label_5")
+        self.label_37 = wx.StaticText(self, -1, "Speed(s)")
-        self.text_ctrl_5 = wx.TextCtrl(self, -1, "")
+        self.text_ctrl_9 = wx.TextCtrl(self, -1, "100-200:10")
-        self.label_2 = wx.StaticText(self, -1, "Motor(s)")
+        self.label_35 = wx.StaticText(self, -1, "Motor(s)")
-        self.text_ctrl_2 = wx.TextCtrl(self, -1, "")
+        self.text_ctrl_7 = wx.TextCtrl(self, -1, "1")
-        self.label_6 = wx.StaticText(self, -1, "label_6")
+        self.label_38 = wx.StaticText(self, -1, "")
-        self.text_ctrl_6 = wx.TextCtrl(self, -1, "")
+        self.text_ctrl_10 = wx.TextCtrl(self, -1, "")
-        self.label_3 = wx.StaticText(self, -1, "Channel(s)")
+        self.label_36 = wx.StaticText(self, -1, "Channel")
-        self.text_ctrl_3 = wx.TextCtrl(self, -1, "")
+        self.text_ctrl_8 = wx.TextCtrl(self, -1, "6")
-        self.label_7 = wx.StaticText(self, -1, "label_7")
+        self.label_39 = wx.StaticText(self, -1, "")
-        self.text_ctrl_7 = wx.TextCtrl(self, -1, "")
+        self.text_ctrl_11 = wx.TextCtrl(self, -1, "")
-        self.label_4 = wx.StaticText(self, -1, "Speed(s)")
+        self.button_4 = wx.Button(self, -1, "Start")
-        self.text_ctrl_4 = wx.TextCtrl(self, -1, "")
+        self.GraphPanel = wx.Panel(self, -1)
-        self.label_8 = wx.StaticText(self, -1, "label_8")
+        self.label_40 = wx.StaticText(self, -1, "Graph Type ")
-        self.text_ctrl_8 = wx.TextCtrl(self, -1, "")
+        self.graphTypeChoice = wx.Choice(self, -1, choices=["Raw Signal", "Filtered Signal", "Spectrum"])
-        self.button_1 = wx.Button(self, -1, "button_1")
+        self.label_41 = wx.StaticText(self, -1, "Y Axis Range ")
-        self.GraphPanel = wx.Panel(self, -1, style=wx.DOUBLE_BORDER|wx.TAB_TRAVERSAL)
-        self.yAxesChoice = wx.ComboBox(self, -1, choices=["10", "25", "50", "100", "250"], style=wx.CB_DROPDOWN)
+        self.yAxisChoice = wx.Choice(self, -1, choices=["25", "50", "100", "200"])
-        self.graphTypeChoise = wx.ComboBox(self, -1, choices=["Raw Data", "Filtered Data", "Spectrum"], style=wx.CB_DROPDOWN)
         self.TestListCtrl = wx.ListCtrl(self, -1, style=wx.LC_REPORT|wx.SUNKEN_BORDER)
         self.__set_properties()
         self.__do_layout()
         self.Bind(wx.EVT_MENU, self.OnImport, id=-1)
-        self.Bind(wx.EVT_COMBOBOX, self.onYAxisChange, self.yAxesChoice)
+        self.Bind(wx.EVT_CHOICE, self.onGraphTypeChange, self.graphTypeChoice)
-        self.Bind(wx.EVT_COMBOBOX, self.onYAxisChange, self.graphTypeChoise)
+        self.Bind(wx.EVT_CHOICE, self.onYAxisChange, self.yAxisChoice)
         # end wxGlade
     def setApp(self, app):
         self.app = app
+    def __set_properties(self):
+        # begin wxGlade: MainFrame.__set_properties
-    def __set_properties(self):
+        self.SetTitle("VibrationTest")
-        # begin wxGlade: MainFrame.__set_properties
+        self.SetSize((850, 700))
+        self.Description.SetMinSize((53, 13))
-        self.SetTitle("VibrationTest")
+        self.GraphPanel.SetMinSize((800,300))
-        self.GraphPanel.SetMinSize((800,350))
+        self.graphTypeChoice.SetSelection(0)
-        self.yAxesChoice.SetSelection(2)
+        self.yAxisChoice.SetSelection(1)
-        self.graphTypeChoise.SetSelection(0)
+        self.TestListCtrl.SetMinSize((800,300))
         # end wxGlade
     def __do_layout(self):
         # begin wxGlade: MainFrame.__do_layout
-        sizer_1 = wx.BoxSizer(wx.VERTICAL)
+        sizer_3 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_2 = wx.GridSizer(2, 1, 4, 4)
+        sizer_8 = wx.BoxSizer(wx.VERTICAL)
-        sizer_2 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_1 = wx.GridSizer(5, 4, 4, 4)
+        sizer_11 = wx.BoxSizer(wx.VERTICAL)
-        sizer_1.Add((20, 20), 0, 0, 0)
-        grid_sizer_1.Add(self.Port, 0, wx.ALIGN_RIGHT, 0)
+        sizer_12 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_1.Add(self.text_ctrl_1, 0, 0, 0)
+        sizer_9 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_1.Add(self.label_5, 0, wx.ALIGN_RIGHT, 0)
+        sizer_10 = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_1.Add(self.text_ctrl_5, 0, 0, 0)
+        grid_sizer_1 = wx.GridSizer(3, 4, 4, 5)
-        grid_sizer_1.Add(self.label_2, 0, wx.ALIGN_RIGHT, 0)
+        sizer_3.Add((20, 20), 0, 0, 0)
-        grid_sizer_1.Add(self.text_ctrl_2, 0, 0, 0)
+        sizer_8.Add((20, 20), 0, 0, 0)
-        grid_sizer_1.Add(self.label_6, 0, wx.ALIGN_RIGHT, 0)
+        grid_sizer_1.Add(self.Description, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
         grid_sizer_1.Add(self.text_ctrl_6, 0, 0, 0)
-        grid_sizer_1.Add(self.label_3, 0, wx.ALIGN_RIGHT, 0)
+        grid_sizer_1.Add(self.label_37, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
-        grid_sizer_1.Add(self.text_ctrl_3, 0, 0, 0)
+        grid_sizer_1.Add(self.text_ctrl_9, 0, 0, 0)
-        grid_sizer_1.Add(self.label_7, 0, wx.ALIGN_RIGHT, 0)
+        grid_sizer_1.Add(self.label_35, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
+        grid_sizer_1.Add(self.text_ctrl_7, 0, 0, 0)
-        grid_sizer_1.Add(self.text_ctrl_7, 0, 0, 0)
+        grid_sizer_1.Add(self.label_38, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
-        grid_sizer_1.Add(self.label_4, 0, wx.ALIGN_RIGHT, 0)
+        grid_sizer_1.Add(self.text_ctrl_10, 0, 0, 0)
-        grid_sizer_1.Add(self.text_ctrl_4, 0, 0, 0)
+        grid_sizer_1.Add(self.label_36, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
+        grid_sizer_1.Add(self.text_ctrl_8, 0, 0, 0)
+        grid_sizer_1.Add(self.label_39, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
+        grid_sizer_1.Add(self.text_ctrl_11, 0, 0, 0)
+        sizer_9.Add(grid_sizer_1, 0, 0, 0)
-        grid_sizer_1.Add(self.label_8, 0, wx.ALIGN_RIGHT, 0)
+        sizer_10.Add((50, 20), 0, 0, 0)
+        sizer_10.Add(self.button_4, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_9.Add(sizer_10, 1, wx.EXPAND, 0)
-        grid_sizer_1.Add(self.text_ctrl_8, 0, 0, 0)
+        sizer_8.Add(sizer_9, 0, 0, 0)
+        sizer_8.Add((20, 30), 0, 0, 0)
+        sizer_11.Add(self.GraphPanel, 1, wx.EXPAND, 0)
-        grid_sizer_1.Add(self.button_1, 0, 0, 0)
+        sizer_11.Add((20, 5), 0, 0, 0)
-        sizer_1.Add(grid_sizer_1, 0, 0, 2)
+        sizer_12.Add(self.label_40, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_12.Add(self.graphTypeChoice, 0, 0, 0)
-        sizer_1.Add((20, 20), 0, 0, 0)
+        sizer_12.Add((40, 20), 0, 0, 0)
-        sizer_1.Add(self.GraphPanel, 1, 0, 0)
+        sizer_12.Add(self.label_41, 0, wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_12.Add(self.yAxisChoice, 0, 0, 0)
-        sizer_2.Add(self.yAxesChoice, 0, 0, 0)
+        sizer_11.Add(sizer_12, 0, 0, 0)
-        sizer_2.Add(self.graphTypeChoise, 0, 0, 0)
+        sizer_8.Add(sizer_11, 0, 0, 0)
-        sizer_1.Add(sizer_2, 0, wx.EXPAND, 0)
-        sizer_1.Add((20, 20), 0, 0, 0)
+        sizer_8.Add((20, 30), 0, 0, 0)
+        sizer_8.Add(self.TestListCtrl, 1, 0, 0)
-        grid_sizer_2.Add(self.TestListCtrl, 1, wx.ALL|wx.EXPAND, 0)
+        sizer_8.Add((20, 20), 0, 0, 0)
-        sizer_1.Add(grid_sizer_2, 1, wx.EXPAND, 0)
+        sizer_3.Add(sizer_8, 1, wx.EXPAND, 0)
-        self.SetSizer(sizer_1)
+        self.SetSizer(sizer_3)
          self.drawGraph()
     def drawGraph(self):
          vibTest = self.app.getTest(self.activeTestId)
          nb = vibTest.getDataLen()
-         y = int(self.yAxesChoice.GetStringSelection())
+         y = int(self.yAxisChoice.GetStringSelection())
-         if self.graphTypeChoise.GetSelection() == 0:
+         if self.graphTypeChoice.GetSelection() == 0:
              xydata = _Numeric.linspace(0,0.09*nb,2*nb)
              xydata.shape = (nb, 2)
              xydata[:,1] = vibTest.getRawData()
-             line = wx.lib.plot.PolyLine(xydata, legend= 'Raw Data', colour='red')
+             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.client.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y,y))
+             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()
+             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)
+             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.graphTypeChoise.GetSelection() == 2:
+         elif self.graphTypeChoice.GetSelection() == 2:
              xydata = _Numeric.linspace(0,5555,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=1)
+             markers = wx.lib.plot.PolyMarker(xydata, legend= '', colour='red', marker='circle',size=2)
              title = "Spectrum: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed)
-             self.client.Draw(wx.lib.plot.PlotGraphics([line,markers], title, "Freq (Hz)", "Acc"), xAxis=(0,500), yAxis= (-0,y))
+             self.client.Draw(wx.lib.plot.PlotGraphics([line,markers], title, "Freq (Hz)", "Acc"), xAxis=(0,300), yAxis= (-0,y))
-             self.client.SetEnableGrid('Horizontal')
+             self.client.SetEnableGrid(True)
         self.motor = motor
         self.speed = speed
         self.channel = channel
-        self.dataLen = len(rawData)
-        print self.dataLen
+        self.dataLen = len(rawData)
         self.rawData = _Numeric.array(rawData)
         self.dc = self.rawData.mean()
+        self.rawData -= self.dc
+        self.fft = _Numeric.fft.rfft(self.rawData)
         self.rawData -= self.dc
         self.spectrum = None
-        self.fft = _Numeric.fft.fft(self.rawData)
+        self.filteredData = None
     def getDataLen(self):
         return self.dataLen
+    def getSpectrum(self):
+        if self.spectrum == None:
-    def getSpectrum(self):
+            self.spectrum = _Numeric.absolute(self.fft[1:self.dataLen/2+1]) / (self.dataLen/2)
+        return self.spectrum
+    def getFilteredData(self):
+        if self.filteredData == None:
+            tmpfft = self.fft.copy()
+            for i in range(0,7):
+                tmpfft[i] = 0
+            for i in range(30, len(tmpfft)):
+                tmpfft[i] = 0
-        return _Numeric.absolute(self.fft[1:self.dataLen/2+1]) / (self.dataLen/2)
+            self.filteredData = _Numeric.fft.irfft(tmpfft)
         return self.filteredData
         self.frame_1.Show()
         return 1
+    def Import(self):
     def Import(self):
-        filePath = "./unbal200.txt"
+        filePath = "./unbal150.txt"
         #filePath = "./nikivan.txt"
         speed = []
         channel = []
         for c in range(nbCols):
             data.append([])
             h = headers[c].split(' ')
-            print h
             descr.append(h[0]);
             speed.append(h[1]);
             channel.append(h[2]);

Subversion Repositories Projects

(root)/VibrationTest/trunk/VibrationTest/VibrationTestGui.py/ - Rev 599 → 600