r11885 - in /branches/bieri_gui/gui_bieri: menu.py relax_gui.py -- December 17, 2010 - 19:52

Author: bugman
Date: Fri Dec 17 19:52:04 2010
New Revision: 11885

URL: http://svn.gna.org/viewcvs/relax?rev=11885&view=rev
Log:
Fix for bug #17320 (https://gna.org/bugs/?17320).

This code is not used by any part of the GUI.  This revision could be 
reverted in the future if
the GUI is designed to use this.  Until then, this action is very confusing 
and unnecessary, as many
users use programs other than relax to determine the relaxation rates.


Modified:
    branches/bieri_gui/gui_bieri/menu.py
    branches/bieri_gui/gui_bieri/relax_gui.py

Modified: branches/bieri_gui/gui_bieri/menu.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/menu.py?rev=11885&r1=11884&r2=11885&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/menu.py (original)
+++ branches/bieri_gui/gui_bieri/menu.py Fri Dec 17 19:52:04 2010
@@ -46,7 +46,6 @@
 
         # The 'File' menu entries.
         menu = wx.Menu()
-        menu.AppendItem(self.build_menu_item(menu, id=0, 
text="&New\tCtrl+N", icon=paths.icon_16x16.new))
         menu.AppendItem(self.build_menu_item(menu, id=1, 
text="&Open\tCtrl+O", icon=paths.icon_16x16.open))
         menu.AppendSeparator()
         menu.AppendItem(self.build_menu_item(menu, id=2, 
text="S&ave\tCtrl+S", icon=paths.icon_16x16.save))
@@ -56,7 +55,6 @@
         self.menubar.Append(menu, "&File")
 
         # The 'File' menu actions.
-        self.gui.Bind(wx.EVT_MENU, self.gui.newGUI,     id=0)
         self.gui.Bind(wx.EVT_MENU, self.gui.state_load, id=1)
         self.gui.Bind(wx.EVT_MENU, self.gui.action_state_save, id=2)
         self.gui.Bind(wx.EVT_MENU, self.gui.action_state_save_as, id=3)

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=11885&r1=11884&r2=11885&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Fri Dec 17 19:52:04 2010
@@ -461,36 +461,6 @@
             ds.relax_gui.analyses[i].save_dir = getcwd()
 
 
-    def newGUI(self, event): # New
-        newdir = opendir('Select results directory', '*')
-        if not newdir == None:
-            #create directories
-            mkdir(newdir + sep + 'NOE_1')
-            mkdir(newdir + sep + 'NOE_2')
-            mkdir(newdir + sep + 'NOE_3')
-            mkdir(newdir + sep + 'R1_1')
-            mkdir(newdir + sep + 'R1_2')
-            mkdir(newdir + sep + 'R1_3')
-            mkdir(newdir + sep + 'R2_1')
-            mkdir(newdir + sep + 'R2_2')
-            mkdir(newdir + sep + 'R2_3')
-            mkdir(newdir + sep + 'model_free')
-
-            #insert directories in set up menu
-            self.res_noe1.SetValue(newdir + sep + 'NOE_1')
-            self.res_noe1_copy.SetValue(newdir + sep + 'NOE_2')
-            self.res_noe1_copy_1.SetValue(newdir + sep + 'NOE_3')
-            self.resultsdir_r11.SetValue(newdir + sep + 'R1_1')
-            self.resultsdir_r11_copy.SetValue(newdir + sep + 'R1_2')
-            self.resultsdir_r11_copy_1.SetValue(newdir + sep + 'R1_3')
-            self.resultsdir_r21.SetValue(newdir + sep + 'R2_1')
-            self.resultsdir_r21_copy.SetValue(newdir + sep + 'R2_2')
-            self.resultsdir_r21_copy_1.SetValue(newdir + sep + 'R2_3')
-            self.resultsdir_r21_copy_2.SetValue(newdir + sep + 'model_free')
-
-            dir_message('Folder structure created for Model-free 
analysis:\n\n\n' + newdir + sep + 'NOE_1\n' + newdir + sep + 'NOE_2\n' + 
newdir + sep + 'NOE_3\n' + newdir + sep + 'R1_1\n' + newdir + sep + 'R1_2\n' 
+ newdir + sep + 'R1_3\n' + newdir + sep + 'R2_1\n' + newdir + sep + 'R2_2\n' 
+ newdir + sep + 'R2_3\n' + newdir + sep + 'model-free')
-
-
     def open_model_results_exe(self, event):    # open model-free results
         choice = self.list_modelfree.GetStringSelection()
         model_result = [ds.relax_gui.table_residue, 
ds.relax_gui.table_model, ds.relax_gui.table_s2, ds.relax_gui.table_rex, 
ds.relax_gui.table_te] # relax results values