r10542 - /branches/bieri_gui/gui_bieri/relax_gui.py -- January 28, 2010 - 18:48

Author: bugman
Date: Thu Jan 28 18:48:34 2010
New Revision: 10542

URL: http://svn.gna.org/viewcvs/relax?rev=10542&view=rev
Log:
Shifted the building of the first R1 frame into build_main_window().

Comments were added to this method to try to make sense of the layout.


Modified:
    branches/bieri_gui/gui_bieri/relax_gui.py

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=10542&r1=10541&r2=10542&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Thu Jan 28 18:48:34 2010
@@ -146,9 +146,6 @@
         self.label_5_copy_1 = wx.StaticText(self.noe1, -1, "Execute relax    
    ", style=wx.ALIGN_RIGHT)
         self.relax_start_noe1 = wx.BitmapButton(self.noe1, -1, 
wx.Bitmap(IMAGE_PATH+'relax_start.gif', wx.BITMAP_TYPE_ANY))
 
-
-        # The automatic R1 analysis frame.
-        self.analysis_frames[self.hardcoded_index_r1_1] = Auto_r1(self, 
self.notebook_3)
 
         #R2 no. 1
         rx_data = ds.relax_gui.analyses[self.r2_index[0]]
@@ -1714,6 +1711,8 @@
         self.notebook_2 = wx.Notebook(self, -1, style=wx.NB_LEFT)
         self.results = wx.Panel(self.notebook_2, -1)
         self.frq3 = wx.Panel(self.notebook_2, -1)
+
+        # The 5th notebook (freq 3).
         self.notebook_3_copy_1 = wx.Notebook(self.frq3, -1, style=0)
         self.r2_1_copy_1 = wx.Panel(self.notebook_3_copy_1, -1)
         self.panel_1_copy_copy_1 = wx.Panel(self.r2_1_copy_1, -1)
@@ -1723,6 +1722,8 @@
         self.panel_3_copy_2 = wx.Panel(self.panel_1_copy_2, -1)
         self.noe1_copy_1 = wx.Panel(self.notebook_3_copy_1, -1)
         self.frq2 = wx.Panel(self.notebook_2, -1)
+
+        # The 4th notebook (freq 2).
         self.notebook_3_copy = wx.Notebook(self.frq2, -1, style=0)
         self.r2_1_copy = wx.Panel(self.notebook_3_copy, -1)
         self.panel_1_copy_copy = wx.Panel(self.r2_1_copy, -1)
@@ -1732,7 +1733,13 @@
         self.panel_3_copy_1 = wx.Panel(self.panel_1_copy_1, -1)
         self.noe1_copy = wx.Panel(self.notebook_3_copy, -1)
         self.frq1 = wx.Panel(self.notebook_2, -1)
+
+        # The 3rd notebook (freq 1).
         self.notebook_3 = wx.Notebook(self.frq1, -1, style=0)
+
+        # The automatic R1 analysis frame.
+        self.analysis_frames[self.hardcoded_index_r1_1] = Auto_r1(self, 
self.notebook_3)
+
         self.r2_1 = wx.Panel(self.notebook_3, -1)
         self.panel_1_copy = wx.Panel(self.r2_1, -1)
         self.panel_3_copy = wx.Panel(self.panel_1_copy, -1)