Author: bugman
Date: Thu Jan 28 10:46:35 2010
New Revision: 10474
URL: http://svn.gna.org/viewcvs/relax?rev=10474&view=rev
Log:
Shifted the relax_control module down back into the gui_bieri package.
This is a GUI element that is independent of the specific analyses. The
analysis specific code can
be shifted into the modules of gui_bieri.analyses, and the threads also
started from there. This
window can be initialised in the main GUI class and then shown by the
analyses' execute methods.
Added:
branches/bieri_gui/gui_bieri/relax_control.py
- copied unchanged from r10473,
branches/bieri_gui/gui_bieri/analyses/relax_control.py
Removed:
branches/bieri_gui/gui_bieri/analyses/relax_control.py
Removed: branches/bieri_gui/gui_bieri/analyses/relax_control.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/relax_control.py?rev=10473&view=auto
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/relax_control.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/relax_control.py (removed)
@@ -1,186 +1,0 @@
-###############################################################################
-#
#
-# Copyright (C) 2009 Michael Bieri
#
-# Copyright (C) 2010 Edward d'Auvergne
#
-#
#
-# This file is part of the program relax.
#
-#
#
-# relax is free software; you can redistribute it and/or modify
#
-# it under the terms of the GNU General Public License as published by
#
-# the Free Software Foundation; either version 2 of the License, or
#
-# (at your option) any later version.
#
-#
#
-# relax is distributed in the hope that it will be useful,
#
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
-# GNU General Public License for more details.
#
-#
#
-# You should have received a copy of the GNU General Public License
#
-# along with relax; if not, write to the Free Software
#
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-#
#
-###############################################################################
-
-# Module docstring.
-"""Log window of relax GUI controlling all calculations."""
-
-# Python module imports.
-from os import sep
-import sys
-import thread
-import wx
-
-# relaxGUI module imports.
-from gui_bieri.execution.calc_modelfree import start_model_free
-from gui_bieri.execution.calc_noe import make_noe
-from gui_bieri.execution.calc_rx import make_rx
-from gui_bieri.paths import IMAGE_PATH
-
-
-def start_modelfree(self, model, automatic):
- """Model-free calculation."""
-
- # define calculation
- global WHICH_CALC
- WHICH_CALC = 'Model-free'
-
- # Parameters for calculation
- global PARAMETERS
- main = self
- PARAMETERS = [main, model, automatic, global_setting, file_setting,
sequencefile]
-
- # launch log dialog
- logwindow = Log_window(None, -1, "")
- logwindow.ShowModal()
- sys.stdout = sys.__stdout__
- sys.stderr = sys.__stderr__
- return ''
-
-
-def start_noe(target_dir, noe_ref, noe_sat, rmsd_ref, rmsd_sat, nmr_freq,
struct_pdb, unres, execute, self, freqno, global_setting, file_setting,
sequencefile):
- """NOE calculation."""
-
- # define calculation
- global WHICH_CALC
- WHICH_CALC = 'Noe'
-
- # Parameters for calculation
- global PARAMETERS
- main = self
- PARAMETERS = [target_dir, noe_ref, noe_sat, rmsd_ref, rmsd_sat,
nmr_freq, struct_pdb, unres, execute, main, freqno, global_setting,
file_setting, sequencefile]
-
- # launch log dialog
- logwindow = Log_window(None, -1, "")
- logwindow.ShowModal()
- sys.stdout = sys.__stdout__
- sys.stderr = sys.__stderr__
- return ''
-
-
-def start_rx(target_dir, rx_list, relax_times, structure_pdb, nmr_freq,
r1_r2, freq_no, unres, self, freqno, global_setting, file_setting,
sequencefile):
- """Rx calculations."""
-
- # define calculation
- global WHICH_CALC
- WHICH_CALC = 'Rx'
-
- # Parameters for calculation
- global PARAMETERS
- main = self
- PARAMETERS = [target_dir, rx_list, relax_times, structure_pdb, nmr_freq,
r1_r2, freq_no, unres, main, freqno, global_setting, file_setting,
sequencefile]
-
- # launch log dialog
- logwindow = Log_window(None, -1, "")
- logwindow.ShowModal()
- sys.stdout = sys.__stdout__
- sys.stderr = sys.__stderr__
- return ''
-
-
-
-class Log_window(wx.Dialog):
- def __init__(self, *args, **kwds):
-
- # Create GUI elements
- kwds["style"] = wx.MINIMIZE_BOX | wx.SYSTEM_MENU | wx.CAPTION
- wx.Dialog.__init__(self, *args, **kwds)
-
- # header
- self.relax_logo = wx.StaticBitmap(self, -1,
wx.Bitmap(IMAGE_PATH+'relax.gif', wx.BITMAP_TYPE_ANY))
- self.header_log = wx.StaticText(self, -1, "", style=wx.ALIGN_CENTRE)
-
- # Log panel
- self.log_panel = wx.TextCtrl(self, -1, "",
style=wx.TE_MULTILINE|wx.TE_READONLY)
-
- # progress bar
- self.progress_bar = wx.Gauge(self, -1, 100)
-
- # buttons
- self.cancel_button = wx.Button(self, -1, "Cancel")
- self.close_button = wx.Button(self, -1, "Close")
-
- # Create Objects (see below)
- self.__set_properties()
- self.__do_layout()
-
- # Button actions
- self.Bind(wx.EVT_BUTTON, self.cancel_calculation, self.cancel_button)
- self.Bind(wx.EVT_BUTTON, self.close_log, self.close_button)
-
- # Start Calculation in Thread
- if WHICH_CALC == 'Rx':
- thread.start_new_thread(make_rx, (PARAMETERS[0], PARAMETERS[1],
PARAMETERS[2], PARAMETERS[3], PARAMETERS[4], PARAMETERS[5], PARAMETERS[6],
PARAMETERS[7], PARAMETERS[8], PARAMETERS[9], PARAMETERS[10], PARAMETERS[11],
PARAMETERS[12]))
-
- if WHICH_CALC == 'Noe':
- thread.start_new_thread(make_noe, (PARAMETERS[0], PARAMETERS[1],
PARAMETERS[2], PARAMETERS[3], PARAMETERS[4], PARAMETERS[5], PARAMETERS[6],
PARAMETERS[7], PARAMETERS[8], PARAMETERS[9], PARAMETERS[10], PARAMETERS[11],
PARAMETERS[12], PARAMETERS[13]))
-
- if WHICH_CALC == 'Model-free':
- thread.start_new_thread(start_model_free, (PARAMETERS[0],
PARAMETERS[1], PARAMETERS[2], PARAMETERS[3], PARAMETERS[4], PARAMETERS[5]))
-
-
- def __do_layout(self):
-
- # create the lay out
- main_sizer = wx.FlexGridSizer(5, 1, 0, 0)
- button_sizer = wx.BoxSizer(wx.HORIZONTAL)
- main_sizer.Add(self.relax_logo, 0,
wx.TOP|wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 5)
- main_sizer.Add(self.header_log, 0,
wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0)
- main_sizer.Add(self.log_panel, 0, wx.ALL|wx.ADJUST_MINSIZE, 5)
- main_sizer.Add(self.progress_bar, 0, wx.ALL|wx.ADJUST_MINSIZE, 5)
- button_sizer.Add(self.cancel_button, 0, wx.ADJUST_MINSIZE, 0)
- button_sizer.Add(self.close_button, 0, wx.ADJUST_MINSIZE, 0)
- main_sizer.Add(button_sizer, 5, wx.ALIGN_CENTER_HORIZONTAL, 0)
- self.SetSizer(main_sizer)
- self.Layout()
- self.SetSize((600, 600))
-
-
- def __set_properties(self):
-
- # properties of GUI elements (used at start up)
- self.SetTitle("relaxGUI - Log Window")
- _icon = wx.EmptyIcon()
- _icon.CopyFromBitmap(wx.Bitmap(IMAGE_PATH+'relax.gif',
wx.BITMAP_TYPE_ANY))
- self.SetIcon(_icon)
- self.SetSize((600, 600))
- self.header_log.SetMinSize((600, 18))
- self.header_log.SetFont(wx.Font(11, wx.DEFAULT, wx.NORMAL, wx.BOLD,
0, ""))
- self.log_panel.SetMinSize((590, 410))
- self.progress_bar.SetMinSize((590, 20))
- self.cancel_button.SetToolTipString("Abort relax calculation")
- self.close_button.SetToolTipString("Close log window")
- self.close_button.Enable(False)
-
-
- def cancel_calculation(self, event): # abort calculation
- self.close_button.Enable(True)
- event.Skip()
-
-
- def close_log(self, event): # Close window
- self.Destroy()
- sys.stdout = sys.stdout
- sys.stderr = sys.stderr
- #sys.exit(2)
- return ''
- event.Skip()
r10474 - in /branches/bieri_gui/gui_bieri: analyses/relax_control.py relax_control.py