Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 615 → Rev 616

/VibrationTest/trunk/VibrationTest/VibrationTestGui.py
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]
 
/VibrationTest/trunk/VibrationTest/VibrationTestGui.wxg
1,5 → 1,5
<?xml version="1.0"?>
<!-- generated by wxGlade 0.6.3 on Sat Oct 03 10:22:33 2009 -->
<!-- generated by wxGlade 0.6.3 on Sat Oct 03 22:26:38 2009 -->
 
<application path="C:\DATA\MK\SVN\Projects\VibrationTest\trunk\VibrationTest\VibrationTestGui.py" name="VibrationTestGui" class="App" option="0" language="python" top_window="frame_1" encoding="ISO-8859-15" use_gettext="0" overwrite="0" use_new_namespace="1" for_version="2.6" is_template="0">
<object class="MainFrame" name="frame_1" base="EditFrame">
16,6 → 16,11
<handler>OnSettings</handler>
</item>
<item>
<label>---</label>
<id>---</id>
<name>---</name>
</item>
<item>
<label>Exit</label>
<id>150</id>
</item>
22,15 → 27,30
</menu>
<menu name="" itemid="300" label="TestSet">
<item>
<label>Clear</label>
<label>Clear All</label>
<id>301</id>
<handler>onClear</handler>
</item>
<item>
<label>Import</label>
<label>Clear Selected</label>
<id>302</id>
<handler>onClearSelected</handler>
</item>
<item>
<label>---</label>
<id>---</id>
<name>---</name>
</item>
<item>
<label>Load</label>
<id>303</id>
<handler>OnImport</handler>
</item>
<item>
<label>Save</label>
<id>304</id>
<handler>onExport</handler>
</item>
</menu>
<menu name="" label="MK">
</menu>
88,7 → 108,7
<object class="sizeritem">
<border>0</border>
<option>0</option>
<object class="wxTextCtrl" name="text_ctrl_6" base="EditTextCtrl">
<object class="wxTextCtrl" name="tcDescr" base="EditTextCtrl">
<value>Test</value>
</object>
</object>
104,7 → 124,7
<object class="sizeritem">
<border>0</border>
<option>0</option>
<object class="wxTextCtrl" name="text_ctrl_9" base="EditTextCtrl">
<object class="wxTextCtrl" name="tcSpeeds" base="EditTextCtrl">
<value>100-200:10</value>
</object>
</object>
120,7 → 140,7
<object class="sizeritem">
<border>0</border>
<option>0</option>
<object class="wxTextCtrl" name="text_ctrl_7" base="EditTextCtrl">
<object class="wxTextCtrl" name="tcMotors" base="EditTextCtrl">
<value>1</value>
</object>
</object>
144,13 → 164,13
<option>0</option>
<object class="wxStaticText" name="label_36" base="EditStaticText">
<attribute>1</attribute>
<label>Channel</label>
<label>Channel(s)</label>
</object>
</object>
<object class="sizeritem">
<border>0</border>
<option>0</option>
<object class="wxTextCtrl" name="text_ctrl_8" base="EditTextCtrl">
<object class="wxTextCtrl" name="tcChannels" base="EditTextCtrl">
<value>6</value>
</object>
</object>