Rev 615 | Rev 619 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 615 | Rev 616 | ||
---|---|---|---|
Line 201... | Line 201... | ||
201 | 201 | ||
202 | # Menu Bar |
202 | # Menu Bar |
203 | self.frame_1_menubar = wx.MenuBar() |
203 | self.frame_1_menubar = wx.MenuBar() |
204 | wxglade_tmp_menu = wx.Menu() |
204 | wxglade_tmp_menu = wx.Menu() |
- | 205 | wxglade_tmp_menu.Append(101, "Settings", "", wx.ITEM_NORMAL) |
|
205 | wxglade_tmp_menu.Append(101, "Settings", "", wx.ITEM_NORMAL) |
206 | wxglade_tmp_menu.AppendSeparator() |
206 | wxglade_tmp_menu.Append(150, "Exit", "", wx.ITEM_NORMAL) |
207 | wxglade_tmp_menu.Append(150, "Exit", "", wx.ITEM_NORMAL) |
207 | self.frame_1_menubar.Append(wxglade_tmp_menu, "File") |
208 | self.frame_1_menubar.Append(wxglade_tmp_menu, "File") |
208 | wxglade_tmp_menu = wx.Menu() |
209 | wxglade_tmp_menu = wx.Menu() |
- | 210 | wxglade_tmp_menu.Append(301, "Clear All", "", wx.ITEM_NORMAL) |
|
- | 211 | wxglade_tmp_menu.Append(302, "Clear Selected", "", wx.ITEM_NORMAL) |
|
209 | wxglade_tmp_menu.Append(301, "Clear", "", wx.ITEM_NORMAL) |
212 | wxglade_tmp_menu.AppendSeparator() |
- | 213 | wxglade_tmp_menu.Append(303, "Load", "", wx.ITEM_NORMAL) |
|
210 | wxglade_tmp_menu.Append(302, "Import", "", wx.ITEM_NORMAL) |
214 | wxglade_tmp_menu.Append(304, "Save", "", wx.ITEM_NORMAL) |
211 | self.frame_1_menubar.Append(wxglade_tmp_menu, "TestSet") |
215 | self.frame_1_menubar.Append(wxglade_tmp_menu, "TestSet") |
212 | wxglade_tmp_menu = wx.Menu() |
216 | wxglade_tmp_menu = wx.Menu() |
213 | self.frame_1_menubar.Append(wxglade_tmp_menu, "MK") |
217 | self.frame_1_menubar.Append(wxglade_tmp_menu, "MK") |
214 | wxglade_tmp_menu = wx.Menu() |
218 | wxglade_tmp_menu = wx.Menu() |
Line 238... | Line 242... | ||
238 | self.__set_properties() |
242 | self.__set_properties() |
239 | self.__do_layout() |
243 | self.__do_layout() |
Line 240... | Line 244... | ||
240 | 244 | ||
241 | self.Bind(wx.EVT_MENU, self.OnSettings, id=101) |
245 | self.Bind(wx.EVT_MENU, self.OnSettings, id=101) |
- | 246 | self.Bind(wx.EVT_MENU, self.onClear, id=301) |
|
242 | self.Bind(wx.EVT_MENU, self.onClear, id=301) |
247 | self.Bind(wx.EVT_MENU, self.onClearSelected, id=302) |
- | 248 | self.Bind(wx.EVT_MENU, self.OnImport, id=303) |
|
243 | self.Bind(wx.EVT_MENU, self.OnImport, id=302) |
249 | self.Bind(wx.EVT_MENU, self.onExport, id=304) |
244 | self.Bind(wx.EVT_BUTTON, self.onStartMeasure, self.button_4) |
250 | self.Bind(wx.EVT_BUTTON, self.onStartMeasure, self.button_4) |
245 | self.Bind(wx.EVT_CHOICE, self.onGraphTypeChange, self.graphTypeChoice) |
251 | self.Bind(wx.EVT_CHOICE, self.onGraphTypeChange, self.graphTypeChoice) |
246 | self.Bind(wx.EVT_CHOICE, self.onYAxisChange, self.yAxisChoice) |
252 | self.Bind(wx.EVT_CHOICE, self.onYAxisChange, self.yAxisChoice) |
Line 375... | Line 381... | ||
375 | 381 | ||
Line 376... | Line 382... | ||
376 | y = int(self.yAxisChoice.GetStringSelection()) |
382 | y = int(self.yAxisChoice.GetStringSelection()) |
Line -... | Line 383... | ||
- | 383 | ||
- | 384 | nbSelected = self.TestListCtrl.SelectedItemCount |
|
- | 385 | ||
377 | 386 | if nbSelected == 0: |
|
378 | nbSelected = self.TestListCtrl.SelectedItemCount |
387 | self.client.Clear() |
379 | 388 | ||
380 | if nbSelected > 1: |
389 | elif nbSelected > 1: |
381 | self.graphTypeChoice.Disable() |
390 | self.graphTypeChoice.Disable() |
382 | x = 1 |
391 | x = 1 |
Line 453... | Line 462... | ||
453 | self.drawGraph() |
462 | self.drawGraph() |
Line 454... | Line 463... | ||
454 | 463 | ||
455 | def onGraphTypeChange(self, event): # wxGlade: MainFrame.<event_handler> |
464 | def onGraphTypeChange(self, event): # wxGlade: MainFrame.<event_handler> |
Line 456... | Line -... | ||
456 | self.drawGraph() |
- | |
457 | - | ||
458 | def onClear(self, event): # wxGlade: MainFrame.<event_handler> |
- | |
459 | print "Event handler `onClear' not implemented" |
- | |
460 | event.Skip() |
465 | self.drawGraph() |
461 | 466 | ||
462 | def OnSettings(self, event): # wxGlade: MainFrame.<event_handler> |
467 | def OnSettings(self, event): # wxGlade: MainFrame.<event_handler> |
463 | dlg = SettingsDialog(self, -1, "Sample Dialog", size=(350, 200), |
468 | dlg = SettingsDialog(self, -1, "Sample Dialog", size=(350, 200), |
464 | #style=wx.CAPTION | wx.SYSTEM_MENU | wx.THICK_FRAME, |
469 | #style=wx.CAPTION | wx.SYSTEM_MENU | wx.THICK_FRAME, |
Line 496... | Line 501... | ||
496 | 501 | ||
497 | # Show the dialog |
502 | # Show the dialog |
498 | val = dlg.ShowModal() # this does not return until the dialog is closed. |
503 | val = dlg.ShowModal() # this does not return until the dialog is closed. |
Line -... | Line 504... | ||
- | 504 | dlg.Destroy() |
|
- | 505 | ||
- | 506 | def _removeTest(self, idx): |
|
- | 507 | print "Deleting test %d" % idx |
|
- | 508 | self.app.removeTest(idx) |
|
- | 509 | self.TestListCtrl.DeleteItem(idx) |
|
- | 510 | ||
- | 511 | ||
- | 512 | def onClear(self, event): # wxGlade: MainFrame.<event_handler> |
|
- | 513 | print "Clear all tests" |
|
- | 514 | for i in range(len(self.app.VibTests)-1, -1, -1): |
|
- | 515 | self._removeTest(i) |
|
- | 516 | self.drawGraph() |
|
- | 517 | ||
- | 518 | ||
- | 519 | def onClearSelected(self, event): # wxGlade: MainFrame.<event_handler> |
|
- | 520 | while True: |
|
- | 521 | idx = self.TestListCtrl.GetFirstSelected() |
|
- | 522 | if idx == -1: break |
|
- | 523 | self._removeTest(idx) |
|
- | 524 | ||
- | 525 | def onExport(self, event): # wxGlade: MainFrame.<event_handler> |
|
- | 526 | print "Event handler `onExport' not implemented" |
|
499 | dlg.Destroy() |
527 | event.Skip() |
Line 500... | Line 528... | ||
500 | 528 | ||
501 | # end of class MainFrame |
529 | # end of class MainFrame |
502 | 530 | ||
Line 722... | Line 750... | ||
722 | 750 | ||
723 | def AddTest(self, descr, motor, speed, channel, rawData): |
751 | def AddTest(self, descr, motor, speed, channel, rawData): |
724 | test = VibTest(descr, motor, speed, channel, rawData) |
752 | test = VibTest(descr, motor, speed, channel, rawData) |
Line -... | Line 753... | ||
- | 753 | self.AddTest2(test) |
|
- | 754 | ||
- | 755 | def removeTest(self, idx): |
|
725 | self.AddTest2(test) |
756 | del(self.VibTests[idx]) |
726 | 757 | ||
Line 727... | Line 758... | ||
727 | def getTest(self, testId): |
758 | def getTest(self, testId): |
728 | return self.VibTests[testId] |
759 | return self.VibTests[testId] |