Changeset 1562 for branches/alma

Timestamp:

04/08/09 19:20:34 (16 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: Yes (CAS-1298)

Ready to Release: Yes

Interface Changes: No

What Interface Changed:

Test Programs: run sdplot() with wrong 'sprange' or 'flrange' selections

Put in Release Notes: No

Module(s): tools and tasks which calls sd.plotter.plot()

Description:

Methods plot() and _slice_indeces() are modified to fix bugs in ASAP plotter.
The method _slice_indeces() is modified to avoid index referencing error and
to return precise 'slice indices'.
The method plot() is modified to avoid invalid index referencing when setting
plot range. The y-range of the plot will be set to the default plot range of
Matplotlib, i.e., [0,1], if flrange is not set and the selected sprange is out
of range.

File:

• branches/alma/python/asapplotter.py (modified) (4 diffs)

branches/alma/python/asapplotter.py

@@ -556 +556 @@
             inc = -1
         # find min index
-        while start > 0 and data[start] < mn:
-            start+= inc
+        #while start > 0 and data[start] < mn:
+        #    start+= inc
+        minind=start
+        for ind in xrange(start,end+inc,inc):
+            if data[ind] > mn: break
+            minind=ind
         # find max index
-        while end > 0 and data[end] > mx:
-            end-=inc
-        if end > 0: end +=1
+        #while end > 0 and data[end] > mx:
+        #    end-=inc
+        #if end > 0: end +=1
+        maxind=end
+        for ind in xrange(end,start-inc,-inc):
+            if data[ind] < mx: break
+            maxind=ind
+        start=minind
+        end=maxind
         if start > end:
-            return end,start
-        return start,end
+            return end,start+1
+        elif start < end:
+            return start,end+1
+        else:
+            return start,end
 
     def _reset(self):
@@ -605 +618 @@
         if n > 1:
             ganged = rcParams['plotter.ganged']
-            ###Start Mod: 2008.09.22 kana ###
             if self._panelling == 'i':
                 ganged = False
-            ###End Mod#######################
             if self._rows and self._cols:
                 n = min(n,self._rows*self._cols)
@@ -688 +699 @@
                     ylim= self._minmaxy or [ma.minimum(y),ma.maximum(y)]
                     allylim += ylim
+                else:
+                    xlim = self._minmaxx or []
+                    allxlim += xlim
+                    ylim= self._minmaxy or []
+                    allylim += ylim
                 stackcount += 1
                 # last in colour stack -> autoscale x
-                if stackcount == nstack:
+                if stackcount == nstack and len(allxlim) > 0:
                     allxlim.sort()
-                    ###Start Mod: 2008.09.22 kana ###
-                    #self._plotter.axes.set_xlim([allxlim[0],allxlim[-1]])
                     self._plotter.subplots[panelcount-1]['axes'].set_xlim([allxlim[0],allxlim[-1]])
-                    ###End Mod#######################
                     # clear
                     allxlim =[]
@@ -705 +718 @@
             if (panelcount == n) and (stackcount == nstack):
                 # last panel -> autoscale y if ganged
-                if rcParams['plotter.ganged']:
+                if rcParams['plotter.ganged'] and len(allylim) > 0:
                     allylim.sort()
                     self._plotter.set_limits(ylim=[allylim[0],allylim[-1]])