Added a Qt4Agg backend

ddale · ddale · commit 7e8b3159cf14 · 2006-06-29T14:27:47.000Z
svn path=/trunk/matplotlib/; revision=2529
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2006-06-29 Added a Qt4Agg backend. Thank you James Amundson - DSD
+
 2006-06-26 Fixed a usetex bug. On windows, usetex will prcess
            postscript output in the current directory rather than
            in a temp directory. This is due to the use of spaces 
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -466,9 +466,9 @@ def validate_int(s):
 
 def validate_backend(s, fail_on_err = True):
     s=s.lower()
-    backends = ['Agg2', 'Agg', 'Aqt', 'Cairo', 'CocoaAgg', 'EMF', 'GD', 'GDK', 'GTK',
-                'GTKAgg', 'GTKCairo', 'FltkAgg', 'Paint', 'Pdf', 'PS', 'QtAgg', 'SVG',
-                'Template', 'TkAgg', 'WX', 'WXAgg', ]
+    backends = ['Agg2', 'Agg', 'Aqt', 'Cairo', 'CocoaAgg', 'EMF', 'GD', 'GDK',
+                'GTK', 'GTKAgg', 'GTKCairo', 'FltkAgg', 'Paint', 'Pdf', 'PS',
+                'QtAgg', 'Qt4Agg', 'SVG', 'Template', 'TkAgg', 'WX', 'WXAgg']
     for i in backends:
         if s == i.lower(): return i
     if fail_on_err: raise ValueError('Backend must be %s, or %s'% \
@@ -797,16 +797,19 @@ def __call__(self, s):
     'polaraxes.grid'         : [True, validate_bool],   # display polar grid or not
 
     #legend properties
-    'legend.isaxes'	:	[True,validate_bool],
-    'legend.numpoints' 	:	[ 4,validate_int],      # the number of points in the legend line
+    'legend.isaxes'    :       [True,validate_bool],
+    'legend.numpoints'         :       [ 4,validate_int],      # the number of points in the legend line
     'legend.fontsize' : ["small",validate_fontsize],
-    'legend.pad' 	:	[ 0.2, validate_float],         # the fractional whitespace inside the legend border
-    'legend.markerscale' 	:	[ 0.6, validate_float],    # the relative size of legend markers vs. original
+    'legend.pad'       :       [ 0.2, validate_float],         # the fractional whitespace inside the legend border
+    'legend.markerscale'       :       [ 0.6, validate_float],    # the relative size of legend markers vs. original
+
+
     # the following dimensions are in axes coords
-    'legend.labelsep' 	:	[ 0.005, validate_float],    # the vertical space between the legend entries
-    'legend.handlelen' 	:	[ 0.05, validate_float],  # the length of the legend lines
-    'legend.handletextsep' 	:	[ 0.02, validate_float], # the space between the legend line and legend text
-    'legend.axespad' 	:	[ 0.02, validate_float], # the border between the axes and legend edge
+    'legend.labelsep'  :       [ 0.005, validate_float],    # the vertical space between the legend entries
+    'legend.handlelen'         :       [ 0.05, validate_float],  # the length of the legend lines
+    'legend.handletextsep'     :       [ 0.02, validate_float], # the space between the legend line and legend text
+    'legend.axespad'   :       [ 0.02, validate_float], # the border between the axes and legend edge
+
     'legend.shadow' : [ False, validate_bool ],
 
 
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -4,10 +4,10 @@
 __all__ = ['backend','show','draw_if_interactive',
            'new_figure_manager', 'backend_version']
 
-interactive_bk = ['GTK', 'GTKAgg', 'GTKCairo', 'FltkAgg', 'QtAgg', 'TkAgg', 
-                  'WX', 'WXAgg', 'CocoaAgg', 'Aqt']
+interactive_bk = ['GTK', 'GTKAgg', 'GTKCairo', 'FltkAgg', 'QtAgg', 'Qt4Agg', 
+                  'TkAgg', 'WX', 'WXAgg', 'CocoaAgg', 'Aqt']
 non_interactive_bk = ['Agg2', 'Agg', 'Cairo', 'EMF', 'GD', 'GDK', 'Paint', 
-		      'Pdf', 'PS', 'SVG', 'Template']
+                      'Pdf', 'PS', 'SVG', 'Template']
 all_backends = interactive_bk + non_interactive_bk
 
 backend = matplotlib.get_backend()
diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py
@@ -324,6 +324,7 @@ def set_history_buttons( self ):
 
 # set icon used when windows are minimized
 try:
+    # TODO: This is badly broken
     qt.window_set_default_icon_from_file (
         os.path.join( matplotlib.rcParams['datapath'], 'matplotlib.svg' ) )
 except:
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
diff --git a/lib/matplotlib/backends/backend_qt4agg.py b/lib/matplotlib/backends/backend_qt4agg.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2006-06-29 Added a Qt4Agg backend. Thank you James Amundson - DSD`
	`2`	`+`
`1`	`3`	`2006-06-26 Fixed a usetex bug. On windows, usetex will prcess`
`2`	`4`	`postscript output in the current directory rather than`
`3`	`5`	`in a temp directory. This is due to the use of spaces`