diff --git a/docs/examples/interactive-plots.ipynb b/docs/examples/interactive-plots.ipynb
index 4786f4b..92cd36b 100644
--- a/docs/examples/interactive-plots.ipynb
+++ b/docs/examples/interactive-plots.ipynb
@@ -12,13 +12,20 @@
"\n",
"We will look at:\n",
"* Interactive plotting with Bokeh and Plotly\n",
- "* Adding interactive content to the page"
+ "* Adding interactive content to the page\n",
+ "\n",
+ "In this example we use explicitly define the page structure with `Section`, `Row`, and `Column` classes. \n",
+ "The same result can be achieved using square brackets and attributes to get and set items."
]
},
{
"cell_type": "code",
"execution_count": 1,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2021-05-31T10:48:32.543241Z",
+ "start_time": "2021-05-31T10:48:30.529143Z"
+ },
"colab": {
"base_uri": "https://localhost:8080/"
},
@@ -38,6 +45,10 @@
"cell_type": "code",
"execution_count": 2,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2021-05-31T10:48:33.565593Z",
+ "start_time": "2021-05-31T10:48:32.546227Z"
+ },
"id": "0Pzi4t5EsUlq"
},
"outputs": [],
@@ -53,7 +64,12 @@
{
"cell_type": "code",
"execution_count": 3,
- "metadata": {},
+ "metadata": {
+ "ExecuteTime": {
+ "end_time": "2021-05-31T10:48:33.584239Z",
+ "start_time": "2021-05-31T10:48:33.569419Z"
+ }
+ },
"outputs": [
{
"data": {
@@ -297,7 +313,7 @@
" document.body.appendChild(element);\n",
" }\n",
"\n",
- " const hashes = {\"https://cdn.bokeh.org/bokeh/release/bokeh-2.3.1.min.js\": \"YF85VygJKMVnHE+lLv2AM93Vbstr0yo2TbIu5v8se5Rq3UQAUmcuh4aaJwNlpKwa\", \"https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.3.1.min.js\": \"KKuas3gevv3PvrlkyCMzffFeaMq5we/a2QsP5AUoS3mJ0jmaCL7jirFJN3GoE/lM\", \"https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.3.1.min.js\": \"MK/uFc3YT18pkvvXRl66tTHjP0/dxoSH2e/eiNMFIguKlun2+WVqaPTWmUy/zvh4\"};\n",
+ " const hashes = {\"https://cdn.bokeh.org/bokeh/release/bokeh-2.3.2.min.js\": \"XypntL49z55iwGVUW4qsEu83zKL3XEcz0MjuGOQ9SlaaQ68X/g+k1FcioZi7oQAc\", \"https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.3.2.min.js\": \"bEsM86IHGDTLCS0Zod8a8WM6Y4+lafAL/eSiyQcuPzinmWNgNO2/olUF0Z2Dkn5i\", \"https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.3.2.min.js\": \"TX0gSQTdXTTeScqxj6PVQxTiRW8DOoGVwinyi1D3kxv7wuxQ02XkOxv0xwiypcAH\"};\n",
"\n",
" for (let i = 0; i < js_urls.length; i++) {\n",
" const url = js_urls[i];\n",
@@ -322,7 +338,7 @@
" }\n",
"\n",
" \n",
- " var js_urls = [\"https://cdn.bokeh.org/bokeh/release/bokeh-2.3.1.min.js\", \"https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.3.1.min.js\", \"https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.3.1.min.js\"];\n",
+ " var js_urls = [\"https://cdn.bokeh.org/bokeh/release/bokeh-2.3.2.min.js\", \"https://cdn.bokeh.org/bokeh/release/bokeh-widgets-2.3.2.min.js\", \"https://cdn.bokeh.org/bokeh/release/bokeh-tables-2.3.2.min.js\"];\n",
" var css_urls = [];\n",
" \n",
"\n",
@@ -368,7 +384,7 @@
" }\n",
"}(window));"
],
- "application/vnd.bokehjs_load.v0+json": "\n(function(root) {\n function now() {\n return new Date();\n }\n\n var force = true;\n\n if (typeof root._bokeh_onload_callbacks === \"undefined\" || force === true) {\n root._bokeh_onload_callbacks = [];\n root._bokeh_is_loading = undefined;\n }\n\n \n\n \n if (typeof (root._bokeh_timeout) === \"undefined\" || force === true) {\n root._bokeh_timeout = Date.now() + 5000;\n root._bokeh_failed_load = false;\n }\n\n var NB_LOAD_WARNING = {'data': {'text/html':\n \"Interactive Plots
\n", - "\n", - "\n",
- "
Bokeh
\n", - "\n", + "Interactive Plots
\n", + "Bokeh
\n", "\n",
"
\n",
- "
\n",
- " \n",
+ "
\n",
- "\n",
- "\n",
"
\n",
"The pandas-bokeh library offers \n", "convenient functions for producing interactive Bokeh plots with few lines of code.
\n", "Bokeh figures have a fixed width and height by default - we can override this behaviour\n", @@ -12161,13 +12209,9 @@ "\n", "
\n",
- "
\n",
- "
Line Plot with Range Slider
\n", - "\n", - "\n",
+ "
\n",
+ "\n",
- "\n",
- "
\n",
- " Line Plot with Range Slider
\n", + "\n",
"\n",
"\n",
- "\n",
+ "\n",
"
\n",
"\n",
- "
\n",
- "
\n",
- " Scatter Plot
\n", - "\n", - "\n",
+ "
\n",
+ "\n",
- "\n",
"
\n",
- "\n",
"Scatter Plot
\n", + "\n",
"\n",
"\n",
- "\n",
- "
\n",
+ "\n",
"\n",
- "
Plotly
\n", - "\n", + "Plotly
\n", "\n",
"
\n",
- "
\n",
- " \n",
+ "
\n",
- "\n",
- "\n",
"
\n",
"With the Plotly backend for Pandas \n",
"we can access the Plotly Express API directly from the .plot() method of any DataFrame or Series.
Plotly figures will expand to fill their container space by default. \n", @@ -12273,39 +12308,27 @@ "\n", "
\n",
- "
\n",
- "
Line Plot
\n", - "\n", - " \n",
- "
\n",
+ "\n",
+ "\n",
- " : Interactive Plots"
+ "{'Interactive Plots': [{'Bokeh': [{'Row 0': [{'Column 0': ['Markdown']}]},\n",
+ " {'Row 1': [{'Line Plot with Range Slider': ['FigureBokeh']}]},\n",
+ " {'Row 2': [{'Scatter Plot': ['FigureBokeh']}]}]},\n",
+ " {'Plotly': [{'Row 0': [{'Column 0': ['Markdown']}]},\n",
+ " {'Row 1': [{'Line Plot': ['FigurePlotly']}]},\n",
+ " {'Row 2': [{'Scatter Plot with Facet Columns': ['FigurePlotly']}]}]}]}"
]
},
"execution_count": 11,
@@ -12367,19 +12393,15 @@
"cell_type": "code",
"execution_count": 12,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2021-05-31T10:48:37.705421Z",
+ "start_time": "2021-05-31T10:48:37.278225Z"
+ },
"id": "05oH3hyt7Bvh"
},
"outputs": [],
"source": [
- "page_name = \"interactive-plots.html\"\n",
- "my_page.save(page_name)"
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "Check your current working directory for the finished report!"
+ "my_page.save_html(\"interactive-plots.html\")"
]
}
],
@@ -12389,6 +12411,7 @@
"name": "esparto-iris-example-colab.ipynb",
"provenance": []
},
+ "hide_input": false,
"kernelspec": {
"display_name": "Python 3",
"language": "python",
@@ -12405,6 +12428,48 @@
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.5"
+ },
+ "toc": {
+ "base_numbering": 1,
+ "nav_menu": {},
+ "number_sections": true,
+ "sideBar": true,
+ "skip_h1_title": false,
+ "title_cell": "Table of Contents",
+ "title_sidebar": "Contents",
+ "toc_cell": false,
+ "toc_position": {},
+ "toc_section_display": true,
+ "toc_window_display": false
+ },
+ "varInspector": {
+ "cols": {
+ "lenName": 16,
+ "lenType": 16,
+ "lenVar": 40
+ },
+ "kernels_config": {
+ "python": {
+ "delete_cmd_postfix": "",
+ "delete_cmd_prefix": "del ",
+ "library": "var_list.py",
+ "varRefreshCmd": "print(var_dic_list())"
+ },
+ "r": {
+ "delete_cmd_postfix": ") ",
+ "delete_cmd_prefix": "rm(",
+ "library": "var_list.r",
+ "varRefreshCmd": "cat(var_dic_list()) "
+ }
+ },
+ "types_to_exclude": [
+ "module",
+ "function",
+ "builtin_function_or_method",
+ "instance",
+ "_Feature"
+ ],
+ "window_display": false
}
},
"nbformat": 4,
diff --git a/docs/examples/iris-report.ipynb b/docs/examples/iris-report.ipynb
index 83fc6d8..edee22d 100644
--- a/docs/examples/iris-report.ipynb
+++ b/docs/examples/iris-report.ipynb
@@ -22,6 +22,10 @@
"cell_type": "code",
"execution_count": 1,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2021-05-31T10:41:33.237598Z",
+ "start_time": "2021-05-31T10:41:31.545068Z"
+ },
"colab": {
"base_uri": "https://localhost:8080/"
},
@@ -41,6 +45,10 @@
"cell_type": "code",
"execution_count": 2,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2021-05-31T10:41:34.504100Z",
+ "start_time": "2021-05-31T10:41:33.240646Z"
+ },
"id": "0Pzi4t5EsUlq"
},
"outputs": [],
@@ -57,13 +65,17 @@
"id": "oOOwzOnkJcPI"
},
"source": [
- "Before we start let's instantiate a Page object; we're not going to use this immediately but we'll need it later!"
+ "We start by instantiating a Page object that we will add content to."
]
},
{
"cell_type": "code",
"execution_count": 3,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2021-05-31T10:41:34.515156Z",
+ "start_time": "2021-05-31T10:41:34.508442Z"
+ },
"id": "-_DFIxBq6wa5"
},
"outputs": [],
@@ -86,6 +98,10 @@
"cell_type": "code",
"execution_count": 4,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2021-05-31T10:41:34.528089Z",
+ "start_time": "2021-05-31T10:41:34.521725Z"
+ },
"id": "DFK3Yy1P61aU"
},
"outputs": [],
@@ -107,13 +123,16 @@
"\"\"\"\n",
" \n",
"\n",
- "content_credit = \"\"\"\n",
- "_Retrieved from [Wikipedia](https://en.wikipedia.org/wiki/Iris_flower_data_set) on 2021-04-05_ \n",
- "_License: [CC-BY-SA-3.0](https://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License)_ \n",
- "\n",
- "\n",
- "_Photo of Iris Virginica by Eric Hunt_ \n",
- "_License: [CC-BY-SA-4.0](https://commons.wikimedia.org/wiki/Category:CC-BY-SA-4.0)_\n",
+ "credits = \"\"\"\\\n",
+ "\n",
+ "Text retrieved from [Wikipedia](https://en.wikipedia.org/wiki/Iris_flower_data_set) on 2021-04-05 \n",
+ "License: [CC-BY-SA-3.0](https://en.wikipedia.org/wiki/Wikipedia:Text_of_Creative_Commons_Attribution-ShareAlike_3.0_Unported_License) \n",
+ "\n",
+ " \n",
+ "\n",
+ "Photo of Iris Virginica by Eric Hunt \n",
+ "License: [CC-BY-SA-4.0](https://commons.wikimedia.org/wiki/Category:CC-BY-SA-4.0)\n",
+ "\n",
"\"\"\""
]
},
@@ -123,13 +142,18 @@
"id": "nb8AuPeqJcPM"
},
"source": [
- "In this example we wrap the markdown text in a Markdown object, although this could have been inferred if we added it directly to any Layout object."
+ "We can immediately add and view the rendered content by using the `>>` operator. `esparto` automatically converts strings\n",
+ "to Markdown, unless the string points to an image path."
]
},
{
"cell_type": "code",
"execution_count": 5,
"metadata": {
+ "ExecuteTime": {
+ "end_time": "2021-05-31T10:41:34.581327Z",
+ "start_time": "2021-05-31T10:41:34.531690Z"
+ },
"colab": {
"base_uri": "https://localhost:8080/",
"height": 313
@@ -153,6 +177,9 @@
"\n",
"\n",
"
Line Plot
\n", + " \n",
"
\n",
- "\n",
"\n",
- "
\n",
- " \n",
- " \n",
- " \n",
- " \n",
+ "\n",
+ "\n",
+ "\n",
+ "\n",
+ "\n",
"\n",
"\n"
],
@@ -12314,9 +12337,7 @@
]
},
"metadata": {
- "text/html": {
- "isolated": true
- }
+ "isolated": true
},
"output_type": "display_data"
},
@@ -12342,7 +12363,12 @@
{
"data": {
"text/plain": [
- "\n",
- "
\n",
- "\n",
"\n",
- "\n",
"Scatter Plot with Facet Columns
\n", - "\n", - " \n",
+ "
\n",
+ "\n",
- "\n",
"
\n",
- "\n",
"Scatter Plot with Facet Columns
\n", + " \n",
"
\n",
"\n",
+ "\n",
+ "
\n",
"\n",
"\n",
"Introduction
\n", + "\n",
+ "
\n",
+ "\n",
"
\n",
+ "\n",
"
\n",
"The Iris flower data set, or Fisher's Iris data set, is a multivariate data set introduced by \n", "the British statistician, eugenicist, and biologist Ronald Fisher in his 1936 paper \n", @@ -168,6 +195,9 @@ "\n", "