Changeset 672 for branches/Release-2-fixes

Timestamp:

09/20/05 11:18:45 (19 years ago)

Author:

mar637

Message:

• Bug fix: set_cursor for Polarisations wasn't working for e.g. "U V"
• data slicing on set_range to give mpl only the range selected. mpl ps backend always drwas all points and the clips (known bug)

File:

• branches/Release-2-fixes/python/asapplotter.py (modified) (9 diffs)

branches/Release-2-fixes/python/asapplotter.py

@@ -45 +45 @@
         self._ordinate = None
         self._abcissa = None
+        self._abcunit = None
         self._cursor = {'t':None, 'b':None,
                         'i':None, 'p':None
@@ -79 +80 @@
                 self._data = list(args)
                 self.set_cursor(refresh=False)
+        # ranges become invalid when unit changes
+        if self._abcunit != self._data[0].get_unit():
+            self._minmaxx = None
+            self._minmaxy = None
+            self._abcunit = self._data[0].get_unit()
         if self._panelling == 't':
             maxrows = 25
@@ -93 +99 @@
         else:
             self._plot_other(self._data, self._stacking)
-        if self._minmaxx is not None or self._minmaxy is not None:
-            self._plotter.set_limits(xlim=self._minmaxx,ylim=self._minmaxy)
+        if self._minmaxy is not None:
+            self._plotter.set_limits(ylim=self._minmaxy)
         self._plotter.release()
         return
@@ -143 +149 @@
                 if colmode == "p":
                     polmode = self._polmode[self._cursor["p"].index(j)]
-                    j = jj
+                    #j = jj
                 eval(cdict.get(colmode))
                 x = None
@@ -179 +185 @@
                         llab = self._ldict.get(colmode)+' '+str(j)
                 self._plotter.set_line(label=llab)
+                if self._minmaxx is not None:
+                    s,e = self._slice_indeces(x)
+                    x = x[s:e]
+                    y = y[s:e]
+                    m = m[s:e]
                 self._plotter.plot(x,y,m)
+                
                 xlim=[min(x),max(x)]
                 self._plotter.axes.set_xlim(xlim)
@@ -234 +246 @@
                 if colmode == "p":
                     polmode = self._polmode[self._cursor["p"].index(j)]
-                    j = jj
+                    #j = jj
                 eval(cdict.get(colmode))
                 x = None
@@ -265 +277 @@
                         llab = self._ldict.get(colmode)+' '+str(j)
                 self._plotter.set_line(label=llab)
+                if self._minmaxx is not None:
+                    s,e = self._slice_indeces(x)
+                    x = x[s:e]
+                    y = y[s:e]
+                    m = m[s:e]
+
                 self._plotter.plot(x,y,m)
                 xlim=[min(x),max(x)]
@@ -384 +402 @@
                             llab = self._ldict.get(colmode)+' '+str(j)
                 self._plotter.set_line(label=llab)
+                if self._minmaxx is not None:
+                    s,e = self._slice_indeces(x)
+                    x = x[s:e]
+                    y = y[s:e]
+                    m = m[s:e]
+
                 self._plotter.plot(x,y,m)
                 xlim=[min(x),max(x)]
@@ -643 +667 @@
             tlab = scan._getpolarizationlabel(1,0,0)
         return tlab
+
+    def _slice_indeces(self, data):
+        mn = self._minmaxx[0]
+        mx = self._minmaxx[1]
+        asc = data[0] < data[-1]        
+        start=0
+        end = len(data)-1
+        inc = 1
+        if not asc:
+            start = len(data)-1
+            end = 0
+            inc = -1
+        # find min index
+        while data[start] < mn:
+            start+= inc
+        # find max index
+        while data[end] > mx:
+            end-=inc
+        end +=1
+        if start > end:
+            return end,start 
+        return start,end
             
 if __name__ == '__main__':