added new ticker scheme

jdh2358 · jdh2358 · commit d8d54a8f7812 · 2004-04-16T20:21:09.000Z
svn path=/trunk/matplotlib/; revision=243
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -103,7 +103,8 @@ axes.labelsize      : 12      # fontsize of the x any y labels
 axes.labelcolor     : k       # black 
 
 ### TICKS
-tick.size           : 4      # tick size in points
+tick.major.size     : 5      # major tick size in points
+tick.minor.size     : 3      # minor tick size in points
 tick.color          : k      # color of the tick labels 
 tick.labelsize      : 10     # fontsize of the tick labels
 
diff --git a/MANIFEST b/MANIFEST
@@ -5,6 +5,7 @@ GOALS
 INSTALL
 INTERACTIVE
 KNOWN_BUGS
+MANIFEST
 MANIFEST.in
 Makefile
 README
@@ -176,8 +177,11 @@ examples/break.py
 examples/color_demo.py
 examples/colours.py
 examples/coords_demo_gtk.py
+examples/coords_interact.py
 examples/csd_demo.py
 examples/data_helper.py
+examples/date_demo1.py
+examples/date_demo2.py
 examples/dynamic_demo.py
 examples/dynamic_demo_wx.py
 examples/embedding_in_gtk.py
@@ -187,6 +191,7 @@ examples/embedding_in_wx.py
 examples/errorbar_demo.py
 examples/figtext.py
 examples/fill_demo.py
+examples/font_properties_demo.py
 examples/ftface_props.py
 examples/gdtest.py
 examples/histogram_demo.py
@@ -201,6 +206,7 @@ examples/line_styles.py
 examples/log_demo.py
 examples/log_test.py
 examples/logo.py
+examples/major_minor_demo1.py
 examples/mathtext_demo.py
 examples/mpl_with_glade.glade
 examples/mpl_with_glade.py
@@ -322,7 +328,9 @@ matplotlib/axis.py
 matplotlib/backend_bases.py
 matplotlib/cbook.py
 matplotlib/colors.py
+matplotlib/dates.py
 matplotlib/figure.py
+matplotlib/finance.py
 matplotlib/font_manager.py
 matplotlib/image.py
 matplotlib/legend.py
@@ -332,9 +340,13 @@ matplotlib/matlab.py
 matplotlib/mlab.py
 matplotlib/numerix.py
 matplotlib/patches.py
+matplotlib/postinstall.py
 matplotlib/pyparsing.py
+matplotlib/setup.py
+matplotlib/setupext.py
 matplotlib/table.py
 matplotlib/text.py
+matplotlib/ticker.py
 matplotlib/transforms.py
 matplotlib/windowing.py
 matplotlib/backends/__init__.py
@@ -350,7 +362,6 @@ matplotlib/backends/backend_tkagg.py
 matplotlib/backends/backend_wx.py
 matplotlib/backends/backend_wxagg.py
 matplotlib/backends/tkagg.py
-matplotlib/backends/ttf_font_manager.py
 src/_backend_agg.cpp
 src/_backend_agg.h
 src/_gtkagg.cpp
diff --git a/examples/date_demo1.py b/examples/date_demo1.py
@@ -0,0 +1,54 @@
+"""
+Show how to make date plots in matplotlib using date tick locators and
+formatters.  See major_minor_demo1.py for more information on
+controlling major and minor ticks
+
+All matplotlib date plotting is done by converting date instances into
+seconds since the epoch, gmtime.  The conversion, tick locating and
+formatting is done behind the scenes so this is most transparent to
+you.  The dates module provides several converter classes that you can
+pass to the date plotting functions which will convert your dates as
+necessary.  Currently epoch dates (already converted) are supported
+with EpochCOnverter, python2.3 datetime instances are supported with
+PyDatetimeConverter, and it won't be much work to add an mx.Datetime
+converter.
+
+If you want to define your own converter, the minimum you need to do
+is derive a class from dates.DateConverter and implement the epoch and
+from_epoch methods.
+
+This example requires an active internet connection since it uses
+yahoo finance to get the data for plotting
+"""
+
+from matplotlib.matlab import *
+from matplotlib.dates import PyDatetimeConverter
+from matplotlib.finance import quotes_historical_yahoo
+from matplotlib.ticker import YearLocator, MonthLocator, DateFormatter
+import datetime
+
+date1 = datetime.date( 1995, 1, 1 )
+date2 = datetime.date( 2004, 4, 12 )
+
+pydates = PyDatetimeConverter()
+
+years    = YearLocator(1)   # every year
+months   = MonthLocator(1)  # every month
+yearsFmt = DateFormatter('%Y')
+
+
+quotes = quotes_historical_yahoo(
+    'INTC', date1, date2, converter=pydates)
+
+dates = [q[0] for q in quotes]
+opens = [q[1] for q in quotes]
+
+ax = subplot(111)
+plot_date(dates, opens, pydates)
+
+ax.xaxis.set_major_locator(years)
+ax.xaxis.set_major_formatter(yearsFmt)
+ax.xaxis.set_minor_locator(months)
+ax.xaxis.autoscale_view()
+grid(True)
+show()
diff --git a/examples/date_demo2.py b/examples/date_demo2.py
@@ -0,0 +1,43 @@
+"""
+Show how to make date plots in matplotlib using date tick locators and
+formatters.  See major_minor_demo1.py for more information on
+controlling major and minor ticks
+"""
+
+from matplotlib.matlab import *
+from matplotlib.dates import PyDatetimeConverter, MONDAY, SATURDAY
+from matplotlib.finance import quotes_historical_yahoo
+from matplotlib.ticker import MonthLocator, WeekdayLocator, DateFormatter
+import datetime
+
+date1 = datetime.date( 2003, 1, 1 )
+date2 = datetime.date( 2004, 4, 12 )
+
+pydates = PyDatetimeConverter()
+
+mondays   = WeekdayLocator(SATURDAY)  # every monday
+months    = MonthLocator(1)           # every month
+monthsFmt  = DateFormatter('%b %d')
+
+
+
+quotes = quotes_historical_yahoo(
+    'INTC', date1, date2, converter=pydates)
+
+dates = [q[0] for q in quotes]
+opens = [q[1] for q in quotes]
+
+ax = subplot(111)
+plot_date(dates, opens, pydates)
+
+ax.xaxis.set_major_locator(months)
+ax.xaxis.set_major_formatter(monthsFmt)
+ax.xaxis.set_minor_locator(mondays)
+ax.xaxis.autoscale_view()
+#ax.xaxis.grid(False, 'major')
+#ax.xaxis.grid(True, 'minor')
+
+labels = ax.get_xticklabels()
+set(labels, 'rotation', 'vertical')
+grid(True)
+show()
diff --git a/examples/interactive2.py b/examples/interactive2.py
@@ -11,7 +11,7 @@
 import gtk.gdk
 
 import code
-import sys
+import os, sys
 import pango
 
 import __builtin__
@@ -364,6 +364,15 @@ def key_event(widget,event):
   console.execute_line('matplotlib.interactive(1)')
   console.execute_line('from matplotlib.matlab import *')
 
+
+  if len(sys.argv)>1:
+    fname = sys.argv[1]
+    if not os.path.exists(fname):
+      print >> sys.stderr, '%s does not exist' % fname
+    for line in file(fname):
+      line = line.strip()
+      
+      console.execute_line(line)
   gtk.main()
 
 if __name__ == '__main__':
diff --git a/examples/log_demo.py b/examples/log_demo.py
@@ -11,5 +11,6 @@
 
 subplot(313)
 loglog(t, exp(-t/10.0))
+grid(True)
 #savefig('log_demo')
 show()
diff --git a/examples/major_minor_demo1.py b/examples/major_minor_demo1.py
@@ -0,0 +1,48 @@
+"""
+Demonstrate how to use major and minor tickers.
+
+The two relevant userland classes are Locators and Formatters.
+Locators determine where the ticks are and formatters control the
+formatting of ticks.
+
+Minor ticks are off by default (NullLocator and NullFormatter).  You
+can turn minor ticks on w/o labels by setting the minor locator.  You
+can also turn labeling on for the minor ticker by setting the minor
+formatter
+
+Make a plot with major ticks on the 10s and minor ticks on the even
+numbersints.  Label major ticks with %d formatting but don't label
+minor ticks
+
+The MultipleLocator ticker class is used to place ticks on multiples of
+some base.  The FormatStrFormatter uses a string format string (eg
+'%d' or '%1.2f' or '%1.1f cm' ) to format the tick
+
+The matlab interface grid command chnages the grid settings of the
+major ticks of the y and y axis together.  If you want to control the
+grid of the minor ticks for a given axis, use for example
+
+  ax.xaxis.grid(True, which='minor')
+"""
+
+from matplotlib.matlab import *
+from matplotlib.ticker import MultipleLocator, FormatStrFormatter
+
+majorLocator   = MultipleLocator(20)
+majorFormatter = FormatStrFormatter('%d')
+minorLocator   = MultipleLocator(5)
+
+
+t = arange(0.0, 100.0, 0.1)
+s = sin(0.1*pi*t)*exp(-t*0.01)
+
+ax = subplot(111)
+plot(t,s)
+
+ax.xaxis.set_major_locator(majorLocator)
+ax.xaxis.set_major_formatter(majorFormatter)
+
+#for the minor ticks, use no labels; default NullFormatter
+ax.xaxis.set_minor_locator(minorLocator) 
+
+show()
diff --git a/examples/major_minor_demo2.py b/examples/major_minor_demo2.py
@@ -0,0 +1,25 @@
+"""
+Set the major ticks on the ints and minor ticks on multiples of 0.2
+"""
+
+from matplotlib.matlab import *
+from matplotlib.ticker import MultipleLocator, FormatStrFormatter
+
+majorLocator   = MultipleLocator(1)
+majorFormatter = FormatStrFormatter('%d')
+minorLocator   = MultipleLocator(.2)
+
+
+t = arange(0.0, 10.0, 0.01)
+s = sin(2*pi*t)*exp(-t*0.01)
+
+ax = subplot(111)
+plot(t,s)
+
+ax.xaxis.set_major_locator(majorLocator)
+ax.xaxis.set_major_formatter(majorFormatter)
+
+#for the minor ticks, use no labels; default NullFormatter
+ax.xaxis.set_minor_locator(minorLocator) 
+
+show()
diff --git a/examples/simple_plot.py b/examples/simple_plot.py
@@ -8,6 +8,6 @@
 xlabel('time (s)')
 ylabel('voltage (mV)')
 title('About as simple as it gets, folks')
-#grid(True)
+grid(True)
 savefig('simple_plot',dpi=300)
 show()
diff --git a/setup.py b/setup.py
@@ -85,7 +85,7 @@
     build_image(ext_modules, packages, BUILD_IMAGE)
 
 setup(name="matplotlib",
-      version= '0.52.1b',
+      version= '0.53a',
       description = "Matlab style python plotting package",
       author = "John D. Hunter",
       author_email="jdhunter@ace.bsd.uchicago.edu",
diff --git a/setupext.py b/setupext.py
@@ -151,10 +151,10 @@ def find_tcltk():
 	import Tkinter
     except:
 	print "Tkinter not properly installed\n"
-	exit(1)
+	sys.exit(1)
     if Tkinter.TkVersion < 8.3:
 	print "Tcl/Tk v8.3 or later required\n"
-	exit(1)
+	sys.exit(1)
     o = FoundTclTk()
     try:
 	tk=Tkinter.Tk()	
