Merge pull request #7298 from sirlittle/master

QuLogic · QuLogic · commit 4833e41de7e7 · 2016-10-18T17:00:40.000-04:00
Changed Examples for Pep8 Compliance
diff --git a/examples/axes_grid/demo_floating_axis.py b/examples/axes_grid/demo_floating_axis.py
@@ -1,30 +1,35 @@
 """
-An experimental support for curvilinear grid.
+Axis within rectangular frame
+
+The following code demonstrates how to put a floating
+polar curve within a rectangular box. In order to get
+a better sense of polar curves, please look at 
+demo_curvelinear_grid.py. 
 """
+import numpy as np
+import matplotlib.pyplot as plt
+import mpl_toolkits.axisartist.angle_helper as angle_helper
+from matplotlib.projections import PolarAxes
+from matplotlib.transforms import Affine2D
+from mpl_toolkits.axisartist import SubplotHost
+from mpl_toolkits.axisartist import GridHelperCurveLinear
 
 
 def curvelinear_test2(fig):
     """
     polar projection, but in a rectangular box.
     """
     global ax1
-    import numpy as np
-    import mpl_toolkits.axisartist.angle_helper as angle_helper
-    from matplotlib.projections import PolarAxes
-    from matplotlib.transforms import Affine2D
-
-    from mpl_toolkits.axisartist import SubplotHost
-
-    from mpl_toolkits.axisartist import GridHelperCurveLinear
-
     # see demo_curvelinear_grid.py for details
-    tr = Affine2D().scale(np.pi/180., 1.) + PolarAxes.PolarTransform()
+    tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform()
 
-    extreme_finder = angle_helper.ExtremeFinderCycle(20, 20,
+    extreme_finder = angle_helper.ExtremeFinderCycle(20,
+                                                     20,
                                                      lon_cycle=360,
                                                      lat_cycle=None,
                                                      lon_minmax=None,
-                                                     lat_minmax=(0, np.inf),
+                                                     lat_minmax=(0,
+                                                                 np.inf),
                                                      )
 
     grid_locator1 = angle_helper.LocatorDMS(12)
@@ -43,7 +48,6 @@ def curvelinear_test2(fig):
 
     # Now creates floating axis
 
-    #grid_helper = ax1.get_grid_helper()
     # floating axis whose first coordinate (theta) is fixed at 60
     ax1.axis["lat"] = axis = ax1.new_floating_axis(0, 60)
     axis.label.set_text(r"$\theta = 60^{\circ}$")
@@ -59,7 +63,6 @@ def curvelinear_test2(fig):
 
     ax1.grid(True)
 
-import matplotlib.pyplot as plt
 fig = plt.figure(1, figsize=(5, 5))
 fig.clf()
 
diff --git a/examples/axes_grid/demo_parasite_axes2.py b/examples/axes_grid/demo_parasite_axes2.py
@@ -1,45 +1,52 @@
+"""
+Parasite axis demo
+
+The following code is an example of a parasite axis.
+It aims to show a user how to plot multiple different values
+onto one single plot. Notice how in this example, par1 and
+par2 are both calling twinx meaning both are tied directly to
+the x-axis. From there, each of those two axis can behave
+separately from the each other, meaning they can take on
+seperate values from themselves as well as the x-axis.
+"""
 from mpl_toolkits.axes_grid1 import host_subplot
 import mpl_toolkits.axisartist as AA
 import matplotlib.pyplot as plt
 
-if 1:
+host = host_subplot(111, axes_class=AA.Axes)
+plt.subplots_adjust(right=0.75)
 
-    host = host_subplot(111, axes_class=AA.Axes)
-    plt.subplots_adjust(right=0.75)
+par1 = host.twinx()
+par2 = host.twinx()
 
-    par1 = host.twinx()
-    par2 = host.twinx()
+offset = 60
+new_fixed_axis = par2.get_grid_helper().new_fixed_axis
+par2.axis["right"] = new_fixed_axis(loc="right",
+                                    axes=par2,
+                                    offset=(offset, 0))
 
-    offset = 60
-    new_fixed_axis = par2.get_grid_helper().new_fixed_axis
-    par2.axis["right"] = new_fixed_axis(loc="right",
-                                        axes=par2,
-                                        offset=(offset, 0))
+par2.axis["right"].toggle(all=True)
 
-    par2.axis["right"].toggle(all=True)
+host.set_xlim(0, 2)
+host.set_ylim(0, 2)
 
-    host.set_xlim(0, 2)
-    host.set_ylim(0, 2)
+host.set_xlabel("Distance")
+host.set_ylabel("Density")
+par1.set_ylabel("Temperature")
+par2.set_ylabel("Velocity")
 
-    host.set_xlabel("Distance")
-    host.set_ylabel("Density")
-    par1.set_ylabel("Temperature")
-    par2.set_ylabel("Velocity")
+p1, = host.plot([0, 1, 2], [0, 1, 2], label="Density")
+p2, = par1.plot([0, 1, 2], [0, 3, 2], label="Temperature")
+p3, = par2.plot([0, 1, 2], [50, 30, 15], label="Velocity")
 
-    p1, = host.plot([0, 1, 2], [0, 1, 2], label="Density")
-    p2, = par1.plot([0, 1, 2], [0, 3, 2], label="Temperature")
-    p3, = par2.plot([0, 1, 2], [50, 30, 15], label="Velocity")
+par1.set_ylim(0, 4)
+par2.set_ylim(1, 65)
 
-    par1.set_ylim(0, 4)
-    par2.set_ylim(1, 65)
+host.legend()
 
-    host.legend()
+host.axis["left"].label.set_color(p1.get_color())
+par1.axis["right"].label.set_color(p2.get_color())
+par2.axis["right"].label.set_color(p3.get_color())
 
-    host.axis["left"].label.set_color(p1.get_color())
-    par1.axis["right"].label.set_color(p2.get_color())
-    par2.axis["right"].label.set_color(p3.get_color())
-
-    plt.draw()
-    plt.show()
-
-    #plt.savefig("Test")
+plt.draw()
+plt.show()
