Author: michaelbieri
Date: Wed Feb 24 06:17:56 2010
New Revision: 10904
URL: http://svn.gna.org/viewcvs/relax?rev=10904&view=rev
Log:
NOE tab was activated in relax_gui.py.
Modified:
branches/bieri_gui/gui_bieri/analyses/auto_noe.py
branches/bieri_gui/gui_bieri/relax_gui.py
Modified: branches/bieri_gui/gui_bieri/analyses/auto_noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_noe.py?rev=10904&r1=10903&r2=10904&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_noe.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_noe.py Wed Feb 24 06:17:56 2010
@@ -22,7 +22,7 @@
###############################################################################
# Module docstring.
-"""Module containing the base class for the automatic R1 and R2 analysis
frames."""
+"""Module containing the base class for the automatic NOE analysis frames."""
# Python module imports.
from os import sep
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=10904&r1=10903&r2=10904&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Wed Feb 24 06:17:56 2010
@@ -48,6 +48,7 @@
# relaxGUI module imports.
from about import About_gui, About_relax
from analyses.auto_model_free import Auto_model_free
+from analyses.auto_noe import Auto_noe
from analyses.auto_r1 import Auto_r1
from analyses.auto_r2 import Auto_r2
from analyses.project import create_save_file, open_file
@@ -239,7 +240,7 @@
# The automatic relaxation data analysis frames.
self.analysis_frames[self.hardcoded_index_r1_3] = Auto_r1(self,
self.notebook_frq_3, hardcoded_index=self.r1_index[2])
self.analysis_frames[self.hardcoded_index_r2_3] = Auto_r2(self,
self.notebook_frq_3, hardcoded_index=self.r2_index[2])
- #self.analysis_frames[self.hardcoded_index_noe_3] = Auto_noe(self,
self.notebook_frq_3, hardcoded_index=self.noe_index[2])
+ self.analysis_frames[self.hardcoded_index_noe_3] = Auto_noe(self,
self.notebook_frq_3, hardcoded_index=self.noe_index[2])
# The 4th notebook (freq 2).
self.frq2 = wx.Panel(self.notebook_left, -1)
@@ -248,7 +249,7 @@
# The automatic relaxation data analysis frames.
self.analysis_frames[self.hardcoded_index_r1_2] = Auto_r1(self,
self.notebook_frq_2, hardcoded_index=self.r1_index[1])
self.analysis_frames[self.hardcoded_index_r2_2] = Auto_r2(self,
self.notebook_frq_2, hardcoded_index=self.r2_index[1])
- #self.analysis_frames[self.hardcoded_index_noe_2] = Auto_noe(self,
self.notebook_frq_2, hardcoded_index=self.noe_index[1])
+ self.analysis_frames[self.hardcoded_index_noe_2] = Auto_noe(self,
self.notebook_frq_2, hardcoded_index=self.noe_index[1])
# The 3rd notebook (freq 1).
self.frq1 = wx.Panel(self.notebook_left, -1)
@@ -257,7 +258,7 @@
# The automatic relaxation data analysis frames.
self.analysis_frames[self.hardcoded_index_r1_1] = Auto_r1(self,
self.notebook_frq_1, hardcoded_index=self.r1_index[0])
self.analysis_frames[self.hardcoded_index_r2_1] = Auto_r2(self,
self.notebook_frq_1, hardcoded_index=self.r2_index[0])
- #self.analysis_frames[self.hardcoded_index_noe_1] = Auto_noe(self,
self.notebook_frq_1, hardcoded_index=self.noe_index[0])
+ self.analysis_frames[self.hardcoded_index_noe_1] = Auto_noe(self,
self.notebook_frq_1, hardcoded_index=self.noe_index[0])
# The automatic model-free protocol frame.
self.analysis_frames[self.hardcoded_index_mf] =
Auto_model_free(self, self.notebook_left)
@@ -369,7 +370,7 @@
# Add NOE, R1 and R2 tabs to main notebook (1. frequency).
frq1sub = wx.BoxSizer(wx.HORIZONTAL)
# Create sub-tabs.
-
#self.notebook_frq_1.AddPage(self.analysis_frames[self.hardcoded_index_noe_1].parent,
"steady-state NOE")
+
self.notebook_frq_1.AddPage(self.analysis_frames[self.hardcoded_index_noe_1].parent,
"steady-state NOE")
self.notebook_frq_1.AddPage(self.analysis_frames[self.hardcoded_index_r1_1].parent,
"R1 relaxation")
self.notebook_frq_1.AddPage(self.analysis_frames[self.hardcoded_index_r2_1].parent,
"R2 relaxation")
frq1sub.Add(self.notebook_frq_1, 1, wx.EXPAND, 0)
@@ -380,7 +381,7 @@
# Add NOE, R1 and R2 tabs to main notebook (2. frequency).
frq2sub = wx.BoxSizer(wx.HORIZONTAL)
# Create sub-tabs.
-
#self.notebook_frq_2.AddPage(self.analysis_frames[self.hardcoded_index_noe_2].parent,
"steady-state NOE")
+
self.notebook_frq_2.AddPage(self.analysis_frames[self.hardcoded_index_noe_2].parent,
"steady-state NOE")
self.notebook_frq_2.AddPage(self.analysis_frames[self.hardcoded_index_r1_2].parent,
"R1 relaxation")
self.notebook_frq_2.AddPage(self.analysis_frames[self.hardcoded_index_r2_2].parent,
"R2 relaxation")
frq2sub.Add(self.notebook_frq_2, 1, wx.EXPAND, 0)
@@ -391,7 +392,7 @@
# Add NOE, R1 and R2 tabs to main notebook (3. frequency).
frq3sub = wx.BoxSizer(wx.HORIZONTAL)
# Create sub-tabs.
-
#self.notebook_frq_3.AddPage(self.analysis_frames[self.hardcoded_index_noe_3].parent,
"steady-state NOE")
+
self.notebook_frq_3.AddPage(self.analysis_frames[self.hardcoded_index_noe_3].parent,
"steady-state NOE")
self.notebook_frq_3.AddPage(self.analysis_frames[self.hardcoded_index_r1_3].parent,
"R1 relaxation")
self.notebook_frq_3.AddPage(self.analysis_frames[self.hardcoded_index_r2_3].parent,
"R2 relaxation")
frq3sub.Add(self.notebook_frq_3, 1, wx.EXPAND, 0)
r10904 - in /branches/bieri_gui/gui_bieri: analyses/auto_noe.py relax_gui.py