Merge pull request #433 from NCAR/viz_update

Unpinning -Viz and Related Changes

Gallery/Animations/NCL_animate_1.py

@@ -23,7 +23,7 @@
 from matplotlib import pyplot as plt
 
 import geocat.datafiles as gdf
-import geocat.viz.util as gvutil
+import geocat.viz as gv
 
 ###############################################################################
 # Read in data:
@@ -44,17 +44,17 @@
 ax.set_extent([-180, 180, -90, 90], ccrs.PlateCarree())
 
 # Use geocat.viz.util convenience function to set axes limits & tick values
-gvutil.set_axes_limits_and_ticks(ax,
-                                 xlim=(-180, 180),
-                                 ylim=(-90, 90),
-                                 xticks=np.linspace(-180, 180, 13),
-                                 yticks=np.linspace(-90, 90, 7))
+gv.set_axes_limits_and_ticks(ax,
+                             xlim=(-180, 180),
+                             ylim=(-90, 90),
+                             xticks=np.linspace(-180, 180, 13),
+                             yticks=np.linspace(-90, 90, 7))
 
 # Use geocat.viz.util convenience function to add minor and major tick lines
-gvutil.add_major_minor_ticks(ax, labelsize=10)
+gv.add_major_minor_ticks(ax, labelsize=10)
 
 # Use geocat.viz.util convenience function to make latitude, longitude tick labels
-gvutil.add_lat_lon_ticklabels(ax)
+gv.add_lat_lon_ticklabels(ax)
 
 # create initial plot that establishes a colorbar
 tas[0, :, :].plot.contourf(ax=ax,
@@ -84,7 +84,7 @@ def animate(i):
         add_colorbar=False,
     )
 
-    gvutil.set_titles_and_labels(
+    gv.set_titles_and_labels(
         ax,
         maintitle="January Global Surface Temperature (K) - Day  " +
         str(tas.coords['time'].values[i])[:13],

Gallery/Bar/NCL_bar_1.py

@@ -19,7 +19,7 @@
 import matplotlib.pyplot as plt
 
 import geocat.datafiles as gdf
-from geocat.viz import util as gvutil
+import geocat.viz as gv
 
 ###############################################################################
 # Read in data:
@@ -60,19 +60,19 @@
        bottom=-1.75)
 
 # Use geocat.viz.util convenience function to add minor and major tick lines
-gvutil.add_major_minor_ticks(ax,
-                             x_minor_per_major=4,
-                             y_minor_per_major=5,
-                             labelsize=20)
+gv.add_major_minor_ticks(ax,
+                         x_minor_per_major=4,
+                         y_minor_per_major=5,
+                         labelsize=20)
 
 # Use geocat.viz.util convenience function to set axes parameters
-gvutil.set_axes_limits_and_ticks(ax,
-                                 yticks=np.arange(-2.0, 2.0, 0.5),
-                                 xlim=(date_frac[40], date_frac[-16]),
-                                 xticks=np.linspace(1900, 1980, 5))
+gv.set_axes_limits_and_ticks(ax,
+                             yticks=np.arange(-2.0, 2.0, 0.5),
+                             xlim=(date_frac[40], date_frac[-16]),
+                             xticks=np.linspace(1900, 1980, 5))
 
 # Use geocat.viz.util convenience function to set titles and labels
-gvutil.set_titles_and_labels(ax, maintitle="Bar plot", maintitlefontsize=30)
+gv.set_titles_and_labels(ax, maintitle="Bar plot", maintitlefontsize=30)
 
 # Draw plot on the screen
 plt.tight_layout()
@@ -106,21 +106,21 @@
 ax.fill_between(xs, 0, ys, color='white')
 
 # Use geocat.viz.util convenience function to add minor and major tick lines
-gvutil.add_major_minor_ticks(ax,
-                             x_minor_per_major=4,
-                             y_minor_per_major=5,
-                             labelsize=20)
+gv.add_major_minor_ticks(ax,
+                         x_minor_per_major=4,
+                         y_minor_per_major=5,
+                         labelsize=20)
 
 # Use geocat.viz.util convenience function to set axes parameters
-gvutil.set_axes_limits_and_ticks(ax,
-                                 yticks=np.arange(-2.0, 2.0, 0.5),
-                                 xlim=(1880, 2000),
-                                 xticks=np.linspace(1880, 2000, 7))
+gv.set_axes_limits_and_ticks(ax,
+                             yticks=np.arange(-2.0, 2.0, 0.5),
+                             xlim=(1880, 2000),
+                             xticks=np.linspace(1880, 2000, 7))
 
 # Use geocat.viz.util convenience function to set titles and labels
-gvutil.set_titles_and_labels(ax,
-                             maintitle="Bar plot with outlines",
-                             maintitlefontsize=30)
+gv.set_titles_and_labels(ax,
+                         maintitle="Bar plot with outlines",
+                         maintitlefontsize=30)
 
 # Draw plot on the screen
 plt.tight_layout()
@@ -143,21 +143,21 @@
        linewidth=.5)
 
 # Use geocat.viz.util convenience function to add minor and major tick lines
-gvutil.add_major_minor_ticks(ax,
-                             x_minor_per_major=4,
-                             y_minor_per_major=5,
-                             labelsize=20)
+gv.add_major_minor_ticks(ax,
+                         x_minor_per_major=4,
+                         y_minor_per_major=5,
+                         labelsize=20)
 
 # Use geocat.viz.util convenience function to set axes parameters
-gvutil.set_axes_limits_and_ticks(ax,
-                                 yticks=np.arange(-2.0, 2.0, 0.5),
-                                 xlim=(date_frac[40], date_frac[-16]),
-                                 xticks=np.linspace(1900, 1980, 5))
+gv.set_axes_limits_and_ticks(ax,
+                             yticks=np.arange(-2.0, 2.0, 0.5),
+                             xlim=(date_frac[40], date_frac[-16]),
+                             xticks=np.linspace(1900, 1980, 5))
 
 # Use geocat.viz.util convenience function to set titles and labels
-gvutil.set_titles_and_labels(ax,
-                             maintitle="Bar plot with a reference line",
-                             maintitlefontsize=30)
+gv.set_titles_and_labels(ax,
+                         maintitle="Bar plot with a reference line",
+                         maintitlefontsize=30)
 
 # Show the plot
 plt.tight_layout()

Gallery/Bar/NCL_bar_11.py

@@ -19,7 +19,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-import geocat.viz.util as gvutil
+import geocat.viz as gv
 
 ###############################################################################
 # Generate dummy data:
@@ -43,20 +43,20 @@
 for row in range(0, 2):
     for col in range(0, 2):
         # Use geocat.viz.util convenience function to set axes parameters
-        gvutil.set_axes_limits_and_ticks(axs[row][col],
-                                         ylim=(0.4, 1.2),
-                                         xticks=x,
-                                         yticks=np.arange(0.4, 1.4, 0.2),
-                                         xticklabels=months)
+        gv.set_axes_limits_and_ticks(axs[row][col],
+                                     ylim=(0.4, 1.2),
+                                     xticks=x,
+                                     yticks=np.arange(0.4, 1.4, 0.2),
+                                     xticklabels=months)
         # Use geocat.viz.util convenience function to add minor and major tick lines
-        gvutil.add_major_minor_ticks(axs[row][col],
-                                     x_minor_per_major=1,
-                                     y_minor_per_major=4,
-                                     labelsize=12)
+        gv.add_major_minor_ticks(axs[row][col],
+                                 x_minor_per_major=1,
+                                 y_minor_per_major=4,
+                                 labelsize=12)
         # Use geocat.viz.util convenience function to set titles and labels
-        gvutil.set_titles_and_labels(axs[row][col],
-                                     ylabel='(\u00B0C)',
-                                     labelfontsize=14)
+        gv.set_titles_and_labels(axs[row][col],
+                                 ylabel='(\u00B0C)',
+                                 labelfontsize=14)
 
         # Add overall figure title
         fig.suptitle('Paneling bar plots, dummy data', size=20, y=0.94)

Gallery/Bar/NCL_bar_14.py

@@ -18,7 +18,7 @@
 
 import numpy as np
 import matplotlib.pyplot as plt
-from geocat.viz import util as gvutil
+import geocat.viz as gv
 
 ###############################################################################
 # Generate data:
@@ -45,19 +45,19 @@
 plt.hlines(40, 0, 13, color="b", linewidth=1)
 
 # Use geocat.viz.util convenience function to add titles and set their size
-gvutil.set_titles_and_labels(ax,
-                             maintitle="XY curve over a bar chart",
-                             maintitlefontsize=16,
-                             ylabel="mm",
-                             labelfontsize=14)
+gv.set_titles_and_labels(ax,
+                         maintitle="XY curve over a bar chart",
+                         maintitlefontsize=16,
+                         ylabel="mm",
+                         labelfontsize=14)
 
 # Use geocat.viz.util convenience function to set axes tick values and labels
-gvutil.set_axes_limits_and_ticks(ax,
-                                 xticks=np.linspace(0, 12, 5),
-                                 xticklabels=np.linspace(0, 12, 5),
-                                 xlim=(0, 13),
-                                 yticks=np.linspace(0, 100, 6),
-                                 ylim=(0, 100))
+gv.set_axes_limits_and_ticks(ax,
+                             xticks=np.linspace(0, 12, 5),
+                             xticklabels=np.linspace(0, 12, 5),
+                             xlim=(0, 13),
+                             yticks=np.linspace(0, 100, 6),
+                             ylim=(0, 100))
 
 # Create the right axis
 axRHS = ax.twinx()
@@ -66,12 +66,12 @@
 axRHS.set_ylabel((u"\u00b0" + "C"), size=14, rotation=270, labelpad=25)
 
 # Use geocat.viz.util convenience function to set axes tick values and labels for the right axis
-gvutil.set_axes_limits_and_ticks(axRHS,
-                                 yticks=np.linspace(0, 100, 6),
-                                 yticklabels=np.linspace(0, 50, 6, dtype=int))
+gv.set_axes_limits_and_ticks(axRHS,
+                             yticks=np.linspace(0, 100, 6),
+                             yticklabels=np.linspace(0, 50, 6, dtype=int))
 
 # Use geocat.viz.util convenience function to add major and minor tick lines
-gvutil.add_major_minor_ticks(ax, x_minor_per_major=3, y_minor_per_major=4)
+gv.add_major_minor_ticks(ax, x_minor_per_major=3, y_minor_per_major=4)
 
 # Adjust tick and ticklabel sizes for each axis
 ax.tick_params(axis="x", size=12, labelsize=12)

Gallery/Bar/NCL_bar_2.py

@@ -21,7 +21,7 @@
 import numpy as np
 import xarray as xr
 
-from geocat.viz import util as gvutil
+import geocat.viz as gv
 import geocat.datafiles as gdf
 import matplotlib.pyplot as plt
 
@@ -61,24 +61,24 @@
         linewidth=.6)
 
 # Use geocat.viz.util convenience function to add minor and major tick lines
-gvutil.add_major_minor_ticks(ax,
-                             x_minor_per_major=4,
-                             y_minor_per_major=5,
-                             labelsize=20)
+gv.add_major_minor_ticks(ax,
+                         x_minor_per_major=4,
+                         y_minor_per_major=5,
+                         labelsize=20)
 
 # Use geocat.viz.util convenience function to set axes parameters
-gvutil.set_axes_limits_and_ticks(ax,
-                                 ylim=(-3, 3),
-                                 yticks=np.linspace(-3, 3, 7),
-                                 yticklabels=np.linspace(-3, 3, 7),
-                                 xlim=(date_frac[40], date_frac[-16]),
-                                 xticks=np.linspace(1900, 1980, 5))
+gv.set_axes_limits_and_ticks(ax,
+                             ylim=(-3, 3),
+                             yticks=np.linspace(-3, 3, 7),
+                             yticklabels=np.linspace(-3, 3, 7),
+                             xlim=(date_frac[40], date_frac[-16]),
+                             xticks=np.linspace(1900, 1980, 5))
 
 # Use geocat.viz.util convenience function to set titles and labels
-gvutil.set_titles_and_labels(ax,
-                             maintitle="Darwin Southern Oscillation Index",
-                             ylabel='Anomalies',
-                             maintitlefontsize=28,
-                             labelfontsize=20)
+gv.set_titles_and_labels(ax,
+                         maintitle="Darwin Southern Oscillation Index",
+                         ylabel='Anomalies',
+                         maintitlefontsize=28,
+                         labelfontsize=20)
 
 plt.show()

Gallery/Bar/NCL_bar_3.py

@@ -20,7 +20,7 @@
 import matplotlib.pyplot as plt
 
 import geocat.datafiles as gdf
-from geocat.viz import util as gvutil
+import geocat.viz as gv
 
 ###############################################################################
 # Read in data:
@@ -54,25 +54,25 @@
 plt.bar(date_frac[::8], dsoik[::8], color=colors, width=0.25)
 
 # Use geocat.viz.util convenience function to add minor and major tick lines
-gvutil.add_major_minor_ticks(ax,
-                             x_minor_per_major=4,
-                             y_minor_per_major=5,
-                             labelsize=16)
+gv.add_major_minor_ticks(ax,
+                         x_minor_per_major=4,
+                         y_minor_per_major=5,
+                         labelsize=16)
 
 # Use geocat.viz.util convenience function to set axes parameters
-gvutil.set_axes_limits_and_ticks(ax,
-                                 ylim=(-3, 3),
-                                 yticks=np.linspace(-3, 3, 7),
-                                 yticklabels=np.linspace(-3, 3, 7),
-                                 xlim=(date_frac[40], date_frac[-16]),
-                                 xticks=np.linspace(1900, 1980, 5))
+gv.set_axes_limits_and_ticks(ax,
+                             ylim=(-3, 3),
+                             yticks=np.linspace(-3, 3, 7),
+                             yticklabels=np.linspace(-3, 3, 7),
+                             xlim=(date_frac[40], date_frac[-16]),
+                             xticks=np.linspace(1900, 1980, 5))
 
 # Use geocat.viz.util convenience function to set titles and labels
-gvutil.set_titles_and_labels(ax,
-                             maintitle="Darwin Southern Oscillation Index",
-                             ylabel='Anomalies',
-                             maintitlefontsize=36,
-                             labelfontsize=20)
+gv.set_titles_and_labels(ax,
+                         maintitle="Darwin Southern Oscillation Index",
+                         ylabel='Anomalies',
+                         maintitlefontsize=36,
+                         labelfontsize=20)
 
 # Plot horizontal line as a reference
 plt.hlines(0, 1880, 2000, colors="black", linewidth=.6)

Gallery/Bar/NCL_bar_4.py

@@ -21,7 +21,7 @@
 import matplotlib.pyplot as plt
 
 import geocat.datafiles as gdf
-from geocat.viz import util as gvutil
+import geocat.viz as gv
 
 ###############################################################################
 # Read in data:
@@ -60,25 +60,25 @@
         width=8 / 12)
 
 # Use geocat.viz.util convenience function to add minor and major tick lines
-gvutil.add_major_minor_ticks(ax,
-                             x_minor_per_major=4,
-                             y_minor_per_major=5,
-                             labelsize=20)
+gv.add_major_minor_ticks(ax,
+                         x_minor_per_major=4,
+                         y_minor_per_major=5,
+                         labelsize=20)
 
 # Use geocat.viz.util convenience function to set axes parameters
-gvutil.set_axes_limits_and_ticks(ax,
-                                 ylim=(-3, 3),
-                                 yticks=np.linspace(-3, 3, 7),
-                                 yticklabels=np.linspace(-3, 3, 7),
-                                 xlim=(date_frac[40], date_frac[-16]),
-                                 xticks=np.linspace(1900, 1980, 5))
+gv.set_axes_limits_and_ticks(ax,
+                             ylim=(-3, 3),
+                             yticks=np.linspace(-3, 3, 7),
+                             yticklabels=np.linspace(-3, 3, 7),
+                             xlim=(date_frac[40], date_frac[-16]),
+                             xticks=np.linspace(1900, 1980, 5))
 
 # Use geocat.viz.util convenience function to set titles and labels
-gvutil.set_titles_and_labels(ax,
-                             maintitle="Darwin Southern Oscillation Index",
-                             ylabel='Anomalies',
-                             maintitlefontsize=28,
-                             labelfontsize=20)
+gv.set_titles_and_labels(ax,
+                         maintitle="Darwin Southern Oscillation Index",
+                         ylabel='Anomalies',
+                         maintitlefontsize=28,
+                         labelfontsize=20)
 
 plt.tight_layout()
 plt.show()