created date ticker factory

jdh2358 · jdh2358 · commit 76ce690a3386 · 2005-09-14T12:42:26.000Z
svn path=/trunk/matplotlib/; revision=1750
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 New entries should be added at the top
 
+2005-09-14 Factored out auto date locator/formatter factory code into
+           matplotlib.date.date_ticker_factory
+
 2005-09-13 Added Mark's axes positions history patch #1286915 
 
 2005-09-09 Added support for auto canvas resizing with
diff --git a/examples/interactive.py b/examples/interactive.py
@@ -22,8 +22,6 @@
 import code
 import threading
 
-import pygtk
-pygtk.require("2.0")
 import gobject
 import gtk
 
diff --git a/examples/interactive2.py b/examples/interactive2.py
@@ -5,8 +5,6 @@
 #  See www.python.org/2.2/license.html for
 #  license details.
 #
-import pygtk
-pygtk.require('2.0')
 import gtk
 import gtk.gdk
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -46,9 +46,7 @@
 import matplotlib
 
 if matplotlib._havedate:
-    from dates import YearLocator, MonthLocator, WeekdayLocator, \
-             DayLocator, HourLocator, MinuteLocator, DateFormatter,\
-             SEC_PER_MIN, SEC_PER_HOUR, SEC_PER_DAY, SEC_PER_WEEK
+    from dates import date_ticker_factory
 
 
 def _process_plot_format(fmt):
@@ -2620,40 +2618,7 @@ def plot_date(self, d, y, fmt='bo', tz=None, **kwargs):
 
         span  = self.dataLim.intervalx().span()
 
-        if span==0: span = 1/24.
-
-        minutes = span*24*60
-        hours  = span*24
-        days   = span
-        weeks  = span/7.
-        months = span/31. # approx
-        years  = span/365.
-
-        numticks = 5
-        if years>numticks:
-            locator = YearLocator(int(years/numticks), tz=tz)  # define
-            fmt = '%Y'
-        elif months>numticks:
-            locator = MonthLocator(tz=tz)
-            fmt = '%b %Y'
-        elif weeks>numticks:
-            locator = WeekdayLocator(tz=tz)
-            fmt = '%a, %b %d'
-        elif days>numticks:
-            locator = DayLocator(interval=int(math.ceil(days/numticks)), tz=tz)
-            fmt = '%b %d'
-        elif hours>numticks:
-            locator = HourLocator(interval=int(math.ceil(hours/numticks)), tz=tz)
-            fmt = '%H:%M\n%b %d'
-        elif minutes>numticks:
-            locator = MinuteLocator(interval=int(math.ceil(minutes/numticks)), tz=tz)
-            fmt = '%H:%M:%S'
-        else:
-            locator = MinuteLocator(tz=tz)
-            fmt = '%H:%M:%S'
-
-
-        formatter = DateFormatter(fmt, tz=tz)
+        locator, formatter = date_ticker_factory(span, tz)
         self.xaxis.set_major_locator(locator)
         self.xaxis.set_major_formatter(formatter)
         self.autoscale_view()
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -75,7 +75,7 @@
   DateIndexFormatter - date plots with implicit x indexing.
 
 """
-import sys, re, time
+import sys, re, time, math
 import locale
 
 import matplotlib
@@ -703,6 +703,49 @@ def mx2num(mxdates):
     for t in dates: print formatter(t)
 
 
+def date_ticker_factory(span, tz=None, numticks=5):
+    """
+    Create a date locator with numticks (approx) and a date formatter
+    for span in days.  Return value is (locator, formatter)
+
+
+    """
+    
+    if span==0: span = 1/24.
+
+    minutes = span*24*60
+    hours  = span*24
+    days   = span
+    weeks  = span/7.
+    months = span/31. # approx
+    years  = span/365.
+
+    if years>numticks:
+        locator = YearLocator(int(years/numticks), tz=tz)  # define
+        fmt = '%Y'
+    elif months>numticks:
+        locator = MonthLocator(tz=tz)
+        fmt = '%b %Y'
+    elif weeks>numticks:
+        locator = WeekdayLocator(tz=tz)
+        fmt = '%a, %b %d'
+    elif days>numticks:
+        locator = DayLocator(interval=int(math.ceil(days/numticks)), tz=tz)
+        fmt = '%b %d'
+    elif hours>numticks:
+        locator = HourLocator(interval=int(math.ceil(hours/numticks)), tz=tz)
+        fmt = '%H:%M\n%b %d'
+    elif minutes>numticks:
+        locator = MinuteLocator(interval=int(math.ceil(minutes/numticks)), tz=tz)
+        fmt = '%H:%M:%S'
+    else:
+        locator = MinuteLocator(tz=tz)
+        fmt = '%H:%M:%S'
+
+
+    formatter = DateFormatter(fmt, tz=tz)
+    return locator, formatter
+
 __all__ = ( 'date2num', 'num2date', 'drange', 'epoch2num',
             'num2epoch', 'mx2num', 'DateFormatter',
             'IndexDateFormatter', 'DateLocator', 'RRuleLocator',
@@ -711,3 +754,4 @@ def mx2num(mxdates):
             'SecondLocator', 'rrule', 'MO', 'TU', 'WE', 'TH', 'FR',
             'SA', 'SU', 'YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY',
             'HOURLY', 'MINUTELY', 'SECONDLY', 'relativedelta')
+

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`# See www.python.org/2.2/license.html for`
`6`	`6`	`# license details.`
`7`	`7`	`#`
`8`		`-import pygtk`
`9`		`-pygtk.require('2.0')`
`10`	`8`	`import gtk`
`11`	`9`	`import gtk.gdk`
`12`	`10`