Author: bugman Date: Tue Jan 26 13:22:17 2010 New Revision: 10370 URL: http://svn.gna.org/viewcvs/relax?rev=10370&view=rev Log: Renamed the StructureTextCtrl method structure_pdb() to open_file(). Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py branches/bieri_gui/gui_bieri/derived_wx_classes.py branches/bieri_gui/gui_bieri/relax_gui.py Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_model_free.py?rev=10370&r1=10369&r2=10370&view=diff ============================================================================== --- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original) +++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Tue Jan 26 13:22:17 2010 @@ -253,7 +253,7 @@ results_dir_copy_copy_copy_copy_copy_1_copy.Add(self.chan_struc_r21_copy_1_copy, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 10) # Bind the events. - self.gui.Bind(wx.EVT_BUTTON, self.structure_r21_copy_1_copy.structure_pdb, self.chan_struc_r21_copy_1_copy) + self.gui.Bind(wx.EVT_BUTTON, self.structure_r21_copy_1_copy.open_file, self.chan_struc_r21_copy_1_copy) # Add the element to the box. box.Add(results_dir_copy_copy_copy_copy_copy_1_copy, 1, wx.EXPAND, 0) Modified: branches/bieri_gui/gui_bieri/derived_wx_classes.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/derived_wx_classes.py?rev=10370&r1=10369&r2=10370&view=diff ============================================================================== --- branches/bieri_gui/gui_bieri/derived_wx_classes.py (original) +++ branches/bieri_gui/gui_bieri/derived_wx_classes.py Tue Jan 26 13:22:17 2010 @@ -31,7 +31,7 @@ class StructureTextCtrl(wx.TextCtrl): """Class for structural file selection.""" - def structure_pdb(self, event): # structure file + def open_file(self, event): # structure file backup = self.structure_noe1.GetValue() structure_file_pdb = openfile('Select PDB File', self.res_noe1.GetValue() + sep, '*.*', 'PDB files (*.pdb)|*.pdb|all files (*.*)|*.*') if structure_file_pdb == None: Modified: branches/bieri_gui/gui_bieri/relax_gui.py URL: http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/relax_gui.py?rev=10370&r1=10369&r2=10370&view=diff ============================================================================== --- branches/bieri_gui/gui_bieri/relax_gui.py (original) +++ branches/bieri_gui/gui_bieri/relax_gui.py Tue Jan 26 13:22:17 2010 @@ -632,46 +632,46 @@ #button actions self.Bind(wx.EVT_BUTTON, self.sat_noe1, self.sat_noe_copy_1) self.Bind(wx.EVT_BUTTON, self.ref_noe, self.noe_ref_err_copy_1) - self.Bind(wx.EVT_BUTTON, self.structure_noe1.structure_pdb, self.ref_noe_copy_1) + self.Bind(wx.EVT_BUTTON, self.structure_noe1.open_file, self.ref_noe_copy_1) self.Bind(wx.EVT_BUTTON, self.resdir_noe1, self.chandir_noe1) self.Bind(wx.EVT_BUTTON, self.exec_noe1, self.relax_start_noe1) self.Bind(wx.EVT_BUTTON, self.resdir_r1_1, self.results_directory_copy_copy) - self.Bind(wx.EVT_BUTTON, self.structure_r11.structure_pdb, self.results_directory_copy_copy_copy) + self.Bind(wx.EVT_BUTTON, self.structure_r11.open_file, self.results_directory_copy_copy_copy) self.Bind(wx.EVT_BUTTON, self.add_r1_1, self.addr11) self.Bind(wx.EVT_BUTTON, self.refresh_r1_1, self.refreshr11) self.Bind(wx.EVT_BUTTON, self.exec_r2_1, self.relax_start_r1_1) self.Bind(wx.EVT_BUTTON, self.resdir_r2_1, self.results_directory_r21) - self.Bind(wx.EVT_BUTTON, self.structure_r21.structure_pdb, self.chan_struc_r21) + self.Bind(wx.EVT_BUTTON, self.structure_r21.open_file, self.chan_struc_r21) self.Bind(wx.EVT_BUTTON, self.add_r2_1, self.addr21) self.Bind(wx.EVT_BUTTON, self.refresh_r2_1, self.refreshr21) self.Bind(wx.EVT_BUTTON, self.exec_r1_1, self.relax_start_r1_1_copy) self.Bind(wx.EVT_BUTTON, self.sat_noe2, self.sat_noe_copy_1_copy) self.Bind(wx.EVT_BUTTON, self.ref_noe2, self.noe_ref_err_copy_1_copy) - self.Bind(wx.EVT_BUTTON, self.structure_noe1_copy.structure_pdb, self.ref_noe_copy_1_copy) + self.Bind(wx.EVT_BUTTON, self.structure_noe1_copy.open_file, self.ref_noe_copy_1_copy) self.Bind(wx.EVT_BUTTON, self.resdir_noe2, self.chandir_noe1_copy) self.Bind(wx.EVT_BUTTON, self.exec_noe2, self.relax_start_noe1_copy) self.Bind(wx.EVT_BUTTON, self.resdir_r1_2, self.results_directory_copy_copy_copy_1) - self.Bind(wx.EVT_BUTTON, self.structure_r11_copy.structure_pdb, self.results_directory_copy_copy_copy_copy) + self.Bind(wx.EVT_BUTTON, self.structure_r11_copy.open_file, self.results_directory_copy_copy_copy_copy) self.Bind(wx.EVT_BUTTON, self.add_r1_2, self.addr11_copy) self.Bind(wx.EVT_BUTTON, self.refresh_r1_2, self.refreshr11_copy) self.Bind(wx.EVT_BUTTON, self.exec_r1_2, self.relax_start_r1_1_copy_1) self.Bind(wx.EVT_BUTTON, self.resdir_r2_2, self.results_directory_r21_copy) - self.Bind(wx.EVT_BUTTON, self.structure_r21_copy.structure_pdb, self.chan_struc_r21_copy) + self.Bind(wx.EVT_BUTTON, self.structure_r21_copy.open_file, self.chan_struc_r21_copy) self.Bind(wx.EVT_BUTTON, self.add_r2_2, self.addr21_copy) self.Bind(wx.EVT_BUTTON, self.refresh_r2_2, self.refreshr21_copy) self.Bind(wx.EVT_BUTTON, self.exec_r2_2, self.relax_start_r1_1_copy_copy) self.Bind(wx.EVT_BUTTON, self.sat_noe3, self.sat_noe_copy_1_copy_1) self.Bind(wx.EVT_BUTTON, self.ref_noe3, self.noe_ref_err_copy_1_copy_1) - self.Bind(wx.EVT_BUTTON, self.structure_noe1_copy_1.structure_pdb, self.ref_noe_copy_1_copy_1) + self.Bind(wx.EVT_BUTTON, self.structure_noe1_copy_1.open_file, self.ref_noe_copy_1_copy_1) self.Bind(wx.EVT_BUTTON, self.resdir_noe3, self.chandir_noe1_copy_1) self.Bind(wx.EVT_BUTTON, self.exec_noe3, self.relax_start_noe1_copy_1) self.Bind(wx.EVT_BUTTON, self.resdir_r1_3, self.results_directory_copy_copy_copy_2) - self.Bind(wx.EVT_BUTTON, self.structure_r11_copy_1.structure_pdb, self.results_directory_copy_copy_copy_copy_1) + self.Bind(wx.EVT_BUTTON, self.structure_r11_copy_1.open_file, self.results_directory_copy_copy_copy_copy_1) self.Bind(wx.EVT_BUTTON, self.add_r1_3, self.addr11_copy_1) self.Bind(wx.EVT_BUTTON, self.refresh_r1_3, self.refreshr11_copy_1) self.Bind(wx.EVT_BUTTON, self.exec_r1_3, self.relax_start_r1_1_copy_2) self.Bind(wx.EVT_BUTTON, self.resdir_r2_3, self.results_directory_r21_copy_1) - self.Bind(wx.EVT_BUTTON, self.structure_r21_copy_1.structure_pdb, self.chan_struc_r21_copy_1) + self.Bind(wx.EVT_BUTTON, self.structure_r21_copy_1.open_file, self.chan_struc_r21_copy_1) self.Bind(wx.EVT_BUTTON, self.add_r2_3, self.addr21_copy_1) self.Bind(wx.EVT_BUTTON, self.refresh_r2_3, self.refreshr21_copy_1) self.Bind(wx.EVT_BUTTON, self.exec_r2_3, self.relax_start_r1_1_copy_copy_1)