Author: bugman
Date: Tue Jan 26 13:21:07 2010
New Revision: 10369
URL: http://svn.gna.org/viewcvs/relax?rev=10369&view=rev
Log:
All PDB file inputs now use StructureTextCtrl.
Modified:
branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
branches/bieri_gui/gui_bieri/relax_gui.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=10369&r1=10368&r2=10369&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
13:21:07 2010
@@ -32,6 +32,7 @@
from gui_bieri.analyses.relax_control import start_modelfree
from gui_bieri.analyses.results_analysis import model_free_results,
see_results
from gui_bieri.analyses.select_model_calc import check_entries, whichmodel
+from gui_bieri.derived_wx_classes import StructureTextCtrl
from gui_bieri.filedialog import opendir, openfile
from gui_bieri.paths import IMAGE_PATH
@@ -234,7 +235,7 @@
# The elements.
self.structure_file_copy_copy_1_copy =
wx.StaticText(self.gui.modelfree, -1, "Structure file (.pdb)",
style=wx.ALIGN_RIGHT)
- self.structure_r21_copy_1_copy = wx.TextCtrl(self.gui.modelfree, -1,
self.gui.structure_file_pdb_msg)
+ self.structure_r21_copy_1_copy =
StructureTextCtrl(self.gui.modelfree, -1, self.gui.structure_file_pdb_msg)
self.structure_r21_copy_1_copy.SetEditable(False)
self.chan_struc_r21_copy_1_copy = wx.Button(self.gui.modelfree, -1,
"Change")
@@ -252,7 +253,7 @@
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)
# Bind the events.
- self.gui.Bind(wx.EVT_BUTTON, self.gui.structure_pdb,
self.chan_struc_r21_copy_1_copy)
+ self.gui.Bind(wx.EVT_BUTTON,
self.structure_r21_copy_1_copy.structure_pdb, self.chan_struc_r21_copy_1_copy)
# Add the element to the box.
box.Add(results_dir_copy_copy_copy_copy_copy_1_copy, 1, wx.EXPAND, 0)
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=10369&r1=10368&r2=10369&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/relax_gui.py (original)
+++ branches/bieri_gui/gui_bieri/relax_gui.py Tue Jan 26 13:21:07 2010
@@ -47,6 +47,7 @@
from analyses.relax_control import start_modelfree, start_noe, start_rx
from analyses.results_analysis import color_code_noe, model_free_results,
results_table, see_results
from analyses.select_model_calc import check_entries, whichmodel
+from derived_wx_classes import StructureTextCtrl
from filedialog import multi_openfile, opendir, openfile, savefile
from message import dir_message, exec_relax, missing_data, question,
relax_run_ok
from paths import ABOUT_RELAX_ICON, ABOUT_RELAXGUI_ICON, CONTACT_ICON,
EXIT_ICON, IMAGE_PATH, LOAD_ICON, MANUAL_ICON, NEW_ICON, OPEN_ICON, REF_ICON,
SAVE_AS_ICON, SETTINGS_ICON, SETTINGS_GLOBAL_ICON, SETTINGS_RESET_ICON
@@ -224,7 +225,7 @@
self.label_2_copy_copy_copy_copy_copy_1 = wx.StaticText(self.noe1,
-1, "reference NOE background RMSD", style=wx.ALIGN_RIGHT)
self.noe_ref_err_1 = wx.TextCtrl(self.noe1, -1, str(noerefrmsd[0]))
self.label_2_copy_copy_2_copy_1 = wx.StaticText(self.noe1, -1,
"Structure file (.pdb)", style=wx.ALIGN_RIGHT)
- self.structure_noe1 = wx.TextCtrl(self.noe1, -1,
self.structure_file_pdb_msg)
+ self.structure_noe1 = StructureTextCtrl(self.noe1, -1,
self.structure_file_pdb_msg)
self.structure_noe1.SetEditable(False)
self.ref_noe_copy_1 = wx.Button(self.noe1, -1, "Add / Change")
self.label_2_copy_copy_copy_1_copy_1 = wx.StaticText(self.noe1, -1,
"Unresolved Residues\nseparated by comma:")
@@ -246,7 +247,7 @@
self.resultsdir_r11 = wx.TextCtrl(self.r1_1, -1, r1_savedir[0])
self.results_directory_copy_copy = wx.Button(self.r1_1, -1, "Change")
self.structure_file = wx.StaticText(self.r1_1, -1, "Structure file
(.pdb)", style=wx.ALIGN_RIGHT)
- self.structure_r11 = wx.TextCtrl(self.r1_1, -1,
self.structure_file_pdb_msg)
+ self.structure_r11 = StructureTextCtrl(self.r1_1, -1,
self.structure_file_pdb_msg)
self.structure_r11.SetEditable(False)
self.results_directory_copy_copy_copy = wx.Button(self.r1_1, -1,
"Change")
self.label_2_copy_copy_copy_2_copy_copy = wx.StaticText(self.r1_1,
-1, "Unresolved residues:", style=wx.ALIGN_RIGHT)
@@ -297,7 +298,7 @@
self.resultsdir_r21 = wx.TextCtrl(self.r2_1, -1, r2_savedir[0])
self.results_directory_r21 = wx.Button(self.r2_1, -1, "Change")
self.structure_file_copy = wx.StaticText(self.r2_1, -1, "Structure
file (.pdb)", style=wx.ALIGN_RIGHT)
- self.structure_r21 = wx.TextCtrl(self.r2_1, -1,
self.structure_file_pdb_msg)
+ self.structure_r21 = StructureTextCtrl(self.r2_1, -1,
self.structure_file_pdb_msg)
self.structure_r21.SetEditable(False)
self.chan_struc_r21 = wx.Button(self.r2_1, -1, "Change")
self.label_2_copy_copy_copy_2_copy_copy_copy =
wx.StaticText(self.r2_1, -1, "Unresolved residues:", style=wx.ALIGN_RIGHT)
@@ -355,7 +356,7 @@
self.label_2_copy_copy_copy_copy_copy_1_copy =
wx.StaticText(self.noe1_copy, -1, "reference NOE background RMSD",
style=wx.ALIGN_RIGHT)
self.noe_ref_err_1_copy = wx.TextCtrl(self.noe1_copy, -1, "1000")
self.label_2_copy_copy_2_copy_1_copy = wx.StaticText(self.noe1_copy,
-1, "Structure file (.pdb)", style=wx.ALIGN_RIGHT)
- self.structure_noe1_copy = wx.TextCtrl(self.noe1_copy, -1,
self.structure_file_pdb_msg)
+ self.structure_noe1_copy = StructureTextCtrl(self.noe1_copy, -1,
self.structure_file_pdb_msg)
self.structure_noe1_copy.SetEditable(False)
self.ref_noe_copy_1_copy = wx.Button(self.noe1_copy, -1, "Add /
Change")
self.label_2_copy_copy_copy_1_copy_1_copy =
wx.StaticText(self.noe1_copy, -1, "Unresolved Residues\nseparated by comma:")
@@ -377,7 +378,7 @@
self.resultsdir_r11_copy = wx.TextCtrl(self.r1_1_copy, -1,
r1_savedir[1])
self.results_directory_copy_copy_copy_1 = wx.Button(self.r1_1_copy,
-1, "Change")
self.structure_file_copy_1 = wx.StaticText(self.r1_1_copy, -1,
"Structure file (.pdb)", style=wx.ALIGN_RIGHT)
- self.structure_r11_copy = wx.TextCtrl(self.r1_1_copy, -1,
self.structure_file_pdb_msg)
+ self.structure_r11_copy = StructureTextCtrl(self.r1_1_copy, -1,
self.structure_file_pdb_msg)
self.results_directory_copy_copy_copy_copy =
wx.Button(self.r1_1_copy, -1, "Change")
self.label_2_copy_copy_copy_2_copy_copy_copy_1 =
wx.StaticText(self.r1_1_copy, -1, "Unresolved residues:",
style=wx.ALIGN_RIGHT)
self.unresolved_r11_copy = wx.TextCtrl(self.r1_1_copy, -1, "")
@@ -426,7 +427,7 @@
self.resultsdir_r21_copy = wx.TextCtrl(self.r2_1_copy, -1,
r2_savedir[1])
self.results_directory_r21_copy = wx.Button(self.r2_1_copy, -1,
"Change")
self.structure_file_copy_copy = wx.StaticText(self.r2_1_copy, -1,
"Structure file (.pdb)", style=wx.ALIGN_RIGHT)
- self.structure_r21_copy = wx.TextCtrl(self.r2_1_copy, -1,
self.structure_file_pdb_msg)
+ self.structure_r21_copy = StructureTextCtrl(self.r2_1_copy, -1,
self.structure_file_pdb_msg)
self.structure_r21_copy.SetEditable(False)
self.chan_struc_r21_copy = wx.Button(self.r2_1_copy, -1, "Change")
self.label_2_copy_copy_copy_2_copy_copy_copy_copy =
wx.StaticText(self.r2_1_copy, -1, "Unresolved residues:",
style=wx.ALIGN_RIGHT)
@@ -483,7 +484,7 @@
self.label_2_copy_copy_copy_copy_copy_1_copy_1 =
wx.StaticText(self.noe1_copy_1, -1, "reference NOE background RMSD",
style=wx.ALIGN_RIGHT)
self.noe_ref_err_1_copy_1 = wx.TextCtrl(self.noe1_copy_1, -1, "1000")
self.label_2_copy_copy_2_copy_1_copy_1 =
wx.StaticText(self.noe1_copy_1, -1, "Structure file (.pdb)",
style=wx.ALIGN_RIGHT)
- self.structure_noe1_copy_1 = wx.TextCtrl(self.noe1_copy_1, -1,
self.structure_file_pdb_msg)
+ self.structure_noe1_copy_1 = StructureTextCtrl(self.noe1_copy_1, -1,
self.structure_file_pdb_msg)
self.structure_noe1_copy_1.SetEditable(False)
self.ref_noe_copy_1_copy_1 = wx.Button(self.noe1_copy_1, -1, "Add /
Change")
self.label_2_copy_copy_copy_1_copy_1_copy_1 =
wx.StaticText(self.noe1_copy_1, -1, "Unresolved Residues\nseparated by
comma:")
@@ -505,7 +506,7 @@
self.resultsdir_r11_copy_1 = wx.TextCtrl(self.r1_1_copy_1, -1,
r1_savedir[2])
self.results_directory_copy_copy_copy_2 =
wx.Button(self.r1_1_copy_1, -1, "Change")
self.structure_file_copy_2 = wx.StaticText(self.r1_1_copy_1, -1,
"Structure file (.pdb)", style=wx.ALIGN_RIGHT)
- self.structure_r11_copy_1 = wx.TextCtrl(self.r1_1_copy_1, -1,
self.structure_file_pdb_msg)
+ self.structure_r11_copy_1 = StructureTextCtrl(self.r1_1_copy_1, -1,
self.structure_file_pdb_msg)
self.structure_r11_copy_1.SetEditable(False)
self.results_directory_copy_copy_copy_copy_1 =
wx.Button(self.r1_1_copy_1, -1, "Change")
self.label_2_copy_copy_copy_2_copy_copy_copy_2 =
wx.StaticText(self.r1_1_copy_1, -1, "Unresolved residues:",
style=wx.ALIGN_RIGHT)
@@ -555,7 +556,7 @@
self.resultsdir_r21_copy_1 = wx.TextCtrl(self.r2_1_copy_1, -1,
r2_savedir[2])
self.results_directory_r21_copy_1 = wx.Button(self.r2_1_copy_1, -1,
"Change")
self.structure_file_copy_copy_1 = wx.StaticText(self.r2_1_copy_1,
-1, "Structure file (.pdb)", style=wx.ALIGN_RIGHT)
- self.structure_r21_copy_1 = wx.TextCtrl(self.r2_1_copy_1, -1,
self.structure_file_pdb_msg)
+ self.structure_r21_copy_1 = StructureTextCtrl(self.r2_1_copy_1, -1,
self.structure_file_pdb_msg)
self.structure_r21_copy_1.SetEditable(False)
self.chan_struc_r21_copy_1 = wx.Button(self.r2_1_copy_1, -1,
"Change")
self.label_2_copy_copy_copy_2_copy_copy_copy_copy_1 =
wx.StaticText(self.r2_1_copy_1, -1, "Unresolved residues:",
style=wx.ALIGN_RIGHT)
@@ -623,7 +624,7 @@
self.Bind(wx.EVT_MENU, self.aboutrelax, id=6)
self.Bind(wx.EVT_MENU, self.settings, id=7)
self.Bind(wx.EVT_MENU, self.references, id=9)
- self.Bind(wx.EVT_MENU, self.structure_pdb, id=11)
+ #self.Bind(wx.EVT_MENU, self.structure_pdb, id=11)
self.Bind(wx.EVT_MENU, self.import_seq, id=12)
self.Bind(wx.EVT_MENU, self.param_file_setting, id=13)
self.Bind(wx.EVT_MENU, self.reset_setting, id=14)
@@ -631,46 +632,46 @@
#button actions
self.Bind(wx.EVT_BUTTON, self.sat_noe1, self.sat_noe_copy_1)
self.Bind(wx.EVT_BUTTON, self.ref_noe, self.noe_ref_err_copy_1)
- self.Bind(wx.EVT_BUTTON, self.structure_pdb, self.ref_noe_copy_1)
+ self.Bind(wx.EVT_BUTTON, self.structure_noe1.structure_pdb,
self.ref_noe_copy_1)
self.Bind(wx.EVT_BUTTON, self.resdir_noe1, self.chandir_noe1)
self.Bind(wx.EVT_BUTTON, self.exec_noe1, self.relax_start_noe1)
self.Bind(wx.EVT_BUTTON, self.resdir_r1_1,
self.results_directory_copy_copy)
- self.Bind(wx.EVT_BUTTON, self.structure_pdb,
self.results_directory_copy_copy_copy)
+ self.Bind(wx.EVT_BUTTON, self.structure_r11.structure_pdb,
self.results_directory_copy_copy_copy)
self.Bind(wx.EVT_BUTTON, self.add_r1_1, self.addr11)
self.Bind(wx.EVT_BUTTON, self.refresh_r1_1, self.refreshr11)
self.Bind(wx.EVT_BUTTON, self.exec_r2_1, self.relax_start_r1_1)
self.Bind(wx.EVT_BUTTON, self.resdir_r2_1,
self.results_directory_r21)
- self.Bind(wx.EVT_BUTTON, self.structure_pdb, self.chan_struc_r21)
+ self.Bind(wx.EVT_BUTTON, self.structure_r21.structure_pdb,
self.chan_struc_r21)
self.Bind(wx.EVT_BUTTON, self.add_r2_1, self.addr21)
self.Bind(wx.EVT_BUTTON, self.refresh_r2_1, self.refreshr21)
self.Bind(wx.EVT_BUTTON, self.exec_r1_1, self.relax_start_r1_1_copy)
self.Bind(wx.EVT_BUTTON, self.sat_noe2, self.sat_noe_copy_1_copy)
self.Bind(wx.EVT_BUTTON, self.ref_noe2, self.noe_ref_err_copy_1_copy)
- self.Bind(wx.EVT_BUTTON, self.structure_pdb,
self.ref_noe_copy_1_copy)
+ self.Bind(wx.EVT_BUTTON, self.structure_noe1_copy.structure_pdb,
self.ref_noe_copy_1_copy)
self.Bind(wx.EVT_BUTTON, self.resdir_noe2, self.chandir_noe1_copy)
self.Bind(wx.EVT_BUTTON, self.exec_noe2, self.relax_start_noe1_copy)
self.Bind(wx.EVT_BUTTON, self.resdir_r1_2,
self.results_directory_copy_copy_copy_1)
- self.Bind(wx.EVT_BUTTON, self.structure_pdb,
self.results_directory_copy_copy_copy_copy)
+ self.Bind(wx.EVT_BUTTON, self.structure_r11_copy.structure_pdb,
self.results_directory_copy_copy_copy_copy)
self.Bind(wx.EVT_BUTTON, self.add_r1_2, self.addr11_copy)
self.Bind(wx.EVT_BUTTON, self.refresh_r1_2, self.refreshr11_copy)
self.Bind(wx.EVT_BUTTON, self.exec_r1_2,
self.relax_start_r1_1_copy_1)
self.Bind(wx.EVT_BUTTON, self.resdir_r2_2,
self.results_directory_r21_copy)
- self.Bind(wx.EVT_BUTTON, self.structure_pdb,
self.chan_struc_r21_copy)
+ self.Bind(wx.EVT_BUTTON, self.structure_r21_copy.structure_pdb,
self.chan_struc_r21_copy)
self.Bind(wx.EVT_BUTTON, self.add_r2_2, self.addr21_copy)
self.Bind(wx.EVT_BUTTON, self.refresh_r2_2, self.refreshr21_copy)
self.Bind(wx.EVT_BUTTON, self.exec_r2_2,
self.relax_start_r1_1_copy_copy)
self.Bind(wx.EVT_BUTTON, self.sat_noe3, self.sat_noe_copy_1_copy_1)
self.Bind(wx.EVT_BUTTON, self.ref_noe3,
self.noe_ref_err_copy_1_copy_1)
- self.Bind(wx.EVT_BUTTON, self.structure_pdb,
self.ref_noe_copy_1_copy_1)
+ self.Bind(wx.EVT_BUTTON, self.structure_noe1_copy_1.structure_pdb,
self.ref_noe_copy_1_copy_1)
self.Bind(wx.EVT_BUTTON, self.resdir_noe3, self.chandir_noe1_copy_1)
self.Bind(wx.EVT_BUTTON, self.exec_noe3,
self.relax_start_noe1_copy_1)
self.Bind(wx.EVT_BUTTON, self.resdir_r1_3,
self.results_directory_copy_copy_copy_2)
- self.Bind(wx.EVT_BUTTON, self.structure_pdb,
self.results_directory_copy_copy_copy_copy_1)
+ self.Bind(wx.EVT_BUTTON, self.structure_r11_copy_1.structure_pdb,
self.results_directory_copy_copy_copy_copy_1)
self.Bind(wx.EVT_BUTTON, self.add_r1_3, self.addr11_copy_1)
self.Bind(wx.EVT_BUTTON, self.refresh_r1_3, self.refreshr11_copy_1)
self.Bind(wx.EVT_BUTTON, self.exec_r1_3,
self.relax_start_r1_1_copy_2)
self.Bind(wx.EVT_BUTTON, self.resdir_r2_3,
self.results_directory_r21_copy_1)
- self.Bind(wx.EVT_BUTTON, self.structure_pdb,
self.chan_struc_r21_copy_1)
+ self.Bind(wx.EVT_BUTTON, self.structure_r21_copy_1.structure_pdb,
self.chan_struc_r21_copy_1)
self.Bind(wx.EVT_BUTTON, self.add_r2_3, self.addr21_copy_1)
self.Bind(wx.EVT_BUTTON, self.refresh_r2_3, self.refreshr21_copy_1)
self.Bind(wx.EVT_BUTTON, self.exec_r2_3,
self.relax_start_r1_1_copy_copy_1)
r10369 - in /branches/bieri_gui/gui_bieri: analyses/auto_model_free.py relax_gui.py