Update all notebooks to use new HoloViews options API (#86)

* Removed magics from landsat spectral clustering notebook * Removed magics from the Walker Lake notebook
holoviz-topics · Feb 1, 2019 · 91e5209 · 91e5209
1 parent 15e650b
commit 91e5209
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/examples/topics/Landsat_Spectral_Clustering.ipynb b/examples/topics/Landsat_Spectral_Clustering.ipynb
@@ -27,6 +27,7 @@
     "import numpy as np\n",
     "import xarray as xr\n",
     "import holoviews as hv\n",
+    "from holoviews import opts\n",
     "from holoviews.operation.datashader import regrid\n",
     "import cartopy.crs as ccrs\n",
     "import dask.array as da\n",
@@ -110,7 +111,16 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Image [invert_yaxis=True width=250 height=250 tools=['hover']] (cmap='viridis')\n",
+    "opts.defaults(\n",
+    "    opts.Image(invert_yaxis=True, width=250, height=250, tools=['hover'], cmap='viridis'))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
     "hv.Layout([regrid(hv.Image(band, kdims=['x', 'y'])) for band in bands[:3]])"
    ]
   },
@@ -120,7 +130,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Image [invert_yaxis=True width=250 height=250 tools=['hover']] (cmap='viridis')\n",
     "hv.Layout([regrid(hv.Image(band, kdims=['x', 'y'])) for band in bands[3:]])"
    ]
   },
@@ -223,8 +232,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Image [invert_yaxis=True width=250 height=250 tools=['hover']] (cmap='viridis')\n",
-    "hv.Layout([regrid(hv.Image(band, kdims=['x', 'y'])) for band in bands])"
+    "hv.Layout([regrid(hv.Image(band, kdims=['x', 'y'])) for band in bands]) "
    ]
   },
   {
@@ -233,7 +241,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Image [invert_yaxis=True width=250 height=250 tools=['hover']] (cmap='viridis')\n",
     "hv.Layout([regrid(hv.Image(band, kdims=['x', 'y'])) for band in bands[3:]])"
    ]
   },
@@ -243,7 +250,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Image [invert_yaxis=True width=250 height=250 tools=['hover']] (cmap='viridis')\n",
     "hv.Image(labels)"
    ]
   }

diff --git a/examples/topics/Walker_Lake.ipynb b/examples/topics/Walker_Lake.ipynb
@@ -26,6 +26,7 @@
     "import numpy as np\n",
     "import xarray as xr\n",
     "import holoviews as hv\n",
+    "from holoviews import opts\n",
     "import geoviews as gv\n",
     "import datashader as ds\n",
     "import cartopy.crs as ccrs\n",
@@ -186,7 +187,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%opts Image (cmap='viridis') [width=450 height=450 tools=['hover'] colorbar=True]"
+    "opts.defaults(\n",
+    "    opts.Curve(width=600, tools=['hover']),\n",
+    "    opts.Image(cmap='viridis', width=450, height=450, tools=['hover'], colorbar=True))"
    ]
   },
   {
@@ -280,7 +283,7 @@
     "difference = gv.Image(diff, crs=crs, kdims=['lon', 'lat'], vdims=['ndvi'])\n",
     "difference = difference.relabel('Difference in NDVI').redim(ndvi='delta_ndvi')\n",
     "\n",
-    "rasterize(difference).redim.range(delta_ndvi=(-1.0,1.0)).options(cmap=coolwarm)"
+    "rasterize(difference).redim.range(delta_ndvi=(-1.0,1.0)).opts(cmap=coolwarm)"
    ]
   },
   {
@@ -315,7 +318,6 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%%opts Curve [width=600 tools=['hover']]\n",
     "lon_y, lat_x = from_lon_lat(-118, 39) # Longitude of -118 and Latitude of 39\n",
     "(difference.sample(lat=lat_x) + difference.sample(lon=lon_y)).cols(1)"
    ]