fixed up date demos

jdh2358 · jdh2358 · commit 083f0532c644 · 2007-04-17T14:35:04.000Z
svn path=/trunk/matplotlib/; revision=3240
diff --git a/examples/date_demo1.py b/examples/date_demo1.py
@@ -14,7 +14,7 @@
 yahoo finance to get the data for plotting
 """
 
-from pylab import *
+from pylab import figure, show
 from matplotlib.finance import quotes_historical_yahoo
 from matplotlib.dates import YearLocator, MonthLocator, DateFormatter
 import datetime
@@ -33,7 +33,8 @@
 dates = [q[0] for q in quotes]
 opens = [q[1] for q in quotes]
 
-ax = subplot(111)
+fig = figure()
+ax = fig.add_subplot(111)
 ax.plot_date(dates, opens, '-')
 
 # format the ticks
@@ -46,7 +47,8 @@
 def price(x): return '$%1.2f'%x
 ax.fmt_xdata = DateFormatter('%Y-%m-%d')
 ax.fmt_ydata = price
+ax.grid(True)
+
+fig.savefig('test')
 
-savefig('test')
-grid(True)
 show()
diff --git a/examples/date_demo2.py b/examples/date_demo2.py
@@ -5,7 +5,7 @@
 controlling major and minor ticks
 """
 import datetime
-from pylab import *
+from pylab import figure, show
 from matplotlib.dates import MONDAY, SATURDAY
 from matplotlib.finance import quotes_historical_yahoo
 from matplotlib.dates import MonthLocator, WeekdayLocator, DateFormatter
@@ -26,19 +26,19 @@
 
 dates = [q[0] for q in quotes]
 opens = [q[1] for q in quotes]
-    
-ax = subplot(111)
-plot_date(dates, opens, '-')
+
+fig = figure()
+ax = fig.add_subplot(111)
+ax.plot_date(dates, opens, '-')
 ax.xaxis.set_major_locator(months)
 ax.xaxis.set_major_formatter(monthsFmt)
 ax.xaxis.set_minor_locator(mondays)
 ax.autoscale_view()
 #ax.xaxis.grid(False, 'major')
 #ax.xaxis.grid(True, 'minor')
+ax.grid(True)
 
-labels = ax.get_xticklabels()
-setp(labels, rotation=45)
+fig.autofmt_xdate()
 
-grid(True)
-savefig('date_demo2')
+#fig.savefig('date_demo2')
 show()
diff --git a/examples/date_demo_convert.py b/examples/date_demo_convert.py
@@ -1,41 +1,34 @@
 #!/usr/bin/env python
 
-import matplotlib
-#matplotlib.use('TkAgg')
-from matplotlib import pylab
-PL = pylab
-from matplotlib.dates import DayLocator, HourLocator, \
-     drange, date2num, timezone
 import datetime
+from pylab import figure, show, nx
+from matplotlib.dates import DayLocator, HourLocator, DateFormatter, drange
 
-matplotlib.rcParams['timezone'] = 'US/Pacific'
-tz = timezone('US/Pacific')
 
-
-date1 = datetime.datetime( 2000, 3, 2, tzinfo=tz)
-date2 = datetime.datetime( 2000, 3, 6, tzinfo=tz)
+date1 = datetime.datetime( 2000, 3, 2)
+date2 = datetime.datetime( 2000, 3, 6)
 delta = datetime.timedelta(hours=6)
 dates = drange(date1, date2, delta)
     
-y = PL.arange( len(dates)*1.0)
-ysq = y*y
-
-# note new constructor takes days or sequence of days you want to
-# tick, not the hour as before.  Default is to tick every day
-majorTick = DayLocator(tz=tz)
+y = nx.arange( len(dates)*1.0)
 
-# the hour locator takes the hour or sequence of hours you want to
-# tick, not the base multiple
-minorTick = HourLocator(range(0,25,6), tz=tz)
-ax = PL.subplot(111)
-ax.plot_date(dates, ysq, tz=tz)
+fig = figure()
+ax = fig.add_subplot(111)
+ax.plot_date(dates, y*y)
 
 # this is superfluous, since the autoscaler should get it right, but
 # use date2num and num2date to to convert between dates and floats if
 # you want; both date2num and num2date convert an instance or sequence
-PL.xlim( dates[0], dates[-1] )
-ax.xaxis.set_major_locator(majorTick)
-ax.xaxis.set_minor_locator(minorTick)
-labels = ax.get_xticklabels()
-PL.setp(labels,'rotation', 90)
-PL.show()
+ax.set_xlim( dates[0], dates[-1] )
+
+# The hour locator takes the hour or sequence of hours you want to
+# tick, not the base multiple
+
+ax.xaxis.set_major_locator( DayLocator() )
+ax.xaxis.set_minor_locator( HourLocator(nx.arange(0,25,6)) )
+ax.xaxis.set_major_formatter( DateFormatter('%Y-%m-%d') )
+
+ax.fmt_xdata = DateFormatter('%Y-%m-%d %H:%M:%S')
+fig.autofmt_xdate()
+
+show()
diff --git a/examples/units/date_converter.py b/examples/units/date_converter.py
@@ -1,24 +1,19 @@
 import date_support # set up the date converters
 import datetime
+from matplotlib.dates import drange
 from pylab import figure, show, nx
 
 
 xmin = datetime.date(2007,1,1)
 xmax = datetime.date.today()
-
-xdates = [xmin]
-while 1:
-    thisdate = xdates[-1] + datetime.timedelta(days=1)
-    xdates.append(thisdate)
-    if thisdate>=xmax: break
+delta = datetime.timedelta(days=1)
+xdates = drange(xmin, xmax, delta)
 
 fig = figure()
 fig.subplots_adjust(bottom=0.2)
 ax = fig.add_subplot(111)
 ax.plot(xdates, nx.mlab.rand(len(xdates)), 'o')
 ax.set_xlim(datetime.date(2007,2,1), datetime.date(2007,3,1))
 
-for label in ax.get_xticklabels():
-    label.set_rotation(30)
-    label.set_ha('right')
+fig.autofmt_xdate()
 show()
