Changeset 3038 for trunk/python

Timestamp:

06/29/15 18:52:29 (9 years ago)

Author:

Kana Sugimoto

Message:

New Development: No

JIRA Issue: No (a bug fix)

Ready for Test: Yes

Interface Changes: Yes

What Interface Changed: added axlim parameter (optional) to asapplotter._get_date_axis_setup.

Test Programs: runUnitTest.main(test_sdplot[test_totalpowerCflag])

Put in Release Notes: No

Module(s): asapplotter, sdplot

Description: Fixed a bug in tick interval for > 1year

File:

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

trunk/python/asapplotter.py

@@ -1317 +1317 @@
             return start,end
 
-    def _get_date_axis_setup(self, dates):
+    def _get_date_axis_setup(self, dates, axlim=None):
         """
         Returns proper axis title and formatters for a list of dates
@@ -1323 +1323 @@
             dates : a list of datetime objects returned by,
                     e.g. scantable.get_time(asdatetime=True)
+            axlim : a tuple of min and max day range in the plot axis.
+                    if defined, the values are taken into account.
         Output
             a set of
@@ -1332 +1334 @@
         from matplotlib import pylab as PL
         from matplotlib.dates import DateFormatter
-        from matplotlib.dates import HourLocator, MinuteLocator,SecondLocator, DayLocator
+        from matplotlib.dates import HourLocator, MinuteLocator,SecondLocator, DayLocator, YearLocator, MonthLocator
         t = PL.date2num(dates)
-        tdel = max(t) - min(t) # interval in day
+        tmin = min(t)
+        tmax = max(t)
+        if axlim is not None:
+            tmin = min(tmin, min(axlim))
+            tmax = max(tmax, max(axlim))
+        tdel = tmax - tmin # interval in day
         dstr = dates[0].strftime('%Y/%m/%d')
-        if tdel > 1.0: # >1day
+        if tdel > 365.0: # >1year (also the case for single or very small time range)
+            majloc = YearLocator()
+            minloc = MonthLocator(range(1,12,6))
+            timefmt = DateFormatter('%Y/%m/%d')
+        elif tdel > 1.0: # >1day
             dstr2 = dates[len(dates)-1].strftime('%Y/%m/%d')
             dstr = dstr + " - " + dstr2
@@ -1809 +1820 @@
 
         # legend and axis formatting
-        (dstr, timefmt, majloc, minloc) = self._get_date_axis_setup(alldates)
         ax = self.gca()
+        (dstr, timefmt, majloc, minloc) = self._get_date_axis_setup(alldates, ax.get_xlim())
         ax.xaxis.set_major_formatter(timefmt)
         ax.xaxis.set_major_locator(majloc)