Changeset 2037

Timestamp:

03/13/11 14:38:13 (14 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed:

• Renamed a method asapplotter.set_panellayout to asapplotter.set_margin.
• Renamed a parameter layout to margin in asapplotter.set_margin and

asaplotbase.set_panels.

Test Programs: call asapplotter.set_margin(margin=[0.1,0.1])

Put in Release Notes: Yes

Module(s): asapplotter, asaplotbase, and sdplot

Description:

• Renamed a method asapplotter.set_panellayout to asapplotter.set_margin.
• Renamed a parameter layout to margin in asapplotter.set_margin and

asaplotbase.set_panels.

Location:

trunk/python

Files:

• asaplotbase.py (modified) (3 diffs)
• asapplotter.py (modified) (7 diffs)

trunk/python/asaplotbase.py

@@ -581 +581 @@
 
     #def set_panels(self, rows=1, cols=0, n=-1, nplots=-1, ganged=True):
-    def set_panels(self, rows=1, cols=0, n=-1, nplots=-1, layout=None,ganged=True):
+    def set_panels(self, rows=1, cols=0, n=-1, nplots=-1, margin=None,ganged=True):
         """
         Set the panel layout.
@@ -604 +604 @@
             self.set_title()
 
-        if layout:
-            lef, bot, rig, top, wsp, hsp = layout
+        if margin:
+            lef, bot, rig, top, wsp, hsp = margin
             self.figure.subplots_adjust(
                 left=lef,bottom=bot,right=rig,top=top,wspace=wsp,hspace=hsp)
@@ -689 +689 @@
             self.cols = cols
             self.subplot(0)
-        del rows,cols,n,nplots,layout,ganged,i
+        del rows,cols,n,nplots,margin,ganged,i
 
 

trunk/python/asapplotter.py

@@ -50 +50 @@
         self._hist = rcParams['plotter.histogram']
         self._fp = FontProperties()
-        self._panellayout = self.set_panellayout(refresh=False)
+        self._margins = self.set_margin(refresh=False)
         self._offset = None
         self._startrow = 0
@@ -641 +641 @@
         if refresh and self._data: self.plot(self._data)
 
-    def set_panellayout(self,layout=[],refresh=True):
-        """
-        Set the layout of subplots.
-        Parameters:
-            layout:   a list of subplots layout in figure coordinate (0-1),
+    def set_margin(self,margin=[],refresh=True):
+        """
+        Set margins between subplots and plot edges.
+        Parameters:
+            margin:   a list of margins in figure coordinate (0-1),
                       i.e., fraction of the figure width or height.
                       The order of elements should be:
@@ -654 +654 @@
                       Otherwise,the parameter(s) are set without replotting.
         Note
-        * When layout is not specified, the values are reset to the defaults
+        * When margin is not specified, the values are reset to the defaults
           of matplotlib.
         * If any element is set to be None, the current value is adopted.
         """
-        if layout == []: self._panellayout=self._reset_panellayout()
+        if margin == []: self._margins=self._reset_margin()
         else:
-            self._panellayout=[None]*6
-            self._panellayout[0:len(layout)]=layout
-        #print "panel layout set to ",self._panellayout
+            self._margins=[None]*6
+            self._margins[0:len(margin)]=margin
+        #print "panel margin set to ",self._margins
         if refresh and self._data: self.plot(self._data)
 
-    def _reset_panellayout(self):
+    def _reset_margin(self):
         ks=map(lambda x: 'figure.subplot.'+x,
                ['left','bottom','right','top','hspace','wspace'])
@@ -887 +887 @@
                 n = min(n,self._rows*self._cols)
                 self._plotter.set_panels(rows=self._rows,cols=self._cols,
-                                         nplots=n,layout=self._panellayout,ganged=ganged)
+                                         nplots=n,margin=self._margins,ganged=ganged)
             else:
-                self._plotter.set_panels(rows=n,cols=0,nplots=n,layout=self._panellayout,ganged=ganged)
+                self._plotter.set_panels(rows=n,cols=0,nplots=n,margin=self._margins,ganged=ganged)
         else:
-            self._plotter.set_panels(layout=self._panellayout)
+            self._plotter.set_panels(margin=self._margins)
         #r = 0
         r = self._startrow
@@ -1150 +1150 @@
         PL.ioff()
         PL.clf()
-        # Adjust subplot layouts
-        if len(self._panellayout) != 6:
-            self.set_panellayout(refresh=False)
-        lef, bot, rig, top, wsp, hsp = self._panellayout
+        # Adjust subplot margins
+        if len(self._margins) != 6:
+            self.set_margin(refresh=False)
+        lef, bot, rig, top, wsp, hsp = self._margins
         PL.gcf().subplots_adjust(left=lef,bottom=bot,right=rig,top=top,
                                  wspace=wsp,hspace=hsp)
@@ -1250 +1250 @@
         #PL.ioff()
         PL.clf()
-        # Adjust subplot layouts
-        if len(self._panellayout) != 6:
-            self.set_panellayout(refresh=False)
-        lef, bot, rig, top, wsp, hsp = self._panellayout
+        # Adjust subplot margins
+        if len(self._margins) != 6:
+            self.set_margin(refresh=False)
+        lef, bot, rig, top, wsp, hsp = self._margins
         PL.gcf().subplots_adjust(left=lef,bottom=bot,right=rig,top=top,
                                  wspace=wsp,hspace=hsp)
@@ -1302 +1302 @@
         #    self._datamask = None
 
-        # Adjust subplot layouts
-        if len(self._panellayout) !=6: self.set_panellayout(refresh=False)
-        lef, bot, rig, top, wsp, hsp = self._panellayout
+        # Adjust subplot margins
+        if len(self._margins) !=6: self.set_margin(refresh=False)
+        lef, bot, rig, top, wsp, hsp = self._margins
         self._plotter.figure.subplots_adjust(
             left=lef,bottom=bot,right=rig,top=top,wspace=wsp,hspace=hsp)