Changes in trunk/python/interactivemask.py [2453:2117]

File:

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

trunk/python/interactivemask.py

@@ -55 +55 @@
             raise TypeError(msg)
 
-        self.mask = _n_bools(self.scan.nchan(self.scan.getif(0)),True)
+        self.mask = _n_bools(self.scan.nchan(),True)
         self.callback = None
         self.event = None
@@ -92 +92 @@
             self.mask = self.scan.create_mask(masklist,invert=invert)
         elif invert == True:
-            self.mask = _n_bools(self.scan.nchan(self.scan.getif(0)),False)
-        else:
-            self.mask = _n_bools(self.scan.nchan(self.scan.getif(0)),True)
+            self.mask = _n_bools(self.scan.nchan(),False)
+        else:
+            self.mask = _n_bools(self.scan.nchan(),True)
 
 
@@ -157 +157 @@
 
         #if not self.p._plotter or self.p._plotter.is_dead:
-        if not self.p:
+        if not self.p or self.p._plotter.is_dead:
             asaplog.push('A new ASAP plotter will be loaded')
             asaplog.post()
@@ -163 +163 @@
             self.p = asapplotter()
             self.newplot = True
-        self.p._assert_plotter(action='reload')
-        
+
         # Plot selected spectra if needed
         if self.scan != self.p._data:
@@ -172 +171 @@
                 asaplog.post("WARN")
             # Need replot
-            self.p._legendloc = 1
+            self.p._plotter.legend(1)
             self.p.plot(self.scan)
             # disable casa toolbar