Changeset 19435

Timestamp:

07/13/15 08:48:11 (10 years ago)

Author:

cborstad

Message:

CHG: changed text fontsize naming for consistency

Location:

issm/trunk-jpl/src/m/plot

Files:

• applyoptions.py (modified) (1 diff)
• checkplotoptions.py (modified) (2 diffs)

issm/trunk-jpl/src/m/plot/applyoptions.py

@@ -272 +272 @@
                 textx=options.getfieldvalue('textx')
                 texty=options.getfieldvalue('texty')
-                textsize=options.getfieldvalue('textsize')
                 textcolor=options.getfieldvalue('textcolor')
                 textweight=options.getfieldvalue('textweight')
                 textrotation=options.getfieldvalue('textrotation')
-                for label,x,y,size,color,weight,rotation in zip(text,textx,texty,textsize,textcolor,textweight,textrotation):
-                        ax.text(x,y,label,transform=ax.transAxes,fontsize=size,color=color,weight=weight,rotation=rotation)
+                textfontsize=options.getfieldvalue('textfontsize')
+                for label,x,y,size,color,weight,rotation in zip(text,textx,texty,textfontsize,textcolor,textweight,textrotation):
+                        ax.text(x,y,label,transform=ax.transAxes,fontsize=textfontsize,color=color,weight=weight,rotation=rotation)
         #}}}
 

issm/trunk-jpl/src/m/plot/checkplotoptions.py

@@ -71 +71 @@
 
                 # font size
-                if options.exist('textsize'):
-                        textsize=options.getfieldvalue('textsize',12)
+                if options.exist('textfontsize'):
+                        textfontsize=options.getfieldvalue('textfontsize',12)
                         sizelist=[]
-                        sizelist.extend(textsize if isinstance(textsize,list) else [textsize])
+                        sizelist.extend(textsize if isinstance(textfontsize,list) else [textfontsize])
                 else:
                         sizelist=[12]
@@ -113 +113 @@
                 options.addfield('textx',textx)
                 options.addfield('texty',texty)
-                options.changefieldvalue('textsize',sizelist)
+                options.changefieldvalue('textfontsize',sizelist)
                 options.changefieldvalue('textcolor',colorlist)
                 options.changefieldvalue('textweight',weightlist)