WebSVN - Projects - Diff - Rev 606 and 607 - /VibrationTest/trunk/VibrationTest/VibrationTestGui.py/

 import sys
 import os
 import wx
 import wx.lib
 import wx.lib.plot
+import ConfigParser
 # Needs Numeric or numarray or NumPy
 try:
     import numpy.oldnumeric as _Numeric
 # begin wxGlade: extracode
 # end wxGlade
-class SettingsFrame(wx.Frame):
+class SettingsDialog(wx.Dialog):
     def __init__(self, *args, **kwds):
-        # begin wxGlade: SettingsFrame.__init__
+        # begin wxGlade: SettingsDialog.__init__
-        kwds["style"] = wx.DEFAULT_FRAME_STYLE
+        kwds["style"] = wx.DEFAULT_DIALOG_STYLE
-        wx.Frame.__init__(self, *args, **kwds)
+        wx.Dialog.__init__(self, *args, **kwds)
-        self.label_5 = wx.StaticText(self, -1, "COM Port ", style=wx.ALIGN_RIGHT)
+        self.label_5_copy = wx.StaticText(self, -1, "COM Port ", style=wx.ALIGN_RIGHT)
-        self.comPortCtrl = wx.TextCtrl(self, -1, "")
+        self.comPortCtrl_copy = wx.TextCtrl(self, -1, "")
-        self.button_5 = wx.Button(self, wx.ID_CANCEL, "")
+        self.button_5_copy = wx.Button(self, wx.ID_CANCEL, "")
-        self.button_6 = wx.Button(self, wx.ID_OK, "")
+        self.button_6_copy = wx.Button(self, wx.ID_OK, "")
         self.__set_properties()
         self.__do_layout()
         # end wxGlade
     def __set_properties(self):
-        # begin wxGlade: SettingsFrame.__set_properties
+        # begin wxGlade: SettingsDialog.__set_properties
         self.SetTitle("Settings")
         # end wxGlade
     def __do_layout(self):
-        # begin wxGlade: SettingsFrame.__do_layout
+        # begin wxGlade: SettingsDialog.__do_layout
-        sizer_5 = wx.BoxSizer(wx.VERTICAL)
+        sizer_5_copy = wx.BoxSizer(wx.VERTICAL)
-        grid_sizer_3 = wx.GridSizer(1, 2, 0, 0)
+        grid_sizer_3_copy = wx.GridSizer(1, 2, 0, 0)
-        sizer_6 = wx.BoxSizer(wx.HORIZONTAL)
+        sizer_6_copy = wx.BoxSizer(wx.HORIZONTAL)
-        grid_sizer_2 = wx.GridSizer(1, 2, 4, 4)
+        grid_sizer_2_copy = wx.GridSizer(1, 2, 4, 4)
-        sizer_5.Add((20, 20), 0, 0, 0)
+        sizer_5_copy.Add((20, 20), 0, 0, 0)
-        sizer_6.Add((20, 20), 0, 0, 0)
+        sizer_6_copy.Add((20, 20), 0, 0, 0)
-        grid_sizer_2.Add(self.label_5, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
+        grid_sizer_2_copy.Add(self.label_5_copy, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
-        grid_sizer_2.Add(self.comPortCtrl, 0, 0, 0)
+        grid_sizer_2_copy.Add(self.comPortCtrl_copy, 0, 0, 0)
-        sizer_6.Add(grid_sizer_2, 0, 0, 0)
+        sizer_6_copy.Add(grid_sizer_2_copy, 0, 0, 0)
-        sizer_6.Add((20, 20), 0, 0, 0)
+        sizer_6_copy.Add((20, 20), 0, 0, 0)
-        sizer_5.Add(sizer_6, 1, wx.EXPAND, 0)
+        sizer_5_copy.Add(sizer_6_copy, 1, wx.EXPAND, 0)
-        sizer_5.Add((20, 20), 0, 0, 0)
+        sizer_5_copy.Add((20, 20), 0, 0, 0)
-        grid_sizer_3.Add(self.button_5, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 0)
+        grid_sizer_3_copy.Add(self.button_5_copy, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 0)
-        grid_sizer_3.Add(self.button_6, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 0)
+        grid_sizer_3_copy.Add(self.button_6_copy, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 0)
+        sizer_5_copy.Add(grid_sizer_3_copy, 0, wx.EXPAND, 0)
+        sizer_5_copy.Add((20, 20), 0, 0, 0)
+        self.SetSizer(sizer_5_copy)
+        sizer_5_copy.Fit(self)
+        self.Layout()
+        # end wxGlade
+# end of class SettingsDialog
+class SettingsFrame(wx.Frame):
+    def __init__(self, *args, **kwds):
+        # content of this block not found: did you rename this class?
+        pass
+    def __set_properties(self):
-        sizer_5.Add(grid_sizer_3, 0, wx.EXPAND, 0)
+        # content of this block not found: did you rename this class?
-        sizer_5.Add((20, 20), 0, 0, 0)
+        pass
         self.SetSizer(sizer_5)
         wx.Frame.__init__(self, *args, **kwds)
         # Menu Bar
         self.frame_1_menubar = wx.MenuBar()
+        wxglade_tmp_menu = wx.Menu()
-        wxglade_tmp_menu = wx.Menu()
+        wxglade_tmp_menu.Append(101, "Settings", "", wx.ITEM_NORMAL)
-        wxglade_tmp_menu.Append(wx.NewId(), "Exit", "", wx.ITEM_NORMAL)
+        wxglade_tmp_menu.Append(150, "Exit", "", wx.ITEM_NORMAL)
         self.frame_1_menubar.Append(wxglade_tmp_menu, "File")
-        wxglade_tmp_menu = wx.Menu()
-        self.frame_1_menubar.Append(wxglade_tmp_menu, "Settings")
         wxglade_tmp_menu = wx.Menu()
-        wxglade_tmp_menu.Append(wx.NewId(), "Clear", "", wx.ITEM_NORMAL)
+        wxglade_tmp_menu.Append(301, "Clear", "", wx.ITEM_NORMAL)
-        wxglade_tmp_menu.Append(wx.NewId(), "Import", "", wx.ITEM_NORMAL)
+        wxglade_tmp_menu.Append(302, "Import", "", wx.ITEM_NORMAL)
         self.frame_1_menubar.Append(wxglade_tmp_menu, "TestSet")
         wxglade_tmp_menu = wx.Menu()
         self.frame_1_menubar.Append(wxglade_tmp_menu, "MK")
         wxglade_tmp_menu = wx.Menu()
         self.TestListCtrl = wx.ListCtrl(self, -1, style=wx.LC_REPORT|wx.SUNKEN_BORDER)
         self.__set_properties()
+        self.__do_layout()
-        self.__do_layout()
+        self.Bind(wx.EVT_MENU, self.OnSettings, id=101)
-        self.Bind(wx.EVT_MENU, self.onClear, id=-1)
+        self.Bind(wx.EVT_MENU, self.onClear, id=301)
-        self.Bind(wx.EVT_MENU, self.OnImport, id=-1)
+        self.Bind(wx.EVT_MENU, self.OnImport, id=302)
         self.Bind(wx.EVT_CHOICE, self.onGraphTypeChange, self.graphTypeChoice)
         self.Bind(wx.EVT_CHOICE, self.onYAxisChange, self.yAxisChoice)
         # Configure TestListCtrl
         self.TestListCtrl.InsertColumn(0, "Description")
         self.TestListCtrl.InsertColumn(1, "Speed")
         self.TestListCtrl.InsertColumn(2, "Channel")
+        self.TestListCtrl.InsertColumn(3, "Vibration Value")
-        self.TestListCtrl.InsertColumn(3, "VibrationValue")
+        self.TestListCtrl.SetColumnWidth(3, 500)
     def DrawPointLabel(self, dc, mDataDict):
         """This is the fuction that defines how the pointLabels are plotted
     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())
-        self.TestListCtrl.SetStringItem(index, 2, test.channel)
+        vvs = "|%s| (%d)" % ("----------------------------------------------------------------------------------------------------"[0:min(vv,100)], vv)
-        self.TestListCtrl.SetStringItem(index, 3, str(test.getVibValue()))
+        self.TestListCtrl.SetStringItem(index, 3, vvs)
         if (index == 0):
             self.TestListCtrl.Select(index)
          print "Test Selected id=%d" % (testId)
          self.activeTestId = testId
          self.drawGraph()
-    def drawGraph(self):
-         vibTest = self.app.getTest(self.activeTestId)
+    def drawGraph(self):
          nb = vibTest.getDataLen()
          y = int(self.yAxisChoice.GetStringSelection())
-         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', 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))
+         nbSelected = self.TestListCtrl.SelectedItemCount
+         if nbSelected > 1:
-             self.client.SetEnableGrid('Horizontal')
+             self.graphTypeChoice.Disable()
+             x = 1
+             data = []
+             idx = self.TestListCtrl.GetFirstSelected()
-         if self.graphTypeChoice.GetSelection() == 1:
+             while idx != -1:
-             xydata = _Numeric.linspace(0,0.09*nb,2*nb)
+                 data.append([x,self.app.getTest(idx).getVibValue()])
-             xydata.shape = (nb, 2)
-             xydata[:,1] = vibTest.getFilteredData()
+                 x += 1
+                 idx = self.TestListCtrl.GetNextSelected(idx)
-             line = wx.lib.plot.PolyLine(xydata, legend= 'Raw Data', colour='red', width=2)
+             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"
-             title = "Filtered Signal: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed)
+             self.client.Draw(wx.lib.plot.PlotGraphics([line, markers], title, "Test", "Vibration Value"), xAxis=(1,max(x,10)), yAxis=(0,y))
-             self.client.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y,y))
+             self.client.SetEnableGrid('Horizontal')
-             self.client.SetEnableGrid('Horizontal')
+         else:
+             self.graphTypeChoice.Enable()
+             vibTest = self.app.getTest(self.activeTestId)
+             nb = vibTest.getDataLen()
-         elif self.graphTypeChoice.GetSelection() == 2:
+             if self.graphTypeChoice.GetSelection() == 0:
-             xydata = _Numeric.linspace(0,5555,nb)
+                 xydata = _Numeric.linspace(0,0.09*nb,2*nb)
-             xydata.shape = (nb/2, 2)
+                 xydata.shape = (nb, 2)
+                 xydata[:,1] = vibTest.getRawData()
+                 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 = "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.shape = (nb/2, 2)
-             xydata[:,1] = vibTest.getSpectrum()
+                 xydata[:,1] = vibTest.getSpectrum()
-             line = wx.lib.plot.PolyLine(xydata, legend= 'Spectrum', colour='red')
+                 line = wx.lib.plot.PolyLine(xydata, legend= 'Spectrum', colour='red')
-             markers = wx.lib.plot.PolyMarker(xydata, legend= '', colour='red', marker='circle',size=2)
+                 markers = wx.lib.plot.PolyMarker(xydata, legend= '', colour='red', marker='circle',size=2)
-             title = "Spectrum: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed)
+                 title = "Spectrum: %s %s %d" %(vibTest.descr, vibTest.channel, vibTest.speed)
     def onClear(self, event): # wxGlade: MainFrame.<event_handler>
         print "Event handler `onClear' not implemented"
+        event.Skip()
+    def OnSettings(self, event): # wxGlade: MainFrame.<event_handler>
+        dlg = SettingsDialog(self, -1, "Sample Dialog", size=(350, 200),
+                         #style=wx.CAPTION | wx.SYSTEM_MENU | wx.THICK_FRAME,
+                         style=wx.DEFAULT_DIALOG_STYLE, # & ~wx.CLOSE_BOX
+                         )
+        dlg.CenterOnScreen()
+        # this does not return until the dialog is closed.
+        val = dlg.ShowModal()
-        event.Skip()
+        dlg.Destroy()
+# end of class MainFrame
+class Setting:
     def __init__(self, descr, defaultValue):
-# end of class MainFrame
+        self.descr = descr
         self.value = defaultValue
       if self.vibValue == None:
         fd = self.getFilteredData();
         self.vibValue = max(fd)-min(fd)
       return self.vibValue
+class App(wx.App):
+    SETTINGSFILE = "settings.cfg"
 class App(wx.App):
     def __init__(self, par):
-        self.VibTests = []
         self.VibTests = []
+        wx.App.__init__(self, par)
+        # Init settings
+        self.settings={}
+        self.settings["serialPort"] = Setting("SerialPort", "COM1")
+        self.settings["hpf"] = Setting("HP Filter cutoff (Hz)", 50)
+        self.settings["lpf"] = Setting("LP Filter cutoff (Hz)", 400)
-        wx.App.__init__(self, par)
+        self.readSettings()
+        if len(sys.argv)>1:
+            self.Import(sys.argv[1])
+    def readSettings(self):
+        print "Reading settings"
+        cp = ConfigParser.ConfigParser()
+        try:
+            cp.read(App.SETTINGSFILE)
+            for setting in cp.items("DEFAULT"):
+                print " ",setting
+                try:
+                    self.settings[setting[0]].value = setting[1]
+                except:
+                    print "WARNING, unknown setting"
+        except:
+            print "ERROR reading settingsfile"
+    def storeSettings(self):
+        print "Storing settings"
+        cp = ConfigParser.ConfigParser()
+        for setting in self.settings.iteritems():
+            cp.set("", setting[0], setting[1].value)
-        if len(sys.argv)>1:
+        file = open(App.SETTINGSFILE, "w")
-            self.Import(sys.argv[1])
+        cp.write(file)
         file.close()
         wx.InitAllImageHandlers()
         self.frame_1 = MainFrame(None, -1, "")
         self.frame_1.setApp(self);
         self.SetTopWindow(self.frame_1)
         self.frame_1.CenterOnScreen()
         self.frame_1.Show()
         return 1

Subversion Repositories Projects

(root)/VibrationTest/trunk/VibrationTest/VibrationTestGui.py/ - Rev 606 → 607