Changeset 266

Timestamp:

10/10/2006 08:53:01 PM (3 years ago)

Author:

brian

Message:

Begin of code changes for prettier graphs. Not done.

Files:

• PhedexGraphs/trunk/grapher.py (modified) (6 diffs)
• PhedexGraphs/trunk/make_quantity.py (modified) (1 diff)

PhedexGraphs/trunk/grapher.py

@@ -7 +7 @@
-from matplotlib.font_manager import FontProperties
-from matplotlib.ticker import FixedLocator, FixedFormatter
+from matplotlib.font_manager import *
-from sql_queries import *
-from plot_helpers import *
+from math import ceil, floor
+
+prefs = { 
+  'text_size' : 7,    #in pixels
+  'text_padding' : 2, #in pixels
+  'legend_padding' : .02, # In percent of screen space / 100
+  'figure_padding' : .08, 
+  'width' : 800,  #in pixels
+  'height' : 500,
+  'width_inches' : 8,    # Somewhat arbitrary, as dpi is adjusted to 
+                       # fit the pixel sizes requested above.
+  'columns' : 5,    # The number of columns to use in the legend 
+  'max_rows' : 9 # Maximum number of rows in the legend
+}
-
-def make_labels( ax, text_title, xlab, ylab ):
@@ -15 +30 @@
-  text_obj.set_weight('bold')
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  begin_num = datetime.datetime.utcfromtimestamp( begin )
-  end_num = datetime.datetime.utcfromtimestamp( end )
@@ -27 +137 @@
-  labels = ax.get_xticklabels()
-  setp(labels, rotation=45,horizontalalignment='right', size='smaller')
+
+def random_colors( labels ):
+  colors = [(random.random(), random.random(), random.random()) for label in labels]
+  return colors
-
-def make_figure( size=(8,4), subplots=111 ):
@@ -62 +176 @@
-  my_times = points.keys(); my_times.sort()
-  polygons = []
-  #for idx in range(len(my_times[:-1])):
-  #  cur_time, next_time = my_times[idx], my_times[idx+1]
-  #  left = cur_time
-  #  right = next_time
-  #  if not bottom.has_key( cur_time  ): bottom[cur_time ] = 0
-  #  if not bottom.has_key( next_time ): bottom[next_time] = 0
-  #  left_bottom = bottom[cur_time]
-  #  bottom[cur_time] += points[cur_time] 
-  #  left_top = bottom[cur_time]
-  #  right_bottom = bottom[next_time]
-  #  right_top = bottom[next_time] + points[next_time]
-  #  seq = [ (left, left_bottom), (left, left_top), (right, right_top), (right, right_bottom), (left, left_bottom) ]
-  #  poly = Polygon( seq, facecolor=color, fill=True, linewidth=0.0 )
-  #  ax.add_patch( poly )
-  #  polygons.append( poly )
-  seq = []
-  next_bottom = {}
@@ -101 +200 @@
-                  # in the legend produced separately.
-
-
+file2, 
-  rc('grid', color=0.75, linestyle='-') 
-  results, amt_results = quantity_query( from_node, to_node, begin, end, orcl, kind )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  if results == {}: print "No graph to plot!"; return None
-  legend_text = []; legend_boxes = []
+
+  bottom, bottom2 = None, None
-  for link in results.keys():
-    color = (random.random(), random.random(), random.random())
@@ -128 +236 @@
-    bottom, bars = make_bar( ax, results[link], begin, end, bottom, color )
-    bottom2, bars = make_bar( ax2,amt_results[link], begin, end, bottom2, color )
-    if bars != None:
-      if kind == "link":
-        legend_text.append(link[1] + ' to ' + link[0]) 
-      else:
-        legend_text.append( link )
-      legend_boxes.append( bars[0] )
-  legend_boxes.reverse(); legend_text.reverse()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-

PhedexGraphs/trunk/make_quantity.py

@@ -38 +38 @@
-    print e
-    sys.exit(1)
+  my_file = option.output[:-len(option.output.split('.')[-1])+1]
+  my_ext =  option.output.split('.')[-1]
-  try:
-
+
+
-  except:
-    print "Cannot open the output file (", option.output, ") for writing!"
-    sys.exit(1)
-
+file2, 
-