Changeset 2116 for branches

Timestamp:

04/07/11 15:20:31 (14 years ago)

Author:

Kana Sugimoto

Message:

merged modifications in trunk (r2115)

Location:

branches/casa-prerelease/pre-asap/python

Files:

• flagplotter.py (modified) (2 diffs)
• flagtoolbar.py (modified) (2 diffs)

branches/casa-prerelease/pre-asap/python/flagplotter.py

@@ -30 +30 @@
         self._panelling = 'r'
         self.set_stacking('scan')
+        self._ismodified = False
 
     def _newcasabar(self):
@@ -94 +95 @@
         # simply calls scantable.save
         self._data.save(name,format,overwrite)
+
+    def set_data(self, scan, refresh=True):
+        if self._is_new_scan(scan):
+            self._ismodified = False
+        asapplotter.set_data(self, scan, refresh)
+    set_data.__doc__ = asapplotter.set_data.__doc__
+
+    @asaplog_post_dec
+    def plot(self, scan=None):
+        if self._is_new_scan(scan):
+            self._ismodified = False
+        asapplotter.plot(self,scan)
+    plot.__doc__ = asapplotter.plot.__doc__
+
+    def _is_new_scan(self,scan):
+        if isinstance(scan, scantable):
+            if self._data is not None:
+                if scan != self._data:
+                    return True
+            else:
+                return True
+        return False

branches/casa-prerelease/pre-asap/python/flagtoolbar.py

@@ -343 +343 @@
         asaplog.push(sout)
         del sout
+        self.plotter._ismodified = True
         self._clearup_selections(refresh=False)
         self._plot_page(pagemode="current")
@@ -363 +364 @@
         asaplog.push(sout)
         del sout
+        self.plotter._ismodified = True
         self._clearup_selections(refresh=False)
         self._plot_page(pagemode="current")