summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa Hsu <hsul@eecs.umich.edu>2006-02-18 20:10:42 -0500
committerLisa Hsu <hsul@eecs.umich.edu>2006-02-18 20:10:42 -0500
commita611b8100379e28728c1084801413954c973e734 (patch)
tree7648990bc86f227dcaaed9df872d687b6b5d0b63
parent6cf0ba84953b0c18fcd702197f3aec9cf8a33f2d (diff)
downloadgem5-a611b8100379e28728c1084801413954c973e734.tar.xz
few changes for nate:
1) cosmetic - removing visibility of meta axes except for the tick labels. 2) unless subticklabels defined, don't do meta axes. (instead of assuming if you have 3D graph, do meta axes) --HG-- extra : convert_revision : 396011ffaa51ea4066b34257f6fd5b3faac9d242
-rw-r--r--util/stats/barchart.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/util/stats/barchart.py b/util/stats/barchart.py
index 29d16db17..3f202d9bf 100644
--- a/util/stats/barchart.py
+++ b/util/stats/barchart.py
@@ -31,6 +31,7 @@ import matplotlib, pylab
from matplotlib.font_manager import FontProperties
from matplotlib.numerix import array, arange, reshape, shape, transpose, zeros
from matplotlib.numerix import Float
+from matplotlib.ticker import NullLocator
matplotlib.interactive(False)
@@ -120,15 +121,11 @@ class BarChart(ChartOptions):
if self.chartdata is None:
raise AttributeError, "Data not set for bar chart!"
- need_subticks = True
-
dim = len(shape(self.inputdata))
cshape = shape(self.chartdata)
- print cshape
if dim == 1:
colors = self.gen_colors(cshape[2])
colors = [ [ colors ] * cshape[1] ] * cshape[0]
- need_subticks = False
if dim == 2:
colors = self.gen_colors(cshape[0])
@@ -144,15 +141,19 @@ class BarChart(ChartOptions):
outer_axes = None
inner_axes = None
- if need_subticks:
- self.metaaxes = self.figure.add_axes(self.figure_size)
+ if self.xsubticks is not None:
+ color = self.figure.get_facecolor()
+ self.metaaxes = self.figure.add_axes(self.figure_size, axisbg=color, frameon=False)
+ for tick in self.metaaxes.xaxis.majorTicks:
+ tick.tick1On = False
+ tick.tick2On = False
self.metaaxes.set_yticklabels([])
self.metaaxes.set_yticks([])
size = [0] * 4
size[0] = self.figure_size[0]
- size[1] = self.figure_size[1] + .075
+ size[1] = self.figure_size[1] + .05
size[2] = self.figure_size[2]
- size[3] = self.figure_size[3] - .075
+ size[3] = self.figure_size[3] - .05
self.axes = self.figure.add_axes(size)
outer_axes = self.metaaxes
inner_axes = self.axes
@@ -202,10 +203,12 @@ class BarChart(ChartOptions):
if self.xticks is not None:
outer_axes.set_xticks(arange(cshape[2]) + .5)
outer_axes.set_xticklabels(self.xticks)
+
if self.xsubticks is not None:
inner_axes.set_xticks(arange((cshape[0] + 1)*cshape[2])*width + 2*center)
self.xsubticks.append('')
inner_axes.set_xticklabels(self.xsubticks * cshape[2], fontsize=8)
+
if self.legend is not None:
if dim == 1:
lbars = bars[0][0]
@@ -279,7 +282,7 @@ if __name__ == '__main__':
chart1.xticks = [ 'xtick%d' % x for x in xrange(myshape[0]) ]
chart1.title = 'this is the title'
chart1.figure_size = [0.1, 0.2, 0.7, 0.85 ]
- if len(myshape) > 1:
+ if len(myshape) > 2:
chart1.xsubticks = [ '%d' % x for x in xrange(myshape[1]) ]
chart1.graph()
chart1.savefig('/tmp/test1.png')