Changeset 554

Timestamp:

03/10/05 15:44:29 (19 years ago)

Author:

mar637

Message:

Fixed asaprc set_mode issues.
Fixed set_cursor range detection

File:

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

trunk/python/asapplotter.py

@@ -31 +31 @@
                        self._idict,self._pdict,
                        self._sdict]
-        self._panels = rcParams['plotter.panelling']
-        self._stacking = rcParams['plotter.stacking']
+        self._panelling = None
+        self._stacking = None
+        self.set_panelling()
+        self.set_stacking()
+        print rcParams
+        print self._panelling, self._stacking
         self._rows = None
         self._cols = None
@@ -77 +81 @@
                 self._data = list(args)
                 self.set_cursor(refresh=False)
-        if self._panels == 't':
+        if self._panelling == 't':
             maxrows = 9
             if self._data[0].nrow() > maxrows:
@@ -84 +88 @@
                 self._cursor["t"] = range(maxrows)
             self._plot_time(self._data[0], self._stacking)
-        elif self._panels == 's':
+        elif self._panelling == 's':
             self._plot_scans(self._data, self._stacking)
         else:
@@ -208 +212 @@
             if self._rows and self._cols:
                 n = min(n,self._rows*self._cols)
-                self._plotter.set_panels(rows=self._rows,cols=self._cols,
+                self._plotter.set_panel(rows=self._rows,cols=self._cols,
                                          nplots=n)
             else:
-                self._plotter.set_panels(rows=n,cols=0,nplots=n)
+                self._plotter.set_panel(rows=n,cols=0,nplots=n)
         for scan in scans:
             self._plotter.palette(1)
@@ -282 +286 @@
     
     def _plot_other(self,scans,colmode):
-        if colmode == self._panels:
+        if colmode == self._panelling:
             return
         cdict = {'b':'scan.setbeam(i)',
@@ -293 +297 @@
                   't': 'self._cursor["t"]'}
         scan = scans[0]
-        n = eval(self._cdict.get(self._panels))
+        n = eval(self._cdict.get(self._panelling))
         ncol=1
         if self._stacking is not None:            
@@ -305 +309 @@
             else:
                 self._plotter.set_panels(rows=n,cols=0,nplots=n)
-        panels = self._cursor[self._panels]        
+        panels = self._cursor[self._panelling]        
         for i in panels:
             self._plotter.palette(1)
             polmode = "raw"
-            ii = self._cursor[self._panels].index(i)
+            ii = self._cursor[self._panelling].index(i)
             if n>1:
                 self._plotter.subplot(ii)
-            if self._panels == "p":
+            if self._panelling == "p":
                 polmode = self._polmode[ii]
-                eval(cdict.get(self._panels))
+                eval(cdict.get(self._panelling))
             else:
-                eval(cdict.get(self._panels))
+                eval(cdict.get(self._panelling))
             colvals = eval(cdict2.get(colmode))
             for j in colvals:
@@ -323 +327 @@
                 savei = i
                 for k in cdict.keys():
-                    if k != self._panels:
+                    if k != self._panelling:
                         sel = eval(cdict2.get(k))
                         i = sel[0]
@@ -366 +370 @@
                         tlab = self._title[ii]
                     else:                        
-                        tlab = self._ldict.get(self._panels)+' '+str(i)
+                        tlab = self._ldict.get(self._panelling)+' '+str(i)
                     llab = scan._getsourcename(rowsel)
                 else:
@@ -372 +376 @@
                         tlab = self._title[ii]
                     else:
-                        tlab = self._ldict.get(self._panels)+' '+str(i)
+                        tlab = self._ldict.get(self._panelling)+' '+str(i)
                     if self._lmap and len(self._lmap) > 0:
                         llab = self._lmap[jj]
@@ -387 +391 @@
                         else:
                             llab = self._ldict.get(colmode)+' '+str(j)
-                if self._panels == 'p':
+                if self._panelling == 'p':
                     if polmode == "stokes":
                         tlab = scan._getpolarizationlabel(0,1,0)
@@ -424 +428 @@
                  'time' 'Time' 't':     Times
         """
-        if not self.set_panels(panelling):
+        if not self.set_panelling(panelling):
             print "Invalid mode"
             return
@@ -433 +437 @@
         return
 
-    def set_panels(self, what=None):
-        if not what:
-             what = rcParams['plotter.panelling']
-        md = self._translate(what)
+    def set_panelling(self, what=None):
+        mode = what
+        if mode is None:
+             mode = rcParams['plotter.panelling']
+        md = self._translate(mode)
         if md:
-            self._panels = md
+            self._panelling = md
             self._title = None
             return True
@@ -460 +465 @@
 
     def set_stacking(self, what=None):  
-        if not what:
-             what = rcParams['plotter.stacking']        
-        md = self._translate(what)
+        mode = what
+        if mode is None:            
+             mode = rcParams['plotter.stacking']        
+        md = self._translate(mode)
         if md:
             self._stacking = md
@@ -575 +581 @@
         else:
             for i in row:
-                if 0 > i >= n:
+                if i < 0 or i >= n:
                     print "Row index '%d' out of range" % i
                     return
@@ -585 +591 @@
         else:
             for i in beam:
-                if 0 > i >= n:
+                if i < 0 or  i >= n:
                     print "Beam index '%d' out of range" % i
                     return            
@@ -595 +601 @@
         else:
             for i in IF:
-                if 0 > i >= n:
+                if i < 0 or i >= n:
                     print "IF index '%d' out of range" %i
                     return