203,11 → 203,15 |
self.frame_1_menubar = wx.MenuBar() |
wxglade_tmp_menu = wx.Menu() |
wxglade_tmp_menu.Append(101, "Settings", "", wx.ITEM_NORMAL) |
wxglade_tmp_menu.AppendSeparator() |
wxglade_tmp_menu.Append(150, "Exit", "", wx.ITEM_NORMAL) |
self.frame_1_menubar.Append(wxglade_tmp_menu, "File") |
wxglade_tmp_menu = wx.Menu() |
wxglade_tmp_menu.Append(301, "Clear", "", wx.ITEM_NORMAL) |
wxglade_tmp_menu.Append(302, "Import", "", wx.ITEM_NORMAL) |
wxglade_tmp_menu.Append(301, "Clear All", "", wx.ITEM_NORMAL) |
wxglade_tmp_menu.Append(302, "Clear Selected", "", wx.ITEM_NORMAL) |
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() |
self.frame_1_menubar.Append(wxglade_tmp_menu, "MK") |
240,7 → 244,9 |
|
self.Bind(wx.EVT_MENU, self.OnSettings, id=101) |
self.Bind(wx.EVT_MENU, self.onClear, id=301) |
self.Bind(wx.EVT_MENU, self.OnImport, id=302) |
self.Bind(wx.EVT_MENU, self.onClearSelected, id=302) |
self.Bind(wx.EVT_MENU, self.OnImport, id=303) |
self.Bind(wx.EVT_MENU, self.onExport, id=304) |
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) |
377,7 → 383,10 |
|
nbSelected = self.TestListCtrl.SelectedItemCount |
|
if nbSelected > 1: |
if nbSelected == 0: |
self.client.Clear() |
|
elif nbSelected > 1: |
self.graphTypeChoice.Disable() |
x = 1 |
data = [] |
455,10 → 464,6 |
def onGraphTypeChange(self, event): # wxGlade: MainFrame.<event_handler> |
self.drawGraph() |
|
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, |
498,6 → 503,29 |
val = dlg.ShowModal() # this does not return until the dialog is closed. |
dlg.Destroy() |
|
def _removeTest(self, idx): |
print "Deleting test %d" % idx |
self.app.removeTest(idx) |
self.TestListCtrl.DeleteItem(idx) |
|
|
def onClear(self, event): # wxGlade: MainFrame.<event_handler> |
print "Clear all tests" |
for i in range(len(self.app.VibTests)-1, -1, -1): |
self._removeTest(i) |
self.drawGraph() |
|
|
def onClearSelected(self, event): # wxGlade: MainFrame.<event_handler> |
while True: |
idx = self.TestListCtrl.GetFirstSelected() |
if idx == -1: break |
self._removeTest(idx) |
|
def onExport(self, event): # wxGlade: MainFrame.<event_handler> |
print "Event handler `onExport' not implemented" |
event.Skip() |
|
# end of class MainFrame |
|
class Setting: |
724,6 → 752,9 |
test = VibTest(descr, motor, speed, channel, rawData) |
self.AddTest2(test) |
|
def removeTest(self, idx): |
del(self.VibTests[idx]) |
|
def getTest(self, testId): |
return self.VibTests[testId] |
|