Author: bugman
Date: Wed May 2 21:12:13 2012
New Revision: 15884
URL: http://svn.gna.org/viewcvs/relax?rev=15884&view=rev
Log:
The bmrb.citation GUI user function now uses the new wizard page element_*()
methods for the GUI elements.
Modified:
1.3/gui/user_functions/bmrb.py
Modified: 1.3/gui/user_functions/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/gui/user_functions/bmrb.py?rev=15884&r1=15883&r2=15884&view=diff
==============================================================================
--- 1.3/gui/user_functions/bmrb.py (original)
+++ 1.3/gui/user_functions/bmrb.py Wed May 2 21:12:13 2012
@@ -61,42 +61,42 @@
"""
# The fields.
- self.cite_id = self.input_field(sizer, "The citation ID:",
tooltip=self.uf._doc_args_dict['cite_id'])
- self.authors = self.element_string_list_of_lists(key='authors',
titles=["First name", "Last name", "First initial", "Middle initials"],
sizer=sizer, desc="The author list:",
tooltip=self.uf._doc_args_dict['authors'])
- self.doi = self.input_field(sizer, "The DOI number:",
tooltip=self.uf._doc_args_dict['doi'])
- self.pubmed_id = self.input_field(sizer, "The Pubmed ID number:",
tooltip=self.uf._doc_args_dict['pubmed_id'])
- self.full_citation = self.input_field(sizer, "The full citation:",
tooltip=self.uf._doc_args_dict['full_citation'])
- self.title = self.input_field(sizer, "The title:",
tooltip=self.uf._doc_args_dict['title'])
- self.status = self.input_field(sizer, "The status:",
tooltip=self.uf._doc_args_dict['status'])
- self.type = self.input_field(sizer, "The type:",
tooltip=self.uf._doc_args_dict['type'])
- self.journal_abbrev = self.input_field(sizer, "The journal
abbreviation:", tooltip=self.uf._doc_args_dict['journal_abbrev'])
- self.journal_full = self.input_field(sizer, "The full journal
name:", tooltip=self.uf._doc_args_dict['journal_full'])
- self.volume = self.input_field(sizer, "The volume:",
tooltip=self.uf._doc_args_dict['volume'])
- self.issue = self.input_field(sizer, "The issue:",
tooltip=self.uf._doc_args_dict['issue'])
- self.page_first = self.input_field(sizer, "The first page:",
tooltip=self.uf._doc_args_dict['page_first'])
- self.page_last = self.input_field(sizer, "The last page:",
tooltip=self.uf._doc_args_dict['page_last'])
- self.year = self.input_field(sizer, "The year:",
tooltip=self.uf._doc_args_dict['year'])
+ self.element_string(key='cite_id', sizer=sizer, desc="The citation
ID:", tooltip=self.uf._doc_args_dict['cite_id'])
+ self.element_string_list_of_lists(key='authors', titles=["First
name", "Last name", "First initial", "Middle initials"], sizer=sizer,
desc="The author list:", tooltip=self.uf._doc_args_dict['authors'])
+ self.element_string(key='doi', sizer=sizer, desc="The DOI number:",
tooltip=self.uf._doc_args_dict['doi'])
+ self.element_string(key='pubmed_id', sizer=sizer, desc="The Pubmed
ID number:", tooltip=self.uf._doc_args_dict['pubmed_id'])
+ self.element_string(key='full_citation', sizer=sizer, desc="The full
citation:", tooltip=self.uf._doc_args_dict['full_citation'])
+ self.element_string(key='title', sizer=sizer, desc="The title:",
tooltip=self.uf._doc_args_dict['title'])
+ self.element_string(key='status', sizer=sizer, desc="The status:",
tooltip=self.uf._doc_args_dict['status'])
+ self.element_string(key='type', sizer=sizer, desc="The type:",
tooltip=self.uf._doc_args_dict['type'])
+ self.element_string(key='journal_abbrev', sizer=sizer, desc="The
journal abbreviation:", tooltip=self.uf._doc_args_dict['journal_abbrev'])
+ self.element_string(key='journal_full', sizer=sizer, desc="The full
journal name:", tooltip=self.uf._doc_args_dict['journal_full'])
+ self.element_int(key='volume', sizer=sizer, desc="The volume:",
tooltip=self.uf._doc_args_dict['volume'])
+ self.element_int(key='issue', sizer=sizer, desc="The issue:",
tooltip=self.uf._doc_args_dict['issue'])
+ self.element_int(key='page_first', sizer=sizer, desc="The first
page:", tooltip=self.uf._doc_args_dict['page_first'])
+ self.element_int(key='page_last', sizer=sizer, desc="The last
page:", tooltip=self.uf._doc_args_dict['page_last'])
+ self.element_int(key='year', sizer=sizer, desc="The year:",
tooltip=self.uf._doc_args_dict['year'])
def on_execute(self):
"""Execute the user function."""
# The data.
- cite_id = gui_to_str(self.cite_id.GetValue())
+ cite_id = self.GetValue('cite_id')
authors = self.GetValue('authors')
- doi = gui_to_str(self.doi.GetValue())
- pubmed_id = gui_to_str(self.pubmed_id.GetValue())
- full_citation = gui_to_str(self.full_citation.GetValue())
- title = gui_to_str(self.title.GetValue())
- status = gui_to_str(self.status.GetValue())
- type = gui_to_str(self.type.GetValue())
- journal_abbrev = gui_to_str(self.journal_abbrev.GetValue())
- journal_full = gui_to_str(self.journal_full.GetValue())
- volume = gui_to_int(self.volume.GetValue())
- issue = gui_to_int(self.issue.GetValue())
- page_first = gui_to_int(self.page_first.GetValue())
- page_last = gui_to_int(self.page_last.GetValue())
- year = gui_to_int(self.year.GetValue())
+ doi = self.GetValue('doi')
+ pubmed_id = self.GetValue('pubmed_id')
+ full_citation = self.GetValue('full_citation')
+ title = self.GetValue('title')
+ status = self.GetValue('status')
+ type = self.GetValue('type')
+ journal_abbrev = self.GetValue('journal_abbrev')
+ journal_full = self.GetValue('journal_full')
+ volume = self.GetValue('volume')
+ issue = self.GetValue('issue')
+ page_first = self.GetValue('page_first')
+ page_last = self.GetValue('page_last')
+ year = self.GetValue('year')
# Execute the user function.
self.execute('bmrb.citation', cite_id=cite_id, authors=authors,
doi=doi, pubmed_id=pubmed_id, full_citation=full_citation, title=title,
status=status, type=type, journal_abbrev=journal_abbrev,
journal_full=journal_full, volume=volume, issue=issue, page_first=page_first,
page_last=page_last, year=year)
r15884 - /1.3/gui/user_functions/bmrb.py