Changeset 870

Timestamp:

05/14/2007 11:33:29 AM (3 years ago)

Author:

brian

Message:

Made HorizontalGraph? work nicely; made QualityMap? an instance of HorizontalGraph?.

Files:

• GraphTool/examples/simple/quality_map.py (modified) (1 diff)
• GraphTool/examples/simple/quality_map_tall.py (added)
• GraphTool/src/graphtool/graphs/common_graphs.py (modified) (2 diffs)
• GraphTool/src/graphtool/graphs/graph.py (modified) (9 diffs)

GraphTool/examples/simple/quality_map.py

@@ -15 +15 @@
-    return begin_time, end_time, data
-
+QM = QualityMap()
-
-
-
+
-full_data = {}
-for i in range(10):

GraphTool/src/graphtool/graphs/common_graphs.py

@@ -759 +759 @@
-      return None
-
-
+HorizontalGraph, 
-
-  sort_keys = Graph.sort_keys
@@ -871 +871 @@
-          coords[link][timebin] = p
-
-    y_vals =  numpy.arange(.5,len(links)+.5,1)
-    fl = FixedLocator( y_vals )
-    if self.kind.lower() == "link":
-      links = [ i[0] + ' to ' + i[1] for i in links ]
-
-    # Make the colorbar
-
+
+
+
+
+
+
-    setp( cb.outline, linewidth=.5 )
-    setp( cb.ax.get_xticklabels(), size=10 )
-    setp( cb.ax.get_xticklabels(), family=self.prefs['font_family'] )
-    setp( cb.ax.get_xticklabels(), fontname = self.prefs['font'] )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-  def get_coords( self ):

GraphTool/src/graphtool/graphs/graph.py

@@ -6 +6 @@
-from matplotlib.backends.backend_svg import FigureCanvasSVG
-from matplotlib.figure import Figure
-
+, FixedFormatter
-from matplotlib.backends.backend_svg import RendererSVG
-from matplotlib.patches import Wedge, Shadow, Rectangle, Polygon
@@ -22 +22 @@
-  'text_padding' : 3, #in pixels
-  'legend_padding' : .01, # In percent of screen space / 100
-.10,
+50, #in pixels
-  'width' : 800,  #in pixels
-  'height' : 500,
@@ -35 +35 @@
-  'square_axis' : False,
-  'watermark' : '$GRAPHTOOL_ROOT/static_content/CMSbwl3.png',
+  'fixed-height' : True
-}
-
@@ -267 +268 @@
-    height_inches = prefs['height'] / dpi
-
+    # Conversion from pixels to percentage of screen
+    figure_padding_perc = prefs['figure_padding'] / float(prefs['height'])
+
-    # Calculations for the legend
-    rows = 0.0; column_height = 0.0; bottom = 0.0
@@ -296 +300 @@
-    legend_rect = prefs['legend_padding'], prefs['legend_padding'], legend_width, legend_height
-    if prefs['square_axis']:
-prefs['figure_padding'], 1 - bottom - 2*prefs['figure_padding']
+figure_padding_perc, 1 - bottom - 2*figure_padding_perc
-      ax_rect = (.5 - min_size/2.0*prefs['height']/float(prefs['width']), 
-prefs['figure_padding']
+figure_padding_perc
-                 prefs['height']/float(prefs['width'])*min_size, 
-                 min_size )
-    else:
-prefs['figure_padding']
-prefs['figure_padding']
-prefs['figure_padding']
-prefs['figure_padding']
+figure_padding_perc
+figure_padding_perc
+figure_padding_perc
+figure_padding_perc
-
-    # Add a watermark:
@@ -345 +349 @@
-    # Creates a subtitle, if necessary 
-    title = title.split('\n',1)
-
-
-
-
+
+
+
+
+
+
-      ax.title.set_transform( ax.transAxes )
-      ax.title.set_clip_box( None )
-      ax._set_artist_props( ax.title )
-2
+ + prefs['text_padding']/ax_height_pix
-          verticalalignment='bottom',
-          horizontalalignment='center' )
@@ -463 +469 @@
-        # First, prepare the canvas to calculate all the necessary parts.
-        super( HorizontalGraph, self ).prepare_canvas()
-['fixed']
+.get('fixed-height',True)
-            # Then, we re-calculate the heights based on number of labels.
-            labels = getattr( self, 'labels', [] )
-            height = self.ax.get_position()[3]
-ure
-ure
+
+
-            height_pix = height * fig_height * dpi
-            num_labels = len(labels)
-            pixels_per_label = 2*self.prefs['text_padding'] + self.prefs['text_size']
-
-
-
+
+
+
+
+
-            # After we calculate the new height, prepare the canvas again.
-            super( HorizontalGraph, self ).prepare_canvas()
@@ -480 +488 @@
-    def y_formatter_cb(self, ax):
-        # y_vals should be the y-location of the labels.
+        labels = getattr( self, 'labels', [] )
-        y_vals =  numpy.arange(.5,len(labels)+.5,1)
-
@@ -489 +498 @@
-        ax.yaxis.set_major_locator( fl )
-        
+    def additional_vertical_padding(self): return 0
-
-    def write_graph(self):
-            # Calculate the spacing of the y-tick labels:
-
+
+
-            height_inches = self.fig.get_size_inches()[-1] * height_per
-            height_pixels = self.fig.get_dpi() * height_inches
-
+
+
+
-
-            # Adjust the font height to match the maximum available height
-            font_height = max_height_labels * 1.7 / 3.0 - 1.0
-            font_height = min( font_height, 7 )
-
-
-
+self.
+
+self.
-
-            total_xmax = 0
-
+self.
-                bbox = label.get_window_extent( self.canvas.get_renderer() )
-                total_xmax = max( bbox.xmax()-bbox.xmin(), total_xmax )
-                move_left = (total_xmax+6) / self.prefs['width']
-
-
+self.
-            pos[0] = move_left
-            pos[2] = 1 - pos[0] - .02
-
+
+
+
+
-        
-class DBGraph( Graph ):