matplotlib
diff --git a/‎CHANGELOG
Lines changed: 5 additions & 0 deletions b/‎CHANGELOG
Lines changed: 5 additions & 0 deletions
diff --git a/‎lib/matplotlib/backends/backend_gdk.py
Lines changed: 8 additions & 4 deletions b/‎lib/matplotlib/backends/backend_gdk.py
Lines changed: 8 additions & 4 deletions
diff --git a/‎lib/matplotlib/backends/backend_template.py
Lines changed: 7 additions & 6 deletions b/‎lib/matplotlib/backends/backend_template.py
Lines changed: 7 additions & 6 deletions
@@ -1,5 +1,10 @@
 New entries should be added at the top
 
+2005-03-07 backend_gdk.py: remove PIXELS_PER_INCH from points_to_pixels(), but
+	   still use it to adjust font sizes. This allows the GTK version of
+           line_styles.py to more closely match GTKAgg, previously the markers
+           were being drawn too large. - SC
+
 2005-03-01 Added Eric's contourf routines
 
 2005-03-01 Added start of proper agg SWIG wrapper.  I would like to
 
@@ -28,7 +28,6 @@ def fn_name(): return sys._getframe(1).f_code.co_name
     raise SystemExit('PyGTK version %d.%d.%d or greater is required to run the GTK Matplotlib backends'
                      % pygtk_version_required)
 
-#import gobject
 import gtk, pango
 from gtk import gdk
 if gtk.pygtk_version < pygtk_version_required:
@@ -43,7 +42,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 
 # the true dots per inch on the screen; should be display dependent
 # see http://groups.google.com/groups?q=screen+dpi+x11&hl=en&lr=&ie=UTF-8&oe=UTF-8&safe=off&selm=7077.26e81ad5%40swift.cs.tcd.ie&rnum=5 for some info about screen dpi
-PIXELS_PER_INCH = 96
+#PIXELS_PER_INCH = 96
 
 # Image formats that this backend supports - for FileChooser and print_figure()
 IMAGE_FORMAT          = ['eps', 'jpg', 'png', 'ps', 'svg'] + ['bmp'] # , 'raw', 'rgb']
@@ -318,6 +317,9 @@ def _get_pango_layout(self, s, prop):
         """
         Create a pango layout instance for Text 's' with properties 'prop'.
         Return - pango layout (from cache if already exists)
+
+        Note that pango assumes a logical DPI of 96
+        Ref: pango_font_description_set_size() manual page
         """
         # problem? - cache gets bigger and bigger, is never cleared out
         # two (not one) layouts are created for every text item s (then they are cached) - why?
@@ -327,7 +329,8 @@ def _get_pango_layout(self, s, prop):
         if value != None:
             return value
 
-        size = prop.get_size_in_points() * self.dpi.get() / PIXELS_PER_INCH
+        #size = prop.get_size_in_points() * self.dpi.get() / PIXELS_PER_INCH
+        size = prop.get_size_in_points() * self.dpi.get() / 96.0
         size = round(size)
 
         font_str = '%s, %s %i' % (prop.get_name(), prop.get_style(), size,)
@@ -365,7 +368,8 @@ def new_gc(self):
 
 
     def points_to_pixels(self, points):
-        return points * PIXELS_PER_INCH/72.0 * self.dpi.get()/72.0
+        #return points * PIXELS_PER_INCH/72.0 * self.dpi.get()/72.0
+        return points/72.0 * self.dpi.get()
 
 
 class GraphicsContextGDK(GraphicsContextBase):
 
@@ -90,13 +90,14 @@ def flipy(self):
 
     def points_to_pixels(self, points):
         """
-        Convert points to display units (as a float).
-        You need to override this function (unless your backend doesn't have
-        dpi, eg, postscript or svg).
-        Many imaging systems assume some value for pixels per inch.
-        points to pixels = points * pixels_per_inch/72.0 * dpi/72.0
+        Convert points to pixels (display units) as a float.
         """
-        return points  
+        # if backend doesn't have dpi, eg, postscript or svg
+        return points
+        # elif backend assumes a value for pixels_per_inch
+        #return points/72.0 * self.dpi.get() * pixels_per_inch/72.0
+        # else
+        #return points/72.0 * self.dpi.get()
 
     def draw_text(self, gc, x, y, s, prop, angle, ismath=False):    
         """