Changeset 753

Timestamp:

11/29/05 12:06:57 (18 years ago)

Author:

mar637

Message:

Bug fix: plot_other with panelling==p didn't work with cursor selction. added use of asaplog

File:

• trunk/python/asapplotter.py (modified) (14 diffs)

trunk/python/asapplotter.py

@@ -1 @@
-from asap import rcParams
+from asap import rcParams, print_log
 from numarray import logical_and
 
@@ -109 +109 @@
                        (isinstance(self._cursor["t"],list) and \
                         len(self._cursor["t"]) > maxrows ):
-                    print "Scan to be plotted contains more than %d rows.\n" \
+                    from asap import asaplog
+                    msg ="Scan to be plotted contains more than %d rows.\n" \
                           "Selecting first %d rows..." % (maxrows,maxrows)
+                    asaplog.push(msg)
                     self._cursor["t"] = range(maxrows)
             self._plot_time(self._data[0], self._stacking)
@@ -120 +122 @@
             self._plotter.set_limits(ylim=self._minmaxy)
         self._plotter.release()
+        print_log()
         return
 
@@ -231 +234 @@
 
     def _plot_scans(self, scans, colmode):
-        print "Plotting mode is scans across panels. Can only plot one row per scan."
+        from asap import asaplog
+        msg = "Plotting mode is scans across panels. Can only plot one row per scan."
+        asaplog.push(msg)
         if colmode == 's':
             return
@@ -330 +335 @@
             self._plotter.set_axes('ylabel',ylab)
             self._plotter.set_axes('title',tlab)
+        print_log()
         return
 
@@ -367 +373 @@
             if self._panelling == "p":
                 polmode = self._polmode[ii]
-                eval(cdict.get(self._panelling))
-            else:
-                eval(cdict.get(self._panelling))
+
+            eval(cdict.get(self._panelling))
+
             colvals = eval(cdict2.get(colmode))
             for j in colvals:
@@ -393 +399 @@
                     if colmode == 'p':
                         polmode = self._polmode[self._cursor["p"].index(j)]
+
                     i = j
                     eval(cdict.get(colmode))
                     i = savei
+                if self._panelling == "p":
+                    eval(cdict.get(self._panelling))
                 x = None
                 y = None
@@ -485 +494 @@
                  'time' 'Time' 't':     Times
         """
-        if not self.set_panelling(panelling):
-            print "Invalid mode"
-            return
-        if not self.set_stacking(stacking):
-            print "Invalid mode"
-            return
+        msg = "Invalid mode"
+        if not self.set_panelling(panelling) or \
+               not self.set_stacking(stacking):
+            if rcParams['verbose']:
+                print msg
+                return
+            else:
+                raise TypeError(msg)
         if self._data: self.plot()
         return
@@ -694 +705 @@
         """
         if not self._data:
-            print "Can only set cursor after a first call to plot()"
-            return
+            msg = "Can only set cursor after a first call to plot()"
+            if rcParams['verbose']:
+                print msg
+                return
+            else:
+                raise RuntimeError(msg)
 
         n = self._data[0].nrow()
@@ -703 +718 @@
             for i in row:
                 if i < 0 or i >= n:
-                    print "Row index '%d' out of range" % i
-                    return
+                    msg = "Row index '%d' out of range" % i
+                    if rcParams['verbose']:
+                        print msg
+                        return        
+                    else:
+                        raise IndexError(msg)
             self._cursor["t"] = row
 
@@ -713 +732 @@
             for i in beam:
                 if i < 0 or  i >= n:
-                    print "Beam index '%d' out of range" % i
-                    return
+                    msg = "Beam index '%d' out of range" % i
+                    if rcParams['verbose']:
+                        print msg
+                        return        
+                    else:
+                        raise IndexError(msg)
+
             self._cursor["b"] = beam
 
@@ -723 +747 @@
             for i in IF:
                 if i < 0 or i >= n:
-                    print "IF index '%d' out of range" %i
-                    return
+                    msg = "IF index '%d' out of range" %i
+                    if rcParams['verbose']:
+                        print msg
+                        return        
+                    else:
+                        raise IndexError(msg)
             self._cursor["i"] = IF
 
@@ -756 +784 @@
                         polmode.append("circular")
                     else:
-                        print "Pol type '%s' not valid" %i
-                        return
+                        msg = "Pol type '%s' not valid" %i
+                        if rcParams['verbose']:
+                            print msg
+                            return        
+                        else:
+                            raise TypeError(msg)                       
                 elif 0 > i >= n:
                     print "Pol index '%d' out of range" %i
-                    return
+                    if rcParams['verbose']:
+                        print msg
+                        return        
+                    else:
+                        raise IndexError(msg)                    
                 else:
                     pols.append(i)
@@ -779 +815 @@
         """
         if not self._data:
-            print "Can only set cursor after a first call to plot()"
-            return
+            msg = "Can only set cursor after a first call to plot()"
+            if rcParams['verbose']:
+                print msg
+                return        
+            else:
+                raise RuntimeError(msg)                       
         if isinstance(mask, array):
             self._usermask = mask