Merge pull request bqplot#164 from SylvainCorlay/Update-WOF

Use Play Widget

Author: dmadeka

examples/Applications/Wealth of Nations.ipynb

@@ -15,16 +15,16 @@
    },
    "outputs": [],
    "source": [
-    "# Required imports\n",
     "import pandas as pd\n",
-    "from bqplot import (LogScale, LinearScale, OrdinalColorScale, ColorAxis,\n",
-    "                    Axis, Scatter, Lines, CATEGORY10, Label, Figure)\n",
-    "from bqplot.default_tooltip import Tooltip\n",
-    "from ipywidgets import VBox, IntSlider, Button\n",
-    "from IPython.display import display\n",
-    "import os\n",
     "import numpy as np\n",
-    "from time import sleep"
+    "import os\n",
+    "\n",
+    "from bqplot import (\n",
+    "    LogScale, LinearScale, OrdinalColorScale, ColorAxis,\n",
+    "    Axis, Scatter, Lines, CATEGORY10, Label, Figure, Tooltip\n",
+    ")\n",
+    "\n",
+    "from ipywidgets import VBox, IntSlider, Play, jsdlink"
    ]
   },
   {
@@ -35,7 +35,6 @@
    },
    "outputs": [],
    "source": [
-    "# The GUI starts with this year\n",
     "initial_year = 1800"
    ]
   },
@@ -197,8 +196,8 @@
    },
    "outputs": [],
    "source": [
-    "ax_y = Axis(label='Life Expectancy', scale=y_sc, orientation='vertical', side='left')\n",
-    "ax_x = Axis(label='Income per Capita', scale=x_sc)"
+    "ax_y = Axis(label='Life Expectancy', scale=y_sc, orientation='vertical', side='left', grid_lines='solid')\n",
+    "ax_x = Axis(label='Income per Capita', scale=x_sc, grid_lines='solid')"
    ]
   },
   {
@@ -256,6 +255,17 @@
     "#### Creating the Figure"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": [
+    "time_interval = 50"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -265,8 +275,7 @@
    "outputs": [],
    "source": [
     "fig = Figure(marks=[wealth_scat, year_label, nation_line], axes=[ax_x, ax_y],\n",
-    "             title='Health and Wealth of Nations', background_style={'fill': 'White'},\n",
-    "             animation_duration=100)"
+    "             title='Health and Wealth of Nations', animation_duration=time_interval)"
    ]
   },
   {
@@ -289,17 +298,6 @@
     "year_slider = IntSlider(min=1800, max=2008, step=1, description='Year', value=initial_year)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": [
-    "animate_button = Button(description='Play', background_color='MediumSeaGreen', color='Black', icon='fa-play')"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -341,38 +339,30 @@
    },
    "outputs": [],
    "source": [
-    "def year_changed(values):\n",
+    "def year_changed(new):\n",
     "    wealth_scat.x, wealth_scat.y, wealth_scat.size = get_data(year_slider.value)\n",
     "    year_label.text = str(year_slider.value)\n",
-    "    \n",
+    "\n",
     "year_slider.observe(year_changed, 'value')"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "#### Defining the callback for the button\n",
-    "\n",
-    "When the `Button` is clicked, we trigger the animation by changing the slider value through all the years for which data is available. The change in the `Slider` value triggers a change in the plot."
+    "#### Add an animation button"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": null,
    "metadata": {
-    "collapsed": true
+    "collapsed": false
    },
    "outputs": [],
    "source": [
-    "def button_clicked(value):\n",
-    "    animate_button.visible = False\n",
-    "    for i in range(1800, 2009, 1):\n",
-    "        year_slider.value = i\n",
-    "        sleep(0.05)\n",
-    "    animate_button.visible = True\n",
-    "\n",
-    "animate_button.on_click(button_clicked)"
+    "play_button = Play(min=1800, max=2008, interval=time_interval)\n",
+    "jsdlink((play_button, 'value'), (year_slider, 'value'))"
    ]
   },
   {
@@ -391,7 +381,7 @@
    },
    "outputs": [],
    "source": [
-    "display(VBox([animate_button, fig, year_slider]))"
+    "VBox([play_button, fig, year_slider])"
    ]
   }
  ],

setup.py

@@ -173,7 +173,7 @@ def run(self):
         ]),
     ],
     'install_requires': [
-        'ipywidgets>=5.0.0',
+        'ipywidgets>=5.2.0',
         'numpy',
         'pandas'],
     'packages': find_packages(),
@@ -205,6 +205,7 @@ def run(self):
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ],
 }