[Python-modules-commits] [python-mplexporter] 48/135: Updated IPython notebook for plotly.

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-mplexporter.

commit 8c226ef32b4b8c3bb93b99924a173fac4bde29e4
Author: theengineear <andseier at gmail.com>
Date:   Tue Feb 25 00:15:07 2014 -0800

    Updated IPython notebook for plotly.
---
 notebooks/PlotlyTest.ipynb | 56 ++++++++++++++--------------------------------
 1 file changed, 17 insertions(+), 39 deletions(-)

diff --git a/notebooks/PlotlyTest.ipynb b/notebooks/PlotlyTest.ipynb
index 32b926e..030bc09 100644
--- a/notebooks/PlotlyTest.ipynb
+++ b/notebooks/PlotlyTest.ipynb
@@ -36,10 +36,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-<<<<<<< HEAD
      "prompt_number": 1
-=======
-     "prompt_number": 20
     },
     {
      "cell_type": "heading",
@@ -48,7 +45,6 @@
      "source": [
       "You can use the IPython.Demo username for now, or switch this for your own Plotly username and api_key. Don't have a username? You might try finding one at: https://plot.ly/"
      ]
->>>>>>> ipynb
     },
     {
      "cell_type": "code",
@@ -60,10 +56,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-<<<<<<< HEAD
      "prompt_number": 2
-=======
-     "prompt_number": 21
     },
     {
      "cell_type": "heading",
@@ -72,7 +65,6 @@
      "source": [
       "Here we instantiate a matplotlib figure object and fill it with stuff we want to plot! IPython's matplotlib magic function will pop it inline after you run the code block."
      ]
->>>>>>> ipynb
     },
     {
      "cell_type": "code",
@@ -94,21 +86,22 @@
      "outputs": [
       {
        "metadata": {},
+       "output_type": "pyout",
+       "prompt_number": 3,
+       "text": [
+        "<matplotlib.text.Text at 0x11218d890>"
+       ]
+      },
+      {
+       "metadata": {},
        "output_type": "display_data",
        "png": "iVBORw0KGgoAAAANSUhEUgAAAY0AAAEZCAYAAABrUHmEAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz\nAAALEgAACxIB0t1+/AAAIABJREFUeJzt3XtcFdXaB/DfRvCOgKiEwAndeBRFETMVfRW0EEQlu6m9\nnaOmmaV5qc57NNC8lL6a1ZuXjpnlpZOV5fHKxcwS9KSItyNeUUgNUFATRVFDYb1/DCCXvdnD3nNZ\nM/N8P5/94bJnzzyz1mIWM7PWMybGGAMhhBAigpPaARBCCNEO6jQIIYSIRp0GIYQQ0ajTIIQQIhp1\nGoQQQkSjToMQQoho1GkQwpG9e/eiQ4cOaodBiFXUaRBD8ff3x88//wwAWLt2Lfr27Vvl/TFjxmDd\nunWyxnDy5EkMHDgQnp6e8PDwQPfu3ZGUlAQA6Nu3L86cOSPr9glxhLPaARCiJJPJ5ND7Uhg6dCgm\nTZqExMREM [...]
        "text": [
-<<<<<<< HEAD
-        "<matplotlib.figure.Figure at 0x1062a6710>"
+        "<matplotlib.figure.Figure at 0x112184bd0>"
        ]
       }
      ],
      "prompt_number": 3
-=======
-        "<matplotlib.figure.Figure at 0x10b4413d0>"
-       ]
-      }
-     ],
-     "prompt_number": 30
     },
     {
      "cell_type": "heading",
@@ -119,7 +112,6 @@
       "\n",
       "Note how you can zoom, pan, autoscale, and see data points by hovering. The data you plotted is right there. If you want to change the style, layout, etc. on plotly, you can click the link below the plot."
      ]
->>>>>>> ipynb
     },
     {
      "cell_type": "code",
@@ -132,30 +124,17 @@
      "outputs": [
       {
        "html": [
-<<<<<<< HEAD
-        "<iframe height=\"500\" id=\"igraph\" scrolling=\"no\" seamless=\"seamless\" src=\"https://plot.ly/~IPython.Demo/1249/600/450\" width=\"650\"></iframe>"
+        "<iframe height=\"500\" id=\"igraph\" scrolling=\"no\" seamless=\"seamless\" src=\"https://plot.ly/~IPython.Demo/1263/600/450\" width=\"650\"></iframe>"
        ],
        "metadata": {},
        "output_type": "pyout",
        "prompt_number": 4,
        "text": [
-        "<IPython.core.display.HTML at 0x10629dcd0>"
+        "<IPython.core.display.HTML at 0x11217dfd0>"
        ]
       }
      ],
      "prompt_number": 4
-=======
-        "<iframe height=\"500\" id=\"igraph\" scrolling=\"no\" seamless=\"seamless\" src=\"https://plot.ly/~IPython.Demo/1261/600/450\" width=\"650\"></iframe>"
-       ],
-       "metadata": {},
-       "output_type": "pyout",
-       "prompt_number": 31,
-       "text": [
-        "<IPython.core.display.HTML at 0x10b47ea10>"
-       ]
-      }
-     ],
-     "prompt_number": 31
     },
     {
      "cell_type": "heading",
@@ -191,11 +170,11 @@
        "output_type": "display_data",
        "png": "iVBORw0KGgoAAAANSUhEUgAAAXcAAAEACAYAAABI5zaHAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz\nAAALEgAACxIB0t1+/AAAIABJREFUeJztnXtc1HX2/18odFELQwUSMJT7iMKYSda6oYgmBrnrpTCV\n1KzN3bx8d7fMfbRqv0L6umVaq13WXLQU+1qrZkppcVuFMEWzSEGFBARK0BTRQOb8/phm5DL3ec9n\nPp+Z83w8eMDMfD7v9+Gc+Zw5cz7nvN8eRERgGIZhXIpuzhaAYRiGEQ87d4ZhGBeEnTvDMIwLws6d\nYRjGBWHnzjAM44Kwc2cYhnFBrHLuc+bMgZ+fH4YMGaJ/rrGxEYmJiQgPD8e4ceNw8eJF4UIyDMMw\n1mGVc589ezays7M7PJeRkYHExESUlZUhISEBGRkZQgVkGIZhrMfD2iamyspKJCcn4/jx4wCAyMhI\n5OXlwc/PD [...]
        "text": [
-        "<matplotlib.figure.Figure at 0x10b1f7290>"
+        "<matplotlib.figure.Figure at 0x1121e5d50>"
        ]
       }
      ],
-     "prompt_number": 26
+     "prompt_number": 5
     },
     {
      "cell_type": "heading",
@@ -204,7 +183,6 @@
      "source": [
       "Again, a simple line of code sends the above figure to Plotly and it responds by sticking back into this notebook."
      ]
->>>>>>> ipynb
     },
     {
      "cell_type": "code",
@@ -217,17 +195,17 @@
      "outputs": [
       {
        "html": [
-        "<iframe height=\"500\" id=\"igraph\" scrolling=\"no\" seamless=\"seamless\" src=\"https://plot.ly/~IPython.Demo/1262/600/450\" width=\"650\"></iframe>"
+        "<iframe height=\"500\" id=\"igraph\" scrolling=\"no\" seamless=\"seamless\" src=\"https://plot.ly/~IPython.Demo/1264/600/450\" width=\"650\"></iframe>"
        ],
        "metadata": {},
        "output_type": "pyout",
-       "prompt_number": 32,
+       "prompt_number": 6,
        "text": [
-        "<IPython.core.display.HTML at 0x10b3ea690>"
+        "<IPython.core.display.HTML at 0x1121e4310>"
        ]
       }
      ],
-     "prompt_number": 32
+     "prompt_number": 6
     },
     {
      "cell_type": "heading",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-mplexporter.git