Figure: Defer figure activation until plotting arguments are prepared (#4756)

Author: seisman

pygmt/src/basemap.py

@@ -140,8 +140,6 @@ def basemap(
     >>> fig.basemap(region="g", projection="H15c", frame=True)
     >>> fig.show()
     """
-    self._activate_figure()
-
     for name, value, recommendation in (
         ("map_scale", map_scale, "Figure.scalebar"),
         ("compass", compass, "Figure.magnetic_rose"),
@@ -172,5 +170,6 @@ def basemap(
     )
     aliasdict.merge(kwargs)
 
+    self._activate_figure()
     with Session() as lib:
         lib.call_module(module="basemap", args=build_arg_list(aliasdict))

pygmt/src/choropleth.py

@@ -101,8 +101,6 @@ def choropleth(
     >>> fig.colorbar(frame=True)
     >>> fig.show()
     """
-    self._activate_figure()
-
     aliasdict = AliasSystem(
         C=Alias(cmap, name="cmap"),
         I=Alias(intensity, name="intensity"),
@@ -121,6 +119,7 @@ def choropleth(
     # Force -G+z and -L to be set for choropleth
     aliasdict.update({"G": "+z", "L": True})
 
+    self._activate_figure()
     with Session() as lib:
         with lib.virtualfile_in(check_kind="vector", data=data) as vintbl:
             lib.call_module(

pygmt/src/coast.py

@@ -241,8 +241,6 @@ def coast(
     >>> # Show the plot
     >>> fig.show()
     """
-    self._activate_figure()
-
     if (
         kwargs.get("G", land) is None
         and kwargs.get("S", water) is None
@@ -295,5 +293,6 @@ def coast(
     )
     aliasdict.merge(kwargs)
 
+    self._activate_figure()
     with Session() as lib:
         lib.call_module(module="coast", args=build_arg_list(aliasdict))

pygmt/src/colorbar.py

@@ -480,8 +480,6 @@ def colorbar(
     >>> # Show the plot
     >>> fig.show()
     """
-    self._activate_figure()
-
     position = _parse_position(
         position,
         default=None,  # Use GMT's default behavior if position is not provided.
@@ -543,5 +541,6 @@ def colorbar(
     )
     aliasdict.merge(kwargs)
 
+    self._activate_figure()
     with Session() as lib:
         lib.call_module(module="colorbar", args=build_arg_list(aliasdict))

pygmt/src/contour.py

@@ -151,8 +151,6 @@ def contour(
     $perspective
     $transparency
     """
-    self._activate_figure()
-
     # Specify levels for contours or annotations.
     # One level is converted to a string with a trailing comma to separate it from
     # specifying an interval.
@@ -178,6 +176,7 @@ def contour(
     )
     aliasdict.merge(kwargs)
 
+    self._activate_figure()
     with Session() as lib:
         with lib.virtualfile_in(
             check_kind="vector", data=data, x=x, y=y, z=z, mincols=3

pygmt/src/directional_rose.py

@@ -82,8 +82,6 @@ def directional_rose(
     >>> fig.directional_rose()
     >>> fig.show()
     """
-    self._activate_figure()
-
     # The default position is set to "TR" since GMT 6.7.0, which has no default value
     # in GMT 6.6.0 and earlier versions.
     # TODO(GMT>6.6.0): Set 'default=None' after GMT 6.7.0.
@@ -109,5 +107,6 @@ def directional_rose(
         t=transparency,
     )
 
+    self._activate_figure()
     with Session() as lib:
         lib.call_module(module="basemap", args=build_arg_list(aliasdict))

pygmt/src/fill_between.py

@@ -113,7 +113,6 @@ def fill_between(
     ... )
     >>> fig.show()
     """
-    self._activate_figure()
     _x = np.atleast_1d(x)
     _y = np.atleast_1d(y)
     _y2 = np.atleast_1d(y2)
@@ -177,6 +176,7 @@ def fill_between(
         t=transparency,
     )
 
+    self._activate_figure()
     with Session() as lib:
         if _x2 is not None:
             with (

pygmt/src/grdcontour.py

@@ -156,8 +156,6 @@ def grdcontour(
     >>> # Show the plot
     >>> fig.show()
     """
-    self._activate_figure()
-
     # Specify levels for the annotation and levels parameters.
     # One level is converted to a string with a trailing comma to separate it from
     # specifying an interval.
@@ -180,6 +178,7 @@ def grdcontour(
     )
     aliasdict.merge(kwargs)
 
+    self._activate_figure()
     with Session() as lib:
         with lib.virtualfile_in(check_kind="raster", data=grid) as vingrd:
             lib.call_module(

pygmt/src/grdimage.py

@@ -175,8 +175,6 @@ def grdimage(
     >>> # show the plot
     >>> fig.show()
     """
-    self._activate_figure()
-
     # Do not support -A option
     if any(kwargs.get(arg) is not None for arg in ["A", "img_out"]):
         msg = (
@@ -200,6 +198,7 @@ def grdimage(
     )
     aliasdict.merge(kwargs)
 
+    self._activate_figure()
     with Session() as lib:
         with (
             lib.virtualfile_in(check_kind="raster", data=grid) as vingrd,

pygmt/src/grdview.py

@@ -291,8 +291,6 @@ def grdview(
     >>> # Show the plot
     >>> fig.show()
     """
-    self._activate_figure()
-
     # Enable 'plane' if 'facade_fill' or 'facade_pen' are set
     if plane is False and (facade_fill is not None or facade_pen is not None):
         plane = True
@@ -339,6 +337,7 @@ def grdview(
     )
     aliasdict.merge(kwargs)
 
+    self._activate_figure()
     with Session() as lib:
         with (
             lib.virtualfile_in(check_kind="raster", data=grid) as vingrd,