Changeset 2699 for trunk

Timestamp:

12/17/12 16:28:37 (12 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (bug fixes)

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: unit tests of sdplot

Put in Release Notes: No

Module(s): asapplotter and sdplot

Description:

Fixed a bug which caused failure of plots by user defined linestyles.
Made sure data is plotted on mpl plotter (not on ASAP plotter) by
plotpointing and plotazel.

Location:

trunk/python

Files:

• asaplotbase.py (modified) (2 diffs)
• asapplotter.py (modified) (11 diffs)

trunk/python/asaplotbase.py

@@ -56 +56 @@
         if isinstance(c,str) and len(c) > 0:
             self.colormap = c.split()
-
-        self.lsalias = {"line":  '-', #[1,0],
-                        "dashdot": '-.',  #[4,2,1,2],
-                        "dashed" : '--',  #[4,2,4,2],
-                        "dotted" : ':',  #[1,2],
+        # line styles need to be set as a list of numbers to use set_dashes
+        self.lsalias = {"line":  [1,0],
+                        "dashdot": [4,2,1,2],
+                        "dashed" : [4,2,4,2],
+                        "dotted" : [1,2],
                         "dashdotdot": [4,2,1,2,1,2],
                         "dashdashdot": [4,2,4,2,1,2]
@@ -98 +98 @@
         self.axes.clear()
         self.color = 0
+        self.linestyle = 0
         self.lines = []
         self.subplots[self.i]['lines'] = self.lines

trunk/python/asapplotter.py

@@ -49 +49 @@
         self._inikwg = kwargs
 
-        # plot settings
+        ### plot settings
         self._colormap = None
         self._linestyles = None
@@ -59 +59 @@
         self._margins = self.set_margin(refresh=False)
         self._legendloc = None
-        # scantable plot settings
+        ### scantable plot settings
         self._panelling = None
         self._stacking = None
@@ -65 +65 @@
         self.set_stacking()
         self._hist = rcParams['plotter.histogram']
-        # scantable dependent settings
+        ### scantable dependent settings
         self._data = None
         self._abcunit = None
@@ -77 +77 @@
         self._ordinate = None
         self._abcissa = None
-        # cursors for page iteration
+        ### cursors for page iteration
         self._startrow = 0
         self._ipanel = -1
@@ -274 +274 @@
         return []
 
-    # forwards to matplotlib axes
+
+    ### Forwards to matplotlib axes ###
     def text(self, *args, **kwargs):
         self._assert_plotter(action="reload")
@@ -379 +380 @@
     # end matplotlib.axes fowarding functions
 
-    # forwards to matplotlib.Figure.text
+
+    ### Forwards to matplotlib.Figure.text ###
     def figtext(self, *args, **kwargs):
         """
@@ -391 +393 @@
     # end matplotlib.Figure.text forwarding function
 
-    # plot setttings
+
+    ### Set Plot parameters ###
     @asaplog_post_dec
     def set_data(self, scan, refresh=True):
@@ -954 +957 @@
             return start,end
 
-    # reset methods
+
+    ### Reset methods ###
     def _reset(self):
         self._usermask = []
@@ -978 +982 @@
         self._panelrows = []
 
-    # scantable plot methods
+
+    ### Actual scantable plot methods ###
     @asaplog_post_dec
     def plot(self, scan=None):
@@ -1306 +1311 @@
         from matplotlib.ticker import MultipleLocator
         from numpy import array, pi
+        if PL.gcf() == self._plotter.figure:
+            # the current figure is ASAP plotter. Use mpl plotter
+            figids = PL.get_fignums()
+            if figids[-1] > 0:
+                PL.figure(figids[-1])
+            else:
+                PL.figure(1)
         if not visible or not self._visible:
             PL.ioff()
@@ -1532 +1544 @@
         from matplotlib import pylab as PL
         from numpy import array, pi
+        if PL.gcf() == self._plotter.figure:
+            # the current figure is ASAP plotter. Use mpl plotter
+            figids = PL.get_fignums()
+            if figids[-1] > 0:
+                PL.figure(figids[-1])
+            else:
+                PL.figure(1)
         if not visible or not self._visible:
             PL.ioff()