Author: bugman Date: Tue Jan 26 10:10:42 2010 New Revision: 10351 URL: http://svn.gna.org/viewcvs/relax?rev=10351&view=rev Log: Rearranged the layout to better match the original in relax_gui.py. Note that the layout is still not quite right. The code is still in a state that I cannot fully understand. 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=10351&r1=10350&r2=10351&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:10:42 2010 @@ -179,44 +179,12 @@ nmr_freq_copy_copy_copy_copy_copy_1_copy = wx.BoxSizer(wx.HORIZONTAL) exec_relax_copy_1_copy_3 = wx.BoxSizer(wx.HORIZONTAL) - sizer_16.Add(self.panel_4_copy_1, 0, 0, 0) - sizer_15.Add(sizer_16, 0, 0, 0) - sizer_15.Add(self.label_9, 0, wx.TOP|wx.ADJUST_MINSIZE, 10) - sizer_20.Add(self.m0, 0, wx.ADJUST_MINSIZE, 0) - sizer_20.Add(self.m1, 0, wx.ADJUST_MINSIZE, 0) - sizer_20.Add(self.m2, 0, wx.ADJUST_MINSIZE, 0) - sizer_20.Add(self.m3, 0, wx.ADJUST_MINSIZE, 0) - sizer_20.Add(self.m4, 0, wx.ADJUST_MINSIZE, 0) - sizer_20.Add(self.m5, 0, wx.ADJUST_MINSIZE, 0) - sizer_20.Add(self.m6, 0, wx.ADJUST_MINSIZE, 0) - sizer_20.Add(self.m7, 0, wx.ADJUST_MINSIZE, 0) - sizer_20.Add(self.m8, 0, wx.ADJUST_MINSIZE, 0) - sizer_20.Add(self.m9, 0, wx.ADJUST_MINSIZE, 0) - sizer_15.Add(sizer_20, 1, wx.EXPAND, 0) - sizer_21.Add(self.label_10, 0, wx.TOP|wx.ADJUST_MINSIZE, 1) - sizer_21.Add(self.aic, 0, wx.ADJUST_MINSIZE, 0) - sizer_21.Add(self.bic, 0, wx.ADJUST_MINSIZE, 0) - sizer_15.Add(sizer_21, 1, wx.TOP|wx.EXPAND, 5) - results_dir_copy_copy_copy_copy_copy_1_copy.Add(self.structure_file_copy_copy_1_copy, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) - results_dir_copy_copy_copy_copy_copy_1_copy.Add(self.structure_r21_copy_1_copy, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) - 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) - sizer_15.Add(results_dir_copy_copy_copy_copy_copy_1_copy, 1, wx.EXPAND, 0) - nmr_freq_copy_copy_copy_copy_copy_1_copy.Add(self.label_2_copy_copy_copy_2_copy_copy_copy_copy_1_copy, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) - nmr_freq_copy_copy_copy_copy_copy_1_copy.Add(self.unresolved_r21_copy_1_copy, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) - sizer_15.Add(nmr_freq_copy_copy_copy_copy_copy_1_copy, 0, wx.EXPAND|wx.SHAPED, 0) - results_dir_copy_copy_copy_1_copy_2.Add(self.label_2_copy_copy_3_copy_copy_copy_copy_2, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) - results_dir_copy_copy_copy_1_copy_2.Add(self.resultsdir_r21_copy_2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) - results_dir_copy_copy_copy_1_copy_2.Add(self.results_directory_r21_copy_2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 10) - sizer_15.Add(results_dir_copy_copy_copy_1_copy_2, 1, wx.EXPAND, 0) - exec_relax_copy_1_copy_3.Add(self.label_5_copy_1_copy_3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) - exec_relax_copy_1_copy_3.Add(self.relax_start_modelfree, 0, wx.RIGHT|wx.ADJUST_MINSIZE, 0) - sizer_15.Add(exec_relax_copy_1_copy_3, 1, wx.ALIGN_RIGHT, 0) + sizer_14.Add(self.bitmap_2, 0, wx.ADJUST_MINSIZE, 0) + sizer_15.Add(self.label_4_copy_copy_copy_copy_1_copy, 0, wx.BOTTOM|wx.ADJUST_MINSIZE, 18) + self.label_4_copy_copy_copy_copy_1_copy.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Sans")) sizer_14.Add(sizer_15, 0, 0, 0) self.gui.modelfree.SetSizer(sizer_14) - self.label_4_copy_copy_copy_copy_1_copy.SetFont(wx.Font(16, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Sans")) - self.label_7.SetMinSize((80, 17)) - sizer_14.Add(self.bitmap_2, 0, wx.ADJUST_MINSIZE, 0) - sizer_15.Add(self.label_4_copy_copy_copy_copy_1_copy, 0, wx.BOTTOM|wx.ADJUST_MINSIZE, 18) + sizer_15.Add(exec_relax_copy_1_copy_3, 1, wx.ALIGN_RIGHT, 0) sizer_18.Add(self.label_7, 0, wx.ADJUST_MINSIZE, 0) sizer_18.Add(self.modelfreefreq1, 0, wx.ADJUST_MINSIZE, 0) sizer_17.Add(sizer_18, 0, 0, 0) @@ -266,6 +234,38 @@ sizer_19_copy_copy_copy_copy.Add(self.m_r2_3, 0, wx.ADJUST_MINSIZE, 0) sizer_19_copy_copy_copy_copy.Add(self.model_r2_3, 0, wx.ADJUST_MINSIZE, 0) sizer_17_copy_copy.Add(sizer_19_copy_copy_copy_copy, 0, wx.EXPAND|wx.SHAPED, 0) + sizer_16.Add(self.panel_4_copy_1, 0, 0, 0) + sizer_15.Add(sizer_16, 0, 0, 0) + sizer_15.Add(self.label_9, 0, wx.TOP|wx.ADJUST_MINSIZE, 10) + sizer_20.Add(self.m0, 0, wx.ADJUST_MINSIZE, 0) + sizer_20.Add(self.m1, 0, wx.ADJUST_MINSIZE, 0) + sizer_20.Add(self.m2, 0, wx.ADJUST_MINSIZE, 0) + sizer_20.Add(self.m3, 0, wx.ADJUST_MINSIZE, 0) + sizer_20.Add(self.m4, 0, wx.ADJUST_MINSIZE, 0) + sizer_20.Add(self.m5, 0, wx.ADJUST_MINSIZE, 0) + sizer_20.Add(self.m6, 0, wx.ADJUST_MINSIZE, 0) + sizer_20.Add(self.m7, 0, wx.ADJUST_MINSIZE, 0) + sizer_20.Add(self.m8, 0, wx.ADJUST_MINSIZE, 0) + sizer_20.Add(self.m9, 0, wx.ADJUST_MINSIZE, 0) + sizer_15.Add(sizer_20, 1, wx.EXPAND, 0) + sizer_21.Add(self.label_10, 0, wx.TOP|wx.ADJUST_MINSIZE, 1) + sizer_21.Add(self.aic, 0, wx.ADJUST_MINSIZE, 0) + sizer_21.Add(self.bic, 0, wx.ADJUST_MINSIZE, 0) + sizer_15.Add(sizer_21, 1, wx.TOP|wx.EXPAND, 5) + results_dir_copy_copy_copy_copy_copy_1_copy.Add(self.structure_file_copy_copy_1_copy, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) + results_dir_copy_copy_copy_copy_copy_1_copy.Add(self.structure_r21_copy_1_copy, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) + 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) + sizer_15.Add(results_dir_copy_copy_copy_copy_copy_1_copy, 1, wx.EXPAND, 0) + nmr_freq_copy_copy_copy_copy_copy_1_copy.Add(self.label_2_copy_copy_copy_2_copy_copy_copy_copy_1_copy, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) + nmr_freq_copy_copy_copy_copy_copy_1_copy.Add(self.unresolved_r21_copy_1_copy, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) + sizer_15.Add(nmr_freq_copy_copy_copy_copy_copy_1_copy, 0, wx.EXPAND|wx.SHAPED, 0) + results_dir_copy_copy_copy_1_copy_2.Add(self.label_2_copy_copy_3_copy_copy_copy_copy_2, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) + results_dir_copy_copy_copy_1_copy_2.Add(self.resultsdir_r21_copy_2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) + results_dir_copy_copy_copy_1_copy_2.Add(self.results_directory_r21_copy_2, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 10) + sizer_15.Add(results_dir_copy_copy_copy_1_copy_2, 1, wx.EXPAND, 0) + exec_relax_copy_1_copy_3.Add(self.label_5_copy_1_copy_3, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0) + exec_relax_copy_1_copy_3.Add(self.relax_start_modelfree, 0, wx.RIGHT|wx.ADJUST_MINSIZE, 0) + self.label_7.SetMinSize((80, 17)) self.panel_4_copy_1.SetSizer(sizer_17_copy_copy)