Changeset 2606 for trunk

Timestamp:

07/23/12 18:28:01 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-3616, Trac-274)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs:

Put in Release Notes: No

Module(s): flagplotter, sdflag

Description: fixed misc bugs in flagplotter.

Location:

trunk/python

Files:

• customgui_base.py (modified) (4 diffs)
• flagplotter.py (modified) (8 diffs)

trunk/python/customgui_base.py

@@ -877 +877 @@
         self._thisregion['worldx'][1] = xdataend
         lregion = self._thisregion['worldx']
+        # WORKAROUND for the issue axvspan started to reset xlim.
+        axlimx = self._thisregion['axes'].get_xlim()
         pregion = self._thisregion['axes'].axvspan(lregion[0],lregion[1],
                                                    facecolor='0.7')
+        self._thisregion['axes'].set_xlim(axlimx)
+        
         self.plotter._plotter.canvas.draw()
         self._polygons.append(pregion)
@@ -959 +963 @@
                 ax = self.plotter._plotter.subplots[irow - int(strow)]['axes']
                 mlist = regions.pop(str(irow))
+                # WORKAROUND for the issue axvspan started to reset xlim.
+                axlimx = ax.get_xlim()
                 for i in range(len(mlist)):
                     self._polygons.append(ax.axvspan(mlist[i][0],mlist[i][1],
                                                      facecolor='0.7'))
-                del ax,mlist
+                ax.set_xlim(axlimx)
+                del ax,mlist,axlimx
             if irow in panels:
                 ax = self.plotter._plotter.subplots[irow - int(strow)]['axes']
@@ -1189 +1196 @@
             return
         # set row and panel counters to those of the 1st panel of previous page
-        maxpanel = 16
+        maxpanel = 25
         # the ID of the last panel in current plot
         lastpanel = self.plotter._ipanel
@@ -1232 +1239 @@
 
     def _get_pagenum(self):
-        maxpanel = 16
+        maxpanel = 25
         # get the ID of last panel in the current page
         idlastpanel = self.plotter._ipanel

trunk/python/flagplotter.py

@@ -32 +32 @@
         self.set_stacking('scan')
         self._ismodified = False
-        self._showflag = True #False
+        self._showflagged = False
         self.set_colors("blue gray",False)
 
@@ -51 +51 @@
             asaplog.post("ERROR")
 
-    def set_showflag(self, show):
+    def set_showflagged(self, show):
         """ Whether or not plotting flagged data"""
         if type(show) == bool:
-            self._showflag = show
+            self._showflagged = show
+            print "self._showflagged =", str(show)
+        else:
+            raise TypeError, "Input parameter should be a bool."
 
     @asaplog_post_dec
@@ -130 +133 @@
         if self._is_new_scan(scan):
             self._ismodified = False
-        if not self._showflag:
+        if not self._showflagged:
             self.set_legend(mode=None,refresh=False)
         elif not self._legendloc:
@@ -139 +142 @@
     @asaplog_post_dec
     def _plot(self, scan):
-        self._plot_with_flag(scan,self._showflag)
+        self._plot_with_flag(scan,self._showflagged)
+        #asapplotter._plot(self,scan)
         # rescale x-range of subplots 5% margins
         ganged = (self._plotter.axes._sharex != None)
@@ -156 +160 @@
 
     @asaplog_post_dec
-    def _plot_with_flag(self, scan, showflag=True):
+    def _plot_with_flag(self, scan, showflag=False):
         # total number of panles to plot as a whole
         nptot = scan.nrow()
@@ -180 +184 @@
         nr = scan.nrow()
         panelcount = 0
-
+        allylim = []
+        allxlim = []
+        
         while r < nr:
             # always plot to new panel
@@ -205 +211 @@
             # Now get data to plot
             y = scan._getspectrum(r)
-            #flag row
+            # Check for FLAGROW column
             mr = scan._getflagrow(r)
             from numpy import ma, array
@@ -225 +231 @@
             if self._offset:
                 x += self._offset
-            llbl = self._get_label(scan, r, mode='legend', userlabel=self._lmap)
-            if type(llbl) in (list, tuple):
-                        llbl = llbl[0]
-            self._plotter.set_line(label=llbl)
-            plotit = self._plotter.plot
-            if self._hist: plotit = self._plotter.hist
-            plotit(x,ys)
+            #llbl = self._get_label(scan, r, mode='legend', userlabel=self._lmap)
+            #if type(llbl) in (list, tuple):
+            #    llbl = llbl[0]
+            #self._plotter.set_line(label=llbl)
+            self._plotter.set_line(label="data")
+            #plotit = self._plotter.plot
+            #if self._hist: plotit = self._plotter.hist
+            self._plotter.plot(x,ys)
             if showflag:
                 self._plotter.set_line(label="flagged")
-                plotit(x,yf)
+                self._plotter.plot(x,yf)
+                ylim = self._minmaxy or [min(y),max(y)]
+                xlim= self._minmaxx or [min(x),max(x)]
+            elif mr or ys.mask.all():
+                ylim = self._minmaxy or []
+                xlim = self._minmaxx or []
+            else:
+                ylim = self._minmaxy or [ma.minimum(ys),ma.maximum(ys)]
+                xlim= self._minmaxx or [min(x),max(x)]
+            allylim += ylim
+            allxlim += xlim
             if (panelcount == n) or (r == nr-1):
                 break
             r+=1 # next row
-        
+
+        # Set x- and y- limts of subplots
+        if ganged:
+            xlim = None
+            ylim = None
+            if len(allylim) > 0:
+                allylim.sort()
+                ylim = allylim[0],allylim[-1]
+            if len(allxlim) > 0:
+                allxlim.sort()
+                xlim = allxlim[0],allxlim[-1]
+            self._plotter.set_limits(xlim=xlim,ylim=ylim)
 
         # save the current counter for multi-page plotting