r16160 - in /branches/uf_redesign: graphics/wizards/monte_carlo.png user_functions/monte_carlo.py user_functions/objects.py -- May 09, 2012 - 17:02

Author: bugman
Date: Wed May  9 17:02:00 2012
New Revision: 16160

URL: http://svn.gna.org/viewcvs/relax?rev=16160&view=rev
Log:
Created a wizard graphic for the monte_carlo user functions from the oxygen 
'actions/roll' icon.


Added:
    branches/uf_redesign/graphics/wizards/monte_carlo.png   (with props)
Modified:
    branches/uf_redesign/user_functions/monte_carlo.py
    branches/uf_redesign/user_functions/objects.py

Added: branches/uf_redesign/graphics/wizards/monte_carlo.png
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/graphics/wizards/monte_carlo.png?rev=16160&view=auto
==============================================================================
Binary file - no diff available.

Propchange: branches/uf_redesign/graphics/wizards/monte_carlo.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: branches/uf_redesign/user_functions/monte_carlo.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/monte_carlo.py?rev=16160&r1=16159&r2=16160&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/monte_carlo.py (original)
+++ branches/uf_redesign/user_functions/monte_carlo.py Wed May  9 17:02:00 
2012
@@ -109,6 +109,7 @@
 uf.wizard_height_desc = 500
 uf.wizard_size = (1000, 800)
 uf.wizard_apply_button = False
+uf.wizard_image = WIZARD_IMAGE_PATH + 'monte_carlo.png'
 
 
 # The monte_carlo.error_analysis user function.
@@ -133,6 +134,7 @@
 uf.wizard_height_desc = 650
 uf.wizard_size = (1000, 800)
 uf.wizard_apply_button = False
+uf.wizard_image = WIZARD_IMAGE_PATH + 'monte_carlo.png'
 
 
 # The monte_carlo.initial_values user function.
@@ -150,6 +152,7 @@
 uf.wizard_height_desc = 650
 uf.wizard_size = (1000, 800)
 uf.wizard_apply_button = False
+uf.wizard_image = WIZARD_IMAGE_PATH + 'monte_carlo.png'
 
 
 # The monte_carlo.off user function.
@@ -165,6 +168,7 @@
 uf.wizard_height_desc = 650
 uf.wizard_size = (1000, 800)
 uf.wizard_apply_button = False
+uf.wizard_image = WIZARD_IMAGE_PATH + 'monte_carlo.png'
 
 
 # The monte_carlo.on user function.
@@ -180,6 +184,7 @@
 uf.wizard_height_desc = 650
 uf.wizard_size = (1000, 800)
 uf.wizard_apply_button = False
+uf.wizard_image = WIZARD_IMAGE_PATH + 'monte_carlo.png'
 
 
 # The monte_carlo.setup user function.
@@ -204,3 +209,4 @@
 uf.wizard_height_desc = 600
 uf.wizard_size = (1000, 800)
 uf.wizard_apply_button = False
+uf.wizard_image = WIZARD_IMAGE_PATH + 'monte_carlo.png'

Modified: branches/uf_redesign/user_functions/objects.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/objects.py?rev=16160&r1=16159&r2=16160&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/objects.py (original)
+++ branches/uf_redesign/user_functions/objects.py Wed May  9 17:02:00 2012
@@ -181,7 +181,7 @@
         self.__dict__[name] = value
 
 
-    def add_keyarg(self, name=None, default=None, py_type=None, 
arg_type=None, size=None, dim=None, desc_short=None, desc=None, 
list_titles=None, wiz_element_type='default', wiz_combo_choices=[], 
wiz_combo_data=None, wiz_combo_iter=None, wiz_combo_list_size=None, 
wiz_read_only=None, can_be_none=False, can_be_empty=False, 
none_elements=False):
+    def add_keyarg(self, name=None, default=None, py_type=None, 
arg_type=None, size=None, dim=None, min=None, max=None, desc_short=None, 
desc=None, list_titles=None, wiz_element_type='default', 
wiz_combo_choices=[], wiz_combo_data=None, wiz_combo_iter=None, 
wiz_combo_list_size=None, wiz_read_only=None, can_be_none=False, 
can_be_empty=False, none_elements=False):
         """Wrapper method for adding keyword argument information to the 
container.
 
         @keyword name:                  The name of the argument.
@@ -199,6 +199,10 @@
         @type size:                     int or None
         @keyword dim:                   The dimension that a matrix or list 
of lists must conform to.
         @type dim:                      tuple of int or None
+        @keyword min:                   The minimum value allowed for 
integer types.  This is used in the wx.SpinCtrl for example.
+        @type min:                      int
+        @keyword max:                   The maximum value allowed for 
integer types.  This is used in the wx.SpinCtrl for example.
+        @type max:                      int
         @keyword desc_short:            The short human-readable description 
of the argument.  This is used in the RelaxError messages to refer to the 
argument, as well as in the GUI user function page elements.
         @type desc_short:               str
         @keyword desc:                  The long human-readable description 
of the argument.
@@ -246,6 +250,8 @@
         arg['arg_type'] = arg_type
         arg['size'] = size
         arg['dim'] = dim
+        arg['min'] = min
+        arg['max'] = max
         arg['desc_short'] = desc_short
         arg['desc'] = desc
         arg['list_titles'] = list_titles