Changeset 603 for trunk/python

Timestamp:

05/02/05 09:24:47 (20 years ago)

Author:

mar637

Message:

Fix for asap0015

File:

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

trunk/python/asapplotter.py

@@ -82 +82 @@
             maxrows = 9
             if self._data[0].nrow() > maxrows:
-                print "Scan to be plotted contains more than %d rows.\n" \
-                      "Selecting first %d rows..." % (maxrows,maxrows)
-                self._cursor["t"] = range(maxrows)
+                if self._cursor["t"] is None or \
+                       (isinstance(self._cursor["t"],list) and \
+                        len(self._cursor["t"]) > maxrows ):
+                    print "Scan to be plotted contains more than %d rows.\n" \
+                          "Selecting first %d rows..." % (maxrows,maxrows)
+                    self._cursor["t"] = range(maxrows)
             self._plot_time(self._data[0], self._stacking)
         elif self._panelling == 's':
@@ -172 +175 @@
                 else:
                     if colmode == 'p':
-                        if polmode == "stokes":
-                            llab = scan._getpolarizationlabel(0,1,0)
-                        elif polmode == "stokes2":
-                            llab = scan._getpolarizationlabel(0,1,1)
-                        elif polmode == "circular":
-                            llab = scan._getpolarizationlabel(0,0,0)
-                        else:
-                            llab = scan._getpolarizationlabel(1,0,0)
+                        llab = self._get_pollabel(scan, polmode)
                     else:                    
                         llab = self._ldict.get(colmode)+' '+str(j)
@@ -265 +261 @@
                 else:
                     if colmode == 'p':
-                        if polmode == "stokes":
-                            llab = scan._getpolarizationlabel(0,1,0)
-                        elif polmode == "stokes2":
-                            llab = scan._getpolarizationlabel(0,1,1)
-                        elif polmode == "circular":
-                            llab = scan._getpolarizationlabel(0,0,0)
-                        else:
-                            llab = scan._getpolarizationlabel(1,0,0)
+                        llab = self._get_pollabel(scan, polmode)
                     else:
                         llab = self._ldict.get(colmode)+' '+str(j)
@@ -377 +366 @@
                         tlab = self._title[ii]
                     else:
-                        tlab = self._ldict.get(self._panelling)+' '+str(i)
+                        if self._panelling == 'p':
+                            tlab = self._get_pollabel(scan, polmode)
+                        else:
+                            tlab = self._ldict.get(self._panelling)+' '+str(i)
                     if self._lmap and len(self._lmap) > 0:
                         llab = self._lmap[jj]
                     else:
                         if colmode == 'p':
-                            if polmode == "stokes":
-                                llab = scan._getpolarizationlabel(0,1,0)
-                            elif polmode == "stokes2":
-                                llab = scan._getpolarizationlabel(0,1,1)
-                            elif polmode == "circular":
-                                llab = scan._getpolarizationlabel(0,0,0)
-                            else:
-                                llab = scan._getpolarizationlabel(1,0,0)
+                            llab = self._get_pollabel(scan, polmode)
                         else:
                             llab = self._ldict.get(colmode)+' '+str(j)
-                if self._panelling == 'p':
-                    if polmode == "stokes":
-                        tlab = scan._getpolarizationlabel(0,1,0)
-                    elif polmode == "stokes2":
-                        tlab = scan._getpolarizationlabel(0,1,1)
-                    elif polmode == "circular":
-                        tlab = scan._getpolarizationlabel(0,0,0)
-                    else:
-                        tlab = scan._getpolarizationlabel(1,0,0)
                 self._plotter.set_line(label=llab)
                 self._plotter.plot(x,y,m)
@@ -646 +622 @@
         if self._data and refresh: self.plot()
 
+    def _get_pollabel(self, scan, polmode):
+        tlab = ""
+        if polmode == "stokes":
+            tlab = scan._getpolarizationlabel(0,1,0)
+        elif polmode == "stokes2":
+            tlab = scan._getpolarizationlabel(0,1,1)
+        elif polmode == "circular":
+            tlab = scan._getpolarizationlabel(0,0,0)
+        else:
+            tlab = scan._getpolarizationlabel(1,0,0)
+        return tlab
             
 if __name__ == '__main__':