fix plotly aspect ratios

tdhopper · tdhopper · commit 1cb291ea3a9b · 2020-01-01T14:30:11.000-05:00
diff --git a/Examples.ipynb b/Examples.ipynb
@@ -396,7 +396,7 @@
     "        'x' : mpg['cty'],\n",
     "})\n",
     "fig.add_trace(hist)\n",
-    "fig.show(renderer='png')"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -495,7 +495,7 @@
     "    'y' : mpg.hwy        \n",
     "})\n",
     "fig.add_trace(scatter)\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -634,7 +634,7 @@
     "fig.add_trace(p2)\n",
     "fig.add_trace(p3)\n",
     "fig.add_trace(p4)\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -764,7 +764,7 @@
     "    },\n",
     "    data=traces,\n",
     ")\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -867,7 +867,7 @@
     "        },\n",
     "    }\n",
     ")\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -950,7 +950,7 @@
    "outputs": [],
    "source": [
     "fig = figure_factory.create_facet_grid(df=mpg, x=\"displ\", y=\"cty\", facet_col=\"class\")\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -1037,7 +1037,7 @@
     "                          y = 'cty',\n",
     "                          facet_col = 'cyl',\n",
     "                          facet_row = 'drv')\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -1140,7 +1140,7 @@
     "        }\n",
     "    }\n",
     "})\n",
-    "fig.show(renderer='png')\n"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -1227,7 +1227,7 @@
     "        },        \n",
     "    }\n",
     "})\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -1314,7 +1314,7 @@
     "        },        \n",
     "    }\n",
     "})\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -1421,8 +1421,7 @@
     "                           )\n",
     "for d in fig['data']:\n",
     "    d.update({'fill' : 'tozeroy'})\n",
-    "\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   },
   {
@@ -1492,7 +1491,7 @@
     "    'y' : ts.value\n",
     "})\n",
     "fig.add_trace(scatter)\n",
-    "fig.show(renderer=\"png\")"
+    "Image(fig.to_image(format=\"png\", width=900, height=900))"
    ]
   }
  ],
diff --git a/render.py b/render.py
@@ -67,7 +67,7 @@ def image_from_cell(cell):
 def source_from_cell(cell):
     source = "".join(cell['source']).strip()
     source = source.replace(";", "")
-    source = source.replace("Image(export_png(p))", "") # remove bokeh render
+    source = re.sub(r"^Image\(.*\)", "", source) # remove bokeh render
     if "%%R" in source:
         source = '\n'.join(source.split('\n')[1:])
     else:

Original file line number	Diff line number	Diff line change
`@@ -396,7 +396,7 @@`
`396`	`396`	`" 'x' : mpg['cty'],\n",`
`397`	`397`	`"})\n",`
`398`	`398`	`"fig.add_trace(hist)\n",`
`399`		`- "fig.show(renderer='png')"`
	`399`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`400`	`400`	`]`
`401`	`401`	`},`
`402`	`402`	`{`
`@@ -495,7 +495,7 @@`
`495`	`495`	`" 'y' : mpg.hwy \n",`
`496`	`496`	`"})\n",`
`497`	`497`	`"fig.add_trace(scatter)\n",`
`498`		`- "fig.show(renderer=\"png\")"`
	`498`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`499`	`499`	`]`
`500`	`500`	`},`
`501`	`501`	`{`
`@@ -634,7 +634,7 @@`
`634`	`634`	`"fig.add_trace(p2)\n",`
`635`	`635`	`"fig.add_trace(p3)\n",`
`636`	`636`	`"fig.add_trace(p4)\n",`
`637`		`- "fig.show(renderer=\"png\")"`
	`637`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`638`	`638`	`]`
`639`	`639`	`},`
`640`	`640`	`{`
`@@ -764,7 +764,7 @@`
`764`	`764`	`" },\n",`
`765`	`765`	`" data=traces,\n",`
`766`	`766`	`")\n",`
`767`		`- "fig.show(renderer=\"png\")"`
	`767`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`768`	`768`	`]`
`769`	`769`	`},`
`770`	`770`	`{`
`@@ -867,7 +867,7 @@`
`867`	`867`	`" },\n",`
`868`	`868`	`" }\n",`
`869`	`869`	`")\n",`
`870`		`- "fig.show(renderer=\"png\")"`
	`870`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`871`	`871`	`]`
`872`	`872`	`},`
`873`	`873`	`{`
`@@ -950,7 +950,7 @@`
`950`	`950`	`"outputs": [],`
`951`	`951`	`"source": [`
`952`	`952`	`"fig = figure_factory.create_facet_grid(df=mpg, x=\"displ\", y=\"cty\", facet_col=\"class\")\n",`
`953`		`- "fig.show(renderer=\"png\")"`
	`953`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`954`	`954`	`]`
`955`	`955`	`},`
`956`	`956`	`{`
`@@ -1037,7 +1037,7 @@`
`1037`	`1037`	`" y = 'cty',\n",`
`1038`	`1038`	`" facet_col = 'cyl',\n",`
`1039`	`1039`	`" facet_row = 'drv')\n",`
`1040`		`- "fig.show(renderer=\"png\")"`
	`1040`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`1041`	`1041`	`]`
`1042`	`1042`	`},`
`1043`	`1043`	`{`
`@@ -1140,7 +1140,7 @@`
`1140`	`1140`	`" }\n",`
`1141`	`1141`	`" }\n",`
`1142`	`1142`	`"})\n",`
`1143`		`- "fig.show(renderer='png')\n"`
	`1143`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`1144`	`1144`	`]`
`1145`	`1145`	`},`
`1146`	`1146`	`{`
`@@ -1227,7 +1227,7 @@`
`1227`	`1227`	`" }, \n",`
`1228`	`1228`	`" }\n",`
`1229`	`1229`	`"})\n",`
`1230`		`- "fig.show(renderer=\"png\")"`
	`1230`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`1231`	`1231`	`]`
`1232`	`1232`	`},`
`1233`	`1233`	`{`
`@@ -1314,7 +1314,7 @@`
`1314`	`1314`	`" }, \n",`
`1315`	`1315`	`" }\n",`
`1316`	`1316`	`"})\n",`
`1317`		`- "fig.show(renderer=\"png\")"`
	`1317`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`1318`	`1318`	`]`
`1319`	`1319`	`},`
`1320`	`1320`	`{`
`@@ -1421,8 +1421,7 @@`
`1421`	`1421`	`" )\n",`
`1422`	`1422`	`"for d in fig['data']:\n",`
`1423`	`1423`	`" d.update({'fill' : 'tozeroy'})\n",`
`1424`		`- "\n",`
`1425`		`- "fig.show(renderer=\"png\")"`
	`1424`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`1426`	`1425`	`]`
`1427`	`1426`	`},`
`1428`	`1427`	`{`
`@@ -1492,7 +1491,7 @@`
`1492`	`1491`	`" 'y' : ts.value\n",`
`1493`	`1492`	`"})\n",`
`1494`	`1493`	`"fig.add_trace(scatter)\n",`
`1495`		`- "fig.show(renderer=\"png\")"`
	`1494`	`+ "Image(fig.to_image(format=\"png\", width=900, height=900))"`
`1496`	`1495`	`]`
`1497`	`1496`	`}`
`1498`	`1497`	`],`