gnue/forms/src GFParser.py GFObjects/GFParamete...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/09/10 14:35:58

Modified files:
        forms/src      : GFParser.py 
        forms/src/GFObjects: GFParameter.py __init__.py 

Log message:
        more work on form parameters (added <parameter> tag)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFParser.py.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFParameter.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/__init__.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/forms/src/GFObjects/GFParameter.py
diff -c gnue/forms/src/GFObjects/GFParameter.py:1.2 
gnue/forms/src/GFObjects/GFParameter.py:1.3
*** gnue/forms/src/GFObjects/GFParameter.py:1.2 Tue Sep 10 11:30:50 2002
--- gnue/forms/src/GFObjects/GFParameter.py     Tue Sep 10 14:35:58 2002
***************
*** 30,63 ****
  
  from GFObj import GFObj
  from gnue.common import GConditions
  
  #
  #
  #
! class GFParameter(GFObj, GConditions.GCParam):
  
    def __init__(self, parent=None):
      GConditions.GCParam.__init__(self, parent)
      self._inits.append(self.initialize)
      self._type = self._typestub
!     
    def initialize(self):
      self._form = self.findParentOfType('GFForm')
  
    def getValue(self):
!     val = self._form.getParameter(self.name)
!     if val is None:
!       return ""
!     elif self.type == 'number':
!       return float(val)
!     else:
!       return "%s" % val
! 
!   def getFormattedValue(self):
!     # TODO: Format masks
!     val = self._form.getParameter(self.name)
!     if val is None:
!       return ""
!     else:
!       return "%s" % val
  
--- 30,81 ----
  
  from GFObj import GFObj
  from gnue.common import GConditions
+ import string
  
  #
  #
  #
! class GFParameter(GFObj):
!   def __init__(self, parent=None):
!     GFObj.__init__(self, parent, 'GFParameter')
! 
! 
!   def _buildObject(self):
!     self._name = string.lower(self.name)
!     return GFObj._buildObject(self)
! 
! #
! #
! #
! class GFCParam(GConditions.GCParam):
  
    def __init__(self, parent=None):
      GConditions.GCParam.__init__(self, parent)
      self._inits.append(self.initialize)
      self._type = self._typestub
! 
! 
    def initialize(self):
+     self._name = string.lower(self.name)
      self._form = self.findParentOfType('GFForm')
+     for param in self._form._children:
+       if isinstance(param, GFParameter) and param._name == self._name:
+         self._parameter = param
+         break
+ 
  
    def getValue(self):
!     try:
!       return self._cachedValue
!     except:
!       val = self._form.getParameter(self._name)
! 
!       if val is None:
!         val = ""
!       elif self._parameter.type == 'number':
!         val = float(self._cachedValue)
!       else:
!         val = "%s" % self._cachedValue
! 
!       self._cachedValue = val
  
Index: gnue/forms/src/GFObjects/__init__.py
diff -c gnue/forms/src/GFObjects/__init__.py:1.3 
gnue/forms/src/GFObjects/__init__.py:1.4
*** gnue/forms/src/GFObjects/__init__.py:1.3    Tue Sep 10 11:30:50 2002
--- gnue/forms/src/GFObjects/__init__.py        Tue Sep 10 14:35:58 2002
***************
*** 23,25 ****
--- 23,27 ----
   
  #from GFObj import GFObj 
  
+ 
+ from GFParameter import GFCParam
\ No newline at end of file
Index: gnue/forms/src/GFParser.py
diff -c gnue/forms/src/GFParser.py:1.70 gnue/forms/src/GFParser.py:1.71
*** gnue/forms/src/GFParser.py:1.70     Tue Sep 10 11:30:50 2002
--- gnue/forms/src/GFParser.py  Tue Sep 10 14:35:58 2002
***************
*** 223,229 ****
                 'Typecast': GTypecast.whole, 
                 'Default': 1 }, 
              'width': {
!                'Typecast': GTypecast.whole }, 
              'max_length': {
                 'Typecast': GTypecast.whole }, 
              'visibleCount':{
--- 223,229 ----
                 'Typecast': GTypecast.whole, 
                 'Default': 1 }, 
              'width': {
!                'Typecast': GTypecast.whole },
              'max_length': {
                 'Typecast': GTypecast.whole }, 
              'visibleCount':{
***************
*** 268,274 ****
                 'Typecast': GTypecast.name, 
                 'ValueSet': { 
                    'mixed': {}, 
!                   'upper': {}, 
                    'lower': {} }, 
                 'Default': 'mixed'},
              'typecast': {
--- 268,274 ----
                 'Typecast': GTypecast.name, 
                 'ValueSet': { 
                    'mixed': {}, 
!                   'upper': {},
                    'lower': {} }, 
                 'Default': 'mixed'},
              'typecast': {
***************
*** 548,553 ****
--- 548,577 ----
           'MixedContent': 1,
           'SingleInstance': 1,
           'ParentTags': ('options',) },
+       'parameter':    {
+          'BaseClass': GFObjects.GFParameter,
+          'Attributes': {
+             'name':          {
+                'Required': 1,
+                'Unique': 1,
+                'Typecast': GTypecast.name },
+             'required':    {
+                'Typecast': GTypecast.boolean,
+                'Default': 0 },
+ ##            'limited':     {
+ ##               'Typecast': GTypecast.boolean,
+ ##               'Default': 0 },
+             'default':     {
+                'Typecast': GTypecast.text },
+             'description': {
+ ##               'Required': 1,
+                'Typecast': GTypecast.text },
+ ##            'source':      {
+ ##               'Typecast': GTypecast.name },
+             'type':        {
+                'Typecast': GTypecast.name,
+                'Default': "char" } },
+          'ParentTags':  ('form',) },
      }
  
  
***************
*** 560,566 ****
                     'BaseClass': GFObjects.GFDataSource,
                     'ParentTags': ('form',) },
                   'cparam': {
!                    'BaseClass': GFObjects.GFParameter }
                   }))
  
      #
--- 584,590 ----
                     'BaseClass': GFObjects.GFDataSource,
                     'ParentTags': ('form',) },
                   'cparam': {
!                    'BaseClass': GFObjects.GFCParam }
                   }))
  
      #