Author: bugman
Date: Sat Apr 20 19:03:35 2013
New Revision: 19513
URL: http://svn.gna.org/viewcvs/relax?rev=19513&view=rev
Log:
Spun out the Spin_ctrl analysis GUI element into its own module in
gui.analyses.elements.
Added:
trunk/gui/analyses/elements/spin_element.py
- copied, changed from r19512,
trunk/gui/analyses/elements/text_element.py
Modified:
trunk/gui/analyses/elements/__init__.py
trunk/gui/analyses/elements/text_element.py
Modified: trunk/gui/analyses/elements/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/elements/__init__.py?rev=19513&r1=19512&r2=19513&view=diff
==============================================================================
--- trunk/gui/analyses/elements/__init__.py (original)
+++ trunk/gui/analyses/elements/__init__.py Sat Apr 20 19:03:35 2013
@@ -25,5 +25,6 @@
# The package contents.
__all__ = [
'model_list',
+ 'spin_element',
'text_element'
]
Copied: trunk/gui/analyses/elements/spin_element.py (from r19512,
trunk/gui/analyses/elements/text_element.py)
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/elements/spin_element.py?p2=trunk/gui/analyses/elements/spin_element.py&p1=trunk/gui/analyses/elements/text_element.py&r1=19512&r2=19513&rev=19513&view=diff
==============================================================================
--- trunk/gui/analyses/elements/text_element.py (original)
+++ trunk/gui/analyses/elements/spin_element.py Sat Apr 20 19:03:35 2013
@@ -1,7 +1,7 @@
###############################################################################
#
#
# Copyright (C) 2009 Michael Bieri
#
-# Copyright (C) 2010-2012 Edward d'Auvergne
#
+# Copyright (C) 2010-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -27,10 +27,8 @@
import wx
import wx.lib.buttons
-# relax GUI module imports.
+# relax module imports.
from gui.fonts import font
-from gui.paths import icon_16x16
-from gui.string_conv import str_to_gui
class Spin_ctrl:
@@ -134,138 +132,3 @@
# Set the value of the spin control.
return self.control.SetValue(value)
-
-
-class Text_ctrl:
- """The analysis specific text control.
-
- This consists of three elements: wx.StaticText, wx.TextCtrl, and
wx.Button.
- """
-
- def __init__(self, box, parent, text="", default="", tooltip=None,
button_text=" Change", control=wx.TextCtrl, icon=icon_16x16.open, fn=None,
editable=True, button=False, width_text=200, width_button=80, spacer=0):
- """Create a text selection element for the frame.
-
- This consists of a horizontal layout with a static text element, a
text control, and an optional button.
-
- @param box: The box element to pack the structure file
selection GUI element into.
- @type box: wx.BoxSizer instance
- @param parent: The parent GUI element.
- @type parent: wx object
- @keyword text: The static text.
- @type text: str
- @keyword default: The default text of the control.
- @type default: str
- @keyword tooltip: The tooltip which appears on hovering over
the text or input field.
- @type tooltip: str
- @keyword button_text: The text to display on the button.
- @type button_text: str
- @keyword control: The control class to use.
- @type control: wx.TextCtrl derived class
- @keyword icon: The path of the icon to use for the button.
- @type icon: str
- @keyword fn: The function or method to execute when
clicking on the button. If this is a string, then an equivalent function
will be searched for in the control object.
- @type fn: func or str
- @keyword editable: A flag specifying if the control is editable
or not.
- @type editable: bool
- @keyword button: A flag which if True will cause a button to
appear.
- @type button: bool
- @keyword width_text: The width of the text element.
- @type width_text: int
- @keyword width_button: The width of the button.
- @type width_button: int
- @keyword spacer: The horizontal spacing between the elements.
- @type spacer: int
- """
-
- # Horizontal packing for this element.
- sizer = wx.BoxSizer(wx.HORIZONTAL)
-
- # The label.
- self.label = wx.StaticText(parent, -1, text)
- self.label.SetMinSize((width_text, -1))
- self.label.SetFont(font.normal)
- sizer.Add(self.label, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE,
0)
-
- # The size for all elements, based on this text.
- size = self.label.GetSize()
- size_horizontal = size[1] + 8
-
- # Spacer.
- sizer.AddSpacer((spacer, -1))
-
- # The text input field.
- self.field = control(parent, -1, str_to_gui(default))
- self.field.SetMinSize((-1, size_horizontal))
- self.field.SetFont(font.normal)
- self.field.SetEditable(editable)
- if not editable:
- colour = parent.GetBackgroundColour()
- self.field.SetOwnBackgroundColour(colour)
- sizer.Add(self.field, 1, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE,
0)
-
- # Spacer.
- sizer.AddSpacer((spacer, -1))
-
- # The button.
- if button:
- # Function is in the control class.
- if isinstance(fn, str):
- # The function.
- fn = getattr(field, fn)
-
- # Add the button.
- self.button = wx.lib.buttons.ThemedGenBitmapTextButton(parent,
-1, None, str_to_gui(button_text))
- self.button.SetBitmapLabel(wx.Bitmap(icon, wx.BITMAP_TYPE_ANY))
- self.button.SetMinSize((width_button, size_horizontal))
- self.button.SetFont(font.normal)
- parent.Bind(wx.EVT_BUTTON, fn, self.button)
- sizer.Add(self.button, 0,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
-
- # No button, so add a spacer.
- else:
- sizer.AddSpacer((width_button, -1))
-
- # Add the element to the box.
- box.Add(sizer, 0, wx.ALL|wx.EXPAND, 0)
-
- # Tooltip.
- if tooltip:
- self.label.SetToolTipString(tooltip)
- self.field.SetToolTipString(tooltip)
- if button:
- self.button.SetToolTipString(tooltip)
-
-
- def Enable(self, enable=True):
- """Enable or disable the element for user input.
-
- @keyword enable: The flag specifying if the element should be
enabled or disabled.
- @type enable: bool
- """
-
- # Call the control and button methods.
- self.field.Enable(enable)
- if hasattr(self, 'button'):
- self.button.Enable(enable)
-
-
- def GetValue(self):
- """Set the value of the control.
-
- @return: The value of the text control.
- @rtype: int
- """
-
- # Get the value from the text control.
- return self.field.GetValue()
-
-
- def SetValue(self, value):
- """Set the value of the control.
-
- @param value: The value to set the text control to.
- @type value: text
- """
-
- # Set the value of the text control.
- return self.field.SetValue(value)
Modified: trunk/gui/analyses/elements/text_element.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/elements/text_element.py?rev=19513&r1=19512&r2=19513&view=diff
==============================================================================
--- trunk/gui/analyses/elements/text_element.py (original)
+++ trunk/gui/analyses/elements/text_element.py Sat Apr 20 19:03:35 2013
@@ -1,7 +1,7 @@
###############################################################################
#
#
# Copyright (C) 2009 Michael Bieri
#
-# Copyright (C) 2010-2012 Edward d'Auvergne
#
+# Copyright (C) 2010-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -27,113 +27,10 @@
import wx
import wx.lib.buttons
-# relax GUI module imports.
+# relax module imports.
from gui.fonts import font
from gui.paths import icon_16x16
from gui.string_conv import str_to_gui
-
-
-class Spin_ctrl:
- """The analysis specific spin control."""
-
- def __init__(self, box, parent, text="", default=0, min=0, max=1000,
tooltip=None, control=wx.SpinCtrl, width_text=200, width_button=80, spacer=0):
- """Create a text selection element using a spinner for the frame.
-
- This consists of a horizontal layout with a static text element and
a spin control
-
- @param box: The box element to pack the structure file
selection GUI element into.
- @type box: wx.BoxSizer instance
- @param parent: The parent GUI element.
- @type parent: wx object
- @keyword text: The static text.
- @type text: str
- @keyword default: The default value of the control.
- @type default: int
- @keyword min: The minimum value allowed.
- @type min: int
- @keyword max: The maximum value allowed.
- @type max: int
- @keyword tooltip: The tooltip which appears on hovering over
the text or spin control.
- @type tooltip: str
- @keyword control: The control class to use.
- @type control: wx.SpinCtrl derived class
- @keyword width_text: The width of the text element.
- @type width_text: int
- @keyword width_button: The width of the button.
- @type width_button: int
- @keyword spacer: The horizontal spacing between the elements.
- @type spacer: int
- """
-
- # Horizontal packing for this element.
- sizer = wx.BoxSizer(wx.HORIZONTAL)
-
- # The label.
- self.label = wx.StaticText(parent, -1, text)
- self.label.SetMinSize((width_text, -1))
- self.label.SetFont(font.normal)
- sizer.Add(self.label, 0, wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE,
0)
-
- # The size for all elements, based on this text.
- size = self.label.GetSize()
- size_horizontal = size[1] + 8
-
- # Spacer.
- sizer.AddSpacer((spacer, -1))
-
- # The spin control.
- self.control = control(parent, -1, text, min=min, max=max)
- self.control.SetMinSize((-1, size_horizontal))
- self.control.SetFont(font.normal)
- sizer.Add(self.control, 1,
wx.ALIGN_CENTER_VERTICAL|wx.ADJUST_MINSIZE, 0)
- self.control.SetValue(default)
-
- # Spacer.
- sizer.AddSpacer((spacer, -1))
-
- # No button, so add a spacer.
- sizer.AddSpacer((width_button, -1))
-
- # Tooltip.
- if tooltip:
- self.label.SetToolTipString(tooltip)
- self.control.SetToolTipString(tooltip)
-
- # Add the element to the box.
- box.Add(sizer, 0, wx.ALL|wx.EXPAND, 0)
-
-
- def Enable(self, enable=True):
- """Enable or disable the window for user input.
-
- @keyword enable: The flag specifying if the control should be
enabled or disabled.
- @type enable: bool
- """
-
- # Call the control's method.
- self.control.Enable(enable)
-
-
- def GetValue(self):
- """Set the value of the control.
-
- @return: The value of the spin control.
- @rtype: int
- """
-
- # Get the value from the spin control.
- return self.control.GetValue()
-
-
- def SetValue(self, value):
- """Set the value of the control.
-
- @param value: The value to set the spin control to.
- @type value: int
- """
-
- # Set the value of the spin control.
- return self.control.SetValue(value)
class Text_ctrl:
r19513 - in /trunk/gui/analyses/elements: __init__.py spin_element.py text_element.py