Author: bugman Date: Wed May 2 18:36:59 2012 New Revision: 15880 URL: http://svn.gna.org/viewcvs/relax?rev=15880&view=rev Log: Completed the GUI interface for the bmrb.citation user function. 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=15880&r1=15879&r2=15880&view=diff ============================================================================== --- 1.3/gui/user_functions/bmrb.py (original) +++ 1.3/gui/user_functions/bmrb.py Wed May 2 18:36:59 2012 @@ -40,7 +40,7 @@ """The bmrb.citation user function.""" # Execute the wizard. - wizard = self.create_wizard(size_x=1000, size_y=700, name='bmrb.citation', uf_page=Citation_page) + wizard = self.create_wizard(size_x=1000, size_y=800, name='bmrb.citation', uf_page=Citation_page) wizard.run() @@ -63,6 +63,19 @@ # 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']) def on_execute(self): @@ -71,6 +84,19 @@ # The data. cite_id = gui_to_str(self.cite_id.GetValue()) 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()) - # Read the relaxation data. - self.execute('bmrb.citation', cite_id=cite_id, authors=authors) + # 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)