Author: bugman Date: Tue Jan 26 10:57:42 2010 New Revision: 10354 URL: http://svn.gna.org/viewcvs/relax?rev=10354&view=rev Log: Deleted the structure_pdb() method from the auto_model_free module. This method is used by multiple analyses so will be left in relax_gui and called from the analysis modules as self.gui.structure_pdb(). Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.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=10354&r1=10353&r2=10354&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 10:57:42 2010 @@ -132,7 +132,7 @@ # Button actions. self.gui.Bind(wx.EVT_RADIOBUTTON, self.sel_aic, self.aic) self.gui.Bind(wx.EVT_RADIOBUTTON, self.sel_bic, self.bic) - self.gui.Bind(wx.EVT_BUTTON, self.structure_pdb, self.chan_struc_r21_copy_1_copy) + self.gui.Bind(wx.EVT_BUTTON, self.gui.structure_pdb, self.chan_struc_r21_copy_1_copy) self.gui.Bind(wx.EVT_BUTTON, self.resdir_modelfree, self.results_directory_r21_copy_2) self.gui.Bind(wx.EVT_BUTTON, self.exec_model_free, self.relax_start_modelfree) self.gui.Bind(wx.EVT_BUTTON, self.model_noe1, self.model_noe_1) @@ -540,21 +540,3 @@ def sel_bic(self, event): selection = "BIC" event.Skip() - - - def structure_pdb(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: - structure_file_pdb = backup - self.structure_noe1.SetValue(structure_file_pdb) - self.structure_r11.SetValue(structure_file_pdb) - self.structure_r21.SetValue(structure_file_pdb) - self.structure_noe1_copy.SetValue(structure_file_pdb) - self.structure_r11_copy.SetValue(structure_file_pdb) - self.structure_r21_copy.SetValue(structure_file_pdb) - self.structure_noe1_copy_1.SetValue(structure_file_pdb) - self.structure_r11_copy_1.SetValue(structure_file_pdb) - self.structure_r21_copy_1.SetValue(structure_file_pdb) - self.structure_r21_copy_1_copy.SetValue(structure_file_pdb) - event.Skip()