WebSVN - Projects - Diff - Rev 623 and 626 - /VibrationTest/trunk/VibrationTest/VibrationTestGui.py

 CHANNEL_NAMES = ["GyroYaw", "GyroRoll", "GyroNick", "Pressure", "Batt", "AccTop", "AccRoll", "AccNick"]
 FS = 11111
+pi = 3.14
-pi = 3.14
+rootPath = ""
 # Needs Numeric or numarray or NumPy
 try:
     import numpy.oldnumeric as _Numeric
 (MeasDataEvent, EVT_MEAS_DATA) = wx.lib.newevent.NewEvent()
 class MeasureDialog(wx.Dialog):
     def __init__(self, *args, **kwds):
         # begin wxGlade: MeasureDialog.__init__
-        kwds["style"] = wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER|wx.THICK_FRAME
+        kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
         wx.Dialog.__init__(self, *args, **kwds)
         self.text_ctrl_1 = wx.TextCtrl(self, -1, "", style=wx.TE_MULTILINE|wx.TE_READONLY|wx.HSCROLL)
         self.button = wx.Button(self, -1, "STOP")
         self.voltageCtrl = speedmeter.SpeedMeter(self, extrastyle=speedmeter.SM_DRAW_HAND | speedmeter.SM_DRAW_PARTIAL_SECTORS |  speedmeter.SM_DRAW_MIDDLE_ICON )
+        self.speedCtrl = speedmeter.SpeedMeter(self, extrastyle=speedmeter.SM_DRAW_HAND | speedmeter.SM_DRAW_PARTIAL_SECTORS | speedmeter.SM_DRAW_MIDDLE_TEXT | speedmeter.SM_DRAW_SECONDARY_TICKS)
         self.speedCtrl = speedmeter.SpeedMeter(self, extrastyle=speedmeter.SM_DRAW_HAND | speedmeter.SM_DRAW_PARTIAL_SECTORS | speedmeter.SM_DRAW_MIDDLE_TEXT | speedmeter.SM_DRAW_SECONDARY_TICKS)
         self.__set_properties()
         self.__do_layout()
+        self.Bind(wx.EVT_BUTTON, self.onButton, self.button)
+        # end wxGlade
         self.Bind(wx.EVT_BUTTON, self.onButton, self.button)
-        # end wxGlade
+        self.button.SetFocus()
-        YELLOW = wx.Colour(255, 240, 0)
-        BG = wx.Colour(0x80, 0x80, 0x80)
+        YELLOW = wx.Colour(255, 240, 0)
-        # Configure Voltage Ctrl
+        BG = wx.Colour(0x80, 0x80, 0x80)
-        #self.voltageCtrl.SetAngleRange(-3.14/3, 3.14/3)
+        # Configure Voltage Ctrl
         self.voltageCtrl.SetAngleRange(0,pi)
         intervals = range(0, 5)
         self.voltageCtrl.SetIntervals(intervals)
         colours = [wx.RED, wx.GREEN, wx.GREEN, YELLOW]
         self.voltageCtrl.SetIntervalColours(colours)
         ticks = ["", "", "", "", ""]
         self.voltageCtrl.SetTicks(ticks)
         self.voltageCtrl.SetTicksColour(wx.WHITE)
         self.voltageCtrl.SetHandColour(YELLOW)
-        icon = wx.Icon("fuel.ico", wx.BITMAP_TYPE_ICO)
+        icon = wx.Icon("%s/Resources/fuel.ico" % rootPath, wx.BITMAP_TYPE_ICO)
         icon.SetWidth(24)
         icon.SetHeight(24)
-        self.voltageCtrl.SetMiddleIcon(icon)
-        self.voltageCtrl.SetSpeedBackground(BG)
+        self.voltageCtrl.SetMiddleIcon(icon)
-        self.voltageCtrl.SetArcColour(wx.WHITE)
+        self.voltageCtrl.SetSpeedBackground(BG)
-        self.voltageCtrl.SetSpeedValue(2)
+        self.voltageCtrl.SetArcColour(wx.WHITE)
         self.voltageCtrl.SetSpeedValue(2)
         wxglade_tmp_menu.AppendSeparator()
         wxglade_tmp_menu.Append(303, "Load", "", wx.ITEM_NORMAL)
         wxglade_tmp_menu.Append(304, "Save", "", wx.ITEM_NORMAL)
         self.frame_1_menubar.Append(wxglade_tmp_menu, "TestSet")
         wxglade_tmp_menu = wx.Menu()
+        wxglade_tmp_menu.Append(401, "Flash VibTest FC software", "", wx.ITEM_NORMAL)
+        wxglade_tmp_menu.Append(402, "Restore original FC software", "", wx.ITEM_NORMAL)
         self.frame_1_menubar.Append(wxglade_tmp_menu, "MK")
         wxglade_tmp_menu = wx.Menu()
+        wxglade_tmp_menu.Append(1099, "About", "", wx.ITEM_NORMAL)
         self.frame_1_menubar.Append(wxglade_tmp_menu, "Help")
         self.SetMenuBar(self.frame_1_menubar)
         # Menu Bar end
         self.Description = wx.StaticText(self, -1, "Description")
         self.tcDescr = wx.TextCtrl(self, -1, "Test")
         self.label_37 = wx.StaticText(self, -1, "Speed(s)")
         self.tcSpeeds = wx.TextCtrl(self, -1, "100-200:10")
         self.label_35 = wx.StaticText(self, -1, "Motor(s)")
         self.tcMotors = wx.TextCtrl(self, -1, "1")
         self.label_38 = wx.StaticText(self, -1, "")
-        self.text_ctrl_10 = wx.TextCtrl(self, -1, "")
+        self.panel_2 = wx.Panel(self, -1)
         self.label_36 = wx.StaticText(self, -1, "Channel(s)")
         self.tcChannels = wx.TextCtrl(self, -1, "6")
         self.label_39 = wx.StaticText(self, -1, "")
-        self.text_ctrl_11 = wx.TextCtrl(self, -1, "")
+        self.panel_3 = wx.Panel(self, -1)
-        self.button_4 = wx.Button(self, -1, "Start")
+        self.button_4 = wx.Button(self, -1, "Measure")
-        self.GraphPanel = wx.Panel(self, -1)
+        self.graphCtrl = wx.lib.plot.PlotCanvas(self, size=(800,300))
         self.label_40 = wx.StaticText(self, -1, "Graph Type ")
         self.graphTypeChoice = wx.Choice(self, -1, choices=["Raw Signal", "Filtered Signal", "Spectrum"])
         self.label_41 = wx.StaticText(self, -1, "Y Axis Range ")
         self.yAxisChoice = wx.Choice(self, -1, choices=["25", "50", "100", "200"])
         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.OnSettings, id=101)
-        self.Bind(wx.EVT_MENU, self.OnSettings, id=101)
+        self.Bind(wx.EVT_MENU, self.onExit, id=150)
         self.Bind(wx.EVT_MENU, self.onClear, id=301)
         self.Bind(wx.EVT_MENU, self.onClearSelected, id=302)
+        self.Bind(wx.EVT_MENU, self.OnImport, id=303)
-        self.Bind(wx.EVT_MENU, self.OnImport, id=303)
+        self.Bind(wx.EVT_MENU, self.onExport, id=304)
-        self.Bind(wx.EVT_MENU, self.onExport, id=304)
+        self.Bind(wx.EVT_MENU, self.onAbout, id=1099)
         self.Bind(wx.EVT_BUTTON, self.onStartMeasure, self.button_4)
         self.Bind(wx.EVT_CHOICE, self.onGraphTypeChange, self.graphTypeChoice)
+        self.Bind(wx.EVT_CHOICE, self.onYAxisChange, self.yAxisChoice)
+        # end wxGlade
-        self.Bind(wx.EVT_CHOICE, self.onYAxisChange, self.yAxisChoice)
+        favicon = wx.Icon('%s/Resources/60px-Procman.ico' % rootPath, wx.BITMAP_TYPE_ICO, 32, 32)
-        # end wxGlade
+        wx.Frame.SetIcon(self, favicon)
     def setApp(self, app):
         self.app = app
     def __set_properties(self):
         # begin wxGlade: MainFrame.__set_properties
         self.SetTitle("VibrationTest")
         self.SetSize((850, 700))
         self.Description.SetMinSize((53, 13))
         self.button_4.SetMinSize((80, 80))
-        self.GraphPanel.SetMinSize((800,300))
+        self.graphCtrl.SetMinSize((800,300))
         grid_sizer_1.Add(self.label_37, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
         grid_sizer_1.Add(self.tcSpeeds, 0, 0, 0)
         grid_sizer_1.Add(self.label_35, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
         grid_sizer_1.Add(self.tcMotors, 0, 0, 0)
         grid_sizer_1.Add(self.label_38, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
-        grid_sizer_1.Add(self.text_ctrl_10, 0, 0, 0)
+        grid_sizer_1.Add(self.panel_2, 1, wx.EXPAND, 0)
         grid_sizer_1.Add(self.label_36, 0, wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL, 0)
         grid_sizer_1.Add(self.tcChannels, 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)
+        grid_sizer_1.Add(self.panel_3, 1, wx.EXPAND, 0)
         sizer_9.Add(grid_sizer_1, 0, 0, 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)
         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)
+        sizer_11.Add(self.graphCtrl, 1, wx.EXPAND, 0)
         sizer_11.Add((20, 5), 0, 0, 0)
         sizer_12.Add(self.label_40, 0, wx.ALIGN_CENTER_VERTICAL, 0)
         sizer_12.Add(self.graphTypeChoice, 0, 0, 0)
         sizer_12.Add((40, 20), 0, 0, 0)
         sizer_12.Add(self.label_41, 0, wx.ALIGN_CENTER_VERTICAL, 0)
         # List events
         self.TestListCtrl.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnTestSelected, self.TestListCtrl)
         # Configure Graph
-        self.client = wx.lib.plot.PlotCanvas(self.GraphPanel, size=(800,300))
+        #self.graphCtrl = wx.lib.plot.PlotCanvas(self.GraphPanel, size=(800,300))
-        self.client.SetPointLabelFunc(self.DrawPointLabel)
+        self.graphCtrl.SetPointLabelFunc(self.DrawPointLabel)
-        self.client.SetFont(wx.Font(10,wx.SWISS,wx.NORMAL,wx.NORMAL))
+        self.graphCtrl.SetFont(wx.Font(10,wx.SWISS,wx.NORMAL,wx.NORMAL))
-        self.client.SetFontSizeAxis(10)
+        self.graphCtrl.SetFontSizeAxis(10)
-        self.client.SetFontSizeLegend(7)
+        self.graphCtrl.SetFontSizeLegend(7)
          y = int(self.yAxisChoice.GetStringSelection())
          nbSelected = self.TestListCtrl.SelectedItemCount
          if nbSelected == 0:
-              self.client.Clear()
+              self.graphCtrl.Clear()
          elif nbSelected > 1:
                  x += 1
                  idx = self.TestListCtrl.GetNextSelected(idx)
              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.client.Draw(wx.lib.plot.PlotGraphics([line, markers], title, "Test", "Vibration Value"), xAxis=(1,max(x,10)), yAxis=(0,y))
+             self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line, markers], title, "Test", "Vibration Value"), xAxis=(1,max(x,10)), yAxis=(0,y))
-             self.client.SetEnableGrid('Horizontal')
+             self.graphCtrl.SetEnableGrid('Horizontal')
          else:
              self.graphTypeChoice.Enable()
              vibTest = self.app.getTest(self.activeTestId)
                  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.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y,y))
-                 self.client.SetEnableGrid('Horizontal')
+                 self.graphCtrl.SetEnableGrid('Horizontal')
              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)
                  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.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line], title, "Time (ms)", "Acc"), yAxis= (-y,y))
-                 self.client.SetEnableGrid('Horizontal')
+                 self.graphCtrl.SetEnableGrid('Horizontal')
                  filterLine1 = wx.lib.plot.PolyLine(((fc,0),(fc,y)), legend='HP Filter', colour='Black', width=4)
                  fc = self.app.settings["lpf"].value
                  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.client.Draw(wx.lib.plot.PlotGraphics([line,markers, filterLine1, filterLine2], title, "Freq (Hz)", "Acc"), xAxis=(0,200), yAxis= (-0,y))
+                 self.graphCtrl.Draw(wx.lib.plot.PlotGraphics([line,markers, filterLine1, filterLine2], title, "Freq (Hz)", "Acc"), xAxis=(0,200), yAxis= (-0,y))
-                 self.client.SetEnableGrid(True)
+                 self.graphCtrl.SetEnableGrid(True)
             idx = self.TestListCtrl.GetFirstSelected()
             if idx == -1: break
             self._removeTest(idx)
+    def onCopyData(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))
+             idx = self.TestListCtrl.GetNextSelected(idx)
+        clipdata.SetText(txt)
+        wx.TheClipboard.Open()
+        wx.TheClipboard.SetData(clipdata)
+        wx.TheClipboard.Close()
+    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 = "0.2"
+        info.Copyright = ""
+        info.Developers=["Frederic Goddeeris"]
+        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 onExit(self, event): # wxGlade: MainFrame.<event_handler>
+        self.Close(True)
 # end of class MainFrame
+# end of class App
+if __name__ == "__main__":
+    rootPath = os.path.abspath(os.path.dirname(sys.argv[0]))
 # end of class App
     print rootPath

Subversion Repositories Projects

(root)/VibrationTest/trunk/VibrationTest/VibrationTestGui.py - Rev 623 → 626