Author: bugman
Date: Wed Jul 20 17:59:07 2011
New Revision: 13784
URL: http://svn.gna.org/viewcvs/relax?rev=13784&view=rev
Log:
Renamed self.gui.user_function.pipes to self.gui.user_function.pipe to match
the user function naming.
Added:
branches/gui_testing/gui/user_functions/pipe.py
- copied, changed from r13781,
branches/gui_testing/gui/user_functions/pipes.py
Removed:
branches/gui_testing/gui/user_functions/pipes.py
Modified:
branches/gui_testing/gui/menu.py
branches/gui_testing/gui/user_functions/__init__.py
Modified: branches/gui_testing/gui/menu.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/menu.py?rev=13784&r1=13783&r2=13784&view=diff
==============================================================================
--- branches/gui_testing/gui/menu.py (original)
+++ branches/gui_testing/gui/menu.py Wed Jul 20 17:59:07 2011
@@ -216,10 +216,10 @@
[wx.NewId(), "&spectrum_type", None,
self.gui.user_functions.noe.spectrum_type]
]],
[wx.NewId(), "&pipe", paths.icon_16x16.pipe, None, [
- [wx.NewId(), "©", paths.icon_16x16.copy,
self.gui.user_functions.pipes.copy],
- [wx.NewId(), "crea&te", paths.icon_16x16.add,
self.gui.user_functions.pipes.create],
- [wx.NewId(), "&delete", paths.icon_16x16.remove,
self.gui.user_functions.pipes.delete],
- [wx.NewId(), "&switch", paths.icon_16x16.pipe_switch,
self.gui.user_functions.pipes.switch]
+ [wx.NewId(), "©", paths.icon_16x16.copy,
self.gui.user_functions.pipe.copy],
+ [wx.NewId(), "crea&te", paths.icon_16x16.add,
self.gui.user_functions.pipe.create],
+ [wx.NewId(), "&delete", paths.icon_16x16.remove,
self.gui.user_functions.pipe.delete],
+ [wx.NewId(), "&switch", paths.icon_16x16.pipe_switch,
self.gui.user_functions.pipe.switch]
]],
[wx.NewId(), "&relax_data", paths.icon_16x16.relax_data, None, [
[wx.NewId(), "&delete", paths.icon_16x16.remove,
self.gui.user_functions.relax_data.delete],
Modified: branches/gui_testing/gui/user_functions/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/__init__.py?rev=13784&r1=13783&r2=13784&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/__init__.py (original)
+++ branches/gui_testing/gui/user_functions/__init__.py Wed Jul 20 17:59:07
2011
@@ -30,7 +30,7 @@
from deselect import Deselect
from molecule import Molecule
from noe import Noe
-from pipes import Pipes
+from pipe import Pipe
from residue import Residue
from relax_data import Relax_data
from relax_fit import Relax_fit
@@ -48,7 +48,7 @@
'deselect',
'molecule',
'noe',
- 'pipes',
+ 'pipe',
'residue',
'relax_data',
'relax_fit',
@@ -77,7 +77,7 @@
self.deselect = Deselect(self.gui)
self.molecule = Molecule(self.gui)
self.noe = Noe(self.gui)
- self.pipes = Pipes(self.gui)
+ self.pipe = Pipe(self.gui)
self.residue = Residue(self.gui)
self.relax_data = Relax_data(self.gui)
self.relax_fit = Relax_fit(self.gui)
@@ -97,7 +97,7 @@
self.deselect.destroy()
self.molecule.destroy()
self.noe.destroy()
- self.pipes.destroy()
+ self.pipe.destroy()
self.residue.destroy()
self.relax_data.destroy()
self.relax_fit.destroy()
Copied: branches/gui_testing/gui/user_functions/pipe.py (from r13781,
branches/gui_testing/gui/user_functions/pipes.py)
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/pipe.py?p2=branches/gui_testing/gui/user_functions/pipe.py&p1=branches/gui_testing/gui/user_functions/pipes.py&r1=13781&r2=13784&rev=13784&view=diff
==============================================================================
--- branches/gui_testing/gui/user_functions/pipes.py (original)
+++ branches/gui_testing/gui/user_functions/pipe.py Wed Jul 20 17:59:07 2011
@@ -21,7 +21,7 @@
###############################################################################
# Module docstring.
-"""The pipes user function GUI elements."""
+"""The pipe user function GUI elements."""
# Python module imports.
import wx
@@ -37,7 +37,7 @@
# The container class.
-class Pipes(UF_base):
+class Pipe(UF_base):
"""The container class for holding all GUI elements."""
def copy(self, event):
Removed: branches/gui_testing/gui/user_functions/pipes.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/user_functions/pipes.py?rev=13783&view=auto
==============================================================================
--- branches/gui_testing/gui/user_functions/pipes.py (original)
+++ branches/gui_testing/gui/user_functions/pipes.py (removed)
@@ -1,268 +1,0 @@
-###############################################################################
-#
#
-# Copyright (C) 2010-2011 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.
-"""The pipes user function GUI elements."""
-
-# Python module imports.
-import wx
-
-# relax module imports.
-from generic_fns.pipes import VALID_TYPES, cdp_name, pipe_names
-
-# GUI module imports.
-from base import UF_base, UF_page
-from gui.misc import gui_to_str
-from gui.paths import WIZARD_IMAGE_PATH
-from gui.wizard import Wiz_window
-
-
-# The container class.
-class Pipes(UF_base):
- """The container class for holding all GUI elements."""
-
- def copy(self, event):
- """The pipe.copy user function.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Execute the wizard.
- wizard = Wiz_window(size_x=600, size_y=400,
title=self.get_title('pipe', 'copy'))
- page = Copy_page(wizard, self.gui)
- wizard.add_page(page)
- wizard.run()
-
-
- def create(self, event):
- """The pipe.create user function.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Execute the wizard.
- wizard = Wiz_window(size_x=700, size_y=500,
title=self.get_title('pipe', 'create'))
- page = Create_page(wizard, self.gui)
- wizard.add_page(page)
- wizard.run()
-
-
- def delete(self, event):
- """The pipe.delete user function.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Execute the wizard.
- wizard = Wiz_window(size_x=600, size_y=400,
title=self.get_title('pipe', 'delete'))
- page = Delete_page(wizard, self.gui)
- wizard.add_page(page)
- wizard.run()
-
-
- def switch(self, event):
- """The pipe.switch user function.
-
- @param event: The wx event.
- @type event: wx event
- """
-
- # Execute the wizard.
- wizard = Wiz_window(size_x=650, size_y=450,
title=self.get_title('pipe', 'switch'))
- page = Switch_page(wizard, self.gui)
- wizard.add_page(page, apply_button=False)
- wizard.run()
-
-
-
-class Copy_page(UF_page):
- """The pipe.copy() user function page."""
-
- # Some class variables.
- image_path = WIZARD_IMAGE_PATH + 'pipe.png'
- uf_path = ['pipe', 'copy']
-
- def add_contents(self, sizer):
- """Add the pipe specific GUI elements.
-
- @param sizer: A sizer object.
- @type sizer: wx.Sizer instance
- """
-
- # The source pipe.
- self.pipe_from = self.combo_box(sizer, "Source pipe:", [],
tooltip=self.uf._doc_args_dict['pipe_from'])
-
- # The destination pipe.
- self.pipe_to = self.input_field(sizer, "Destination pipe name:",
tooltip=self.uf._doc_args_dict['pipe_to'])
-
-
- def on_display(self):
- """Clear the data is apply was hit."""
-
- # Clear the previous data.
- self.pipe_from.Clear()
-
- # Clear the pipe name.
- self.pipe_from.SetValue('')
-
- # The list of pipe names.
- for name in pipe_names():
- self.pipe_from.Append(name)
-
-
- def on_execute(self):
- """Execute the user function."""
-
- # Get the pipe names.
- pipe_from = gui_to_str(self.pipe_from.GetValue())
- pipe_to = gui_to_str(self.pipe_to.GetValue())
-
- # Copy the data pipe.
- self.gui.interpreter.pipe.copy(pipe_from, pipe_to)
-
-
-
-class Create_page(UF_page):
- """The pipe.create() user function page."""
-
- # Some class variables.
- image_path = WIZARD_IMAGE_PATH + 'pipe.png'
- uf_path = ['pipe', 'create']
-
- def add_contents(self, sizer):
- """Add the pipe specific GUI elements.
-
- @param sizer: A sizer object.
- @type sizer: wx.Sizer instance
- """
-
- # The pipe name input.
- self.pipe_name = self.input_field(sizer, "The data pipe name:",
tooltip=self.uf._doc_args_dict['pipe_name'])
-
- # The type selection.
- self.pipe_type = self.combo_box(sizer, "The type of data pipe:",
VALID_TYPES, tooltip=self.uf._doc_args_dict['pipe_type'])
-
-
- def on_execute(self):
- """Execute the user function."""
-
- # Get the name and type.
- pipe_name = str(self.pipe_name.GetValue())
- pipe_type = str(self.pipe_type.GetValue())
-
- # Set the name.
- self.gui.interpreter.pipe.create(pipe_name=pipe_name,
pipe_type=pipe_type)
-
-
-
-class Delete_page(UF_page):
- """The pipe.delete() user function page."""
-
- # Some class variables.
- image_path = WIZARD_IMAGE_PATH + 'pipe.png'
- uf_path = ['pipe', 'delete']
-
-
- def add_contents(self, sizer):
- """Add the pipe specific GUI elements.
-
- @param sizer: A sizer object.
- @type sizer: wx.Sizer instance
- """
-
- # The pipe selection.
- self.pipe_name = self.combo_box(sizer, "The pipe:", [],
tooltip=self.uf._doc_args_dict['pipe_name'])
-
-
- def on_display(self):
- """Clear and update the pipe name list."""
-
- # Clear the previous data.
- self.pipe_name.Clear()
-
- # Clear the pipe name.
- self.pipe_name.SetValue('')
-
- # The list of pipe names.
- for name in pipe_names():
- self.pipe_name.Append(name)
-
-
- def on_execute(self):
- """Execute the user function."""
-
- # Get the name.
- pipe_name = str(self.pipe_name.GetValue())
-
- # Delete the data pipe.
- self.gui.interpreter.pipe.delete(pipe_name)
-
-
-
-class Switch_page(UF_page):
- """The pipe.switch() user function page."""
-
- # Some class variables.
- image_path = WIZARD_IMAGE_PATH + 'pipe_switch.png'
- uf_path = ['pipe', 'switch']
-
- def add_contents(self, sizer):
- """Add the pipe specific GUI elements.
-
- @param sizer: A sizer object.
- @type sizer: wx.Sizer instance
- """
-
- # The current data pipe.
- self.cdp = self.text(sizer, "The current data pipe (cdp):")
-
- # The pipe selection.
- self.pipe_name = self.combo_box(sizer, "The pipe:", [],
tooltip=self.uf._doc_args_dict['pipe_name'])
-
-
- def on_display(self):
- """Clear and update the pipe name list and cdp."""
-
- # Clear the previous data.
- self.pipe_name.Clear()
- self.cdp.Clear()
-
- # Clear the pipe name.
- self.pipe_name.SetValue('')
- self.cdp.SetValue(str(cdp_name()))
-
- # The list of pipe names.
- for name in pipe_names():
- self.pipe_name.Append(name)
-
-
- def on_execute(self):
- """Execute the user function."""
-
- # Get the name.
- pipe_name = str(self.pipe_name.GetValue())
-
- # Switch the data pipe.
- self.gui.interpreter.pipe.switch(pipe_name)
r13784 - in /branches/gui_testing/gui: menu.py user_functions/__init__.py user_functions/pipe.py user_functions/pipes.py