Ignore:
Timestamp:
08/20/12 17:39:30 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl through revision 13099 into branch

Location:
issm/branches/trunk-jpl-damage
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/branches/trunk-jpl-damage

    • Property svn:ignore
      •  

        old new  
         1projects
        12autom4te.cache
        23aclocal.m4
    • Property svn:mergeinfo changed
      /issm/trunk-jplmerged: 12948-13099
  • issm/branches/trunk-jpl-damage/src/m/classes/radaroverlay.py

    r12168 r13101  
    22from fielddisplay import fielddisplay
    33
    4 class radaroverlay:
     4class radaroverlay(object):
     5        """
     6        RADAROVERLAY class definition
     7
     8           Usage:
     9              radaroverlay=radaroverlay();
     10        """
     11
    512        #properties
    613        def __init__(self):
     
    1421
    1522                #}}}
    16         def __repr__(obj):
     23        def __repr__(self):
    1724                # {{{ Display
    1825                string='   radaroverlay parameters:'
    19                 string="%s\n\n%s"%(string,fielddisplay(obj,'pwr','radar power image (matrix)'))
    20                 string="%s\n%s"%(string,fielddisplay(obj,'x','corresponding x coordinates'))
    21                 string="%s\n%s"%(string,fielddisplay(obj,'y','corresponding y coordinates'))
     26                string="%s\n\n%s"%(string,fielddisplay(self,'pwr','radar power image (matrix)'))
     27                string="%s\n%s"%(string,fielddisplay(self,'x','corresponding x coordinates'))
     28                string="%s\n%s"%(string,fielddisplay(self,'y','corresponding y coordinates'))
    2229                return string
    2330                #}}}
    2431               
    25         def setdefaultparameters(obj):
     32        def setdefaultparameters(self):
    2633                # {{{setdefaultparameters
    27                 return obj
     34                return self
    2835        #}}}
    2936
Note: See TracChangeset for help on using the changeset viewer.