Changeset 597

Timestamp:

04/29/05 14:01:41 (19 years ago)

Author:

mar637

Message:

Fixed asap0008 and asap0014

File:

• branches/Release-1-fixes/python/asapplotter.py (modified) (8 diffs)

branches/Release-1-fixes/python/asapplotter.py

@@ -68 +68 @@
         if self._plotter.is_dead:
             self._plotter = ASAPlot()
+        self._plotter.hold()
         self._plotter.clear()
-        self._plotter.hold()
         if len(args) > 0:
             if self._data is not None:                
@@ -108 +108 @@
         if self._stacking is not None:
             ncol = eval(self._cdict.get(colmode))
-        self._plotter.set_panels()
         if n > 1:
             if self._rows and self._cols:
@@ -116 +115 @@
             else:
                 self._plotter.set_panels(rows=n,cols=0,nplots=n)
+        else:
+            self._plotter.set_panels()
         rows = self._cursor["t"]
         self._plotter.palette(1)
@@ -206 +207 @@
             scan = scans[0]
             ncol = eval(self._cdict.get(colmode))
-        self._plotter.set_panels()
         if n > 1:
             if self._rows and self._cols:
@@ -214 +214 @@
             else:
                 self._plotter.set_panel(rows=n,cols=0,nplots=n)
+        else:
+            self._plotter.set_panels()
         for scan in scans:
             self._plotter.palette(1)
@@ -299 +301 @@
         if self._stacking is not None:            
             ncol = eval(self._cdict.get(colmode))
-        self._plotter.set_panels()
         if n > 1:
             if self._rows and self._cols:
@@ -307 +308 @@
             else:
                 self._plotter.set_panels(rows=n,cols=0,nplots=n)
+        else:
+            self._plotter.set_panels()            
         panels = self._cursor[self._panelling]        
         for i in panels:
@@ -485 +488 @@
         if xstart is None and xend is None:
             self._minmaxx = None
-            if self._data: self.plot()
-            return
+        else:
+            self._minmaxx = [xstart,xend]
         if ystart is None and yend is None:
             self._minmaxy = None
-            if self._data: self.plot()
-            return
-        self._minmaxx = [xstart,xend]
-        self._minmaxy = [ystart,yend]
+        else:
+            self._minmaxy = [ystart,yend]            
         if self._data: self.plot()
         return