fix rc file defaults issue for docs; python 2.4 compliance for formlayout

jdh2358 · jdh2358 · commit f954a510002c · 2011-01-05T15:59:33.000Z
svn path=/branches/v1_0_maint/; revision=8889
diff --git a/doc/matplotlibrc b/doc/matplotlibrc
@@ -232,7 +232,7 @@ lines.linewidth   : 1.5     # line width in points
 
 ### FIGURE
 # See http://matplotlib.sourceforge.net/matplotlib.figure.html#Figure
-figure.figsize   : 6, 4    # figure size in inches
+figure.figsize   : 5.5, 4.5    # figure size in inches
 #figure.dpi       : 80      # figure dots per inch
 #figure.facecolor : 0.75    # figure facecolor; 0.75 is scalar gray
 #figure.edgecolor : white   # figure edgecolor
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -762,6 +762,7 @@ def rc_params(fail_on_error=False):
 
 # this is the instance used by the matplotlib classes
 rcParams = rc_params()
+rcParamsOrig = rcParams.copy()
 
 rcParamsDefault = RcParams([ (key, default) for key, (default, converter) in \
                     defaultParams.iteritems() ])
@@ -843,11 +844,19 @@ def rc(group, **kwargs):
 
 def rcdefaults():
     """
-    Restore the default rc params - the ones that were created at
-    matplotlib load time.
+    Restore the default rc params - these are not the params loaded by
+    the rc file, but mpl's internal params.  See rc_file_defaults for
+    reloading the default params from the rc file
     """
     rcParams.update(rcParamsDefault)
 
+def rc_file_defaults():
+    """
+    Restore the default rc params from the original matplotlib rc that
+    was loaded
+    """
+    rcParams.update(rcParamsOrig)
+
 _use_error_msg = """ This call to matplotlib.use() has no effect
 because the the backend has already been chosen;
 matplotlib.use() must be called *before* pylab, matplotlib.pyplot,
diff --git a/lib/matplotlib/backends/qt4_editor/formlayout.py b/lib/matplotlib/backends/qt4_editor/formlayout.py
@@ -272,7 +272,11 @@ def setup(self):
                 field.setCurrentIndex(selindex)
             elif isinstance(value, bool):
                 field = QCheckBox(self)
-                field.setCheckState(Qt.Checked if value else Qt.Unchecked)
+                if value:
+                    field.setCheckState(Qt.Checked)
+                else:
+                    field.setCheckedState(Qt.Unchecked)
+                               
             elif isinstance(value, float):
                 field = QLineEdit(repr(value), self)
             elif isinstance(value, int):
