这是indexloc提供的服务，不要输入任何密码
Skip to content

Feature/xplot docs #529

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Oct 14, 2019
Merged

Feature/xplot docs #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3eed8a2
use formatter mime type
colombod Oct 10, 2019
0898278
add svg tags
colombod Oct 10, 2019
fd7efe6
working on samples
colombod Oct 10, 2019
b5e0ecb
updated
colombod Oct 10, 2019
d746546
merging new examples on xplot usage
colombod Oct 14, 2019
d35ef08
re run notebook
colombod Oct 14, 2019
5aa369e
updated example
colombod Oct 14, 2019
94f027d
wip
colombod Oct 14, 2019
93121df
updated example
colombod Oct 14, 2019
38947ae
Brett did magic and I went happy about it big time
colombod Oct 14, 2019
8642bfa
add svg to f# pocket view to align it with c#
colombod Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Microsoft.DotNet.Interactive.FSharp/FSharpPocketViewTags.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ module FSharpPocketViewTags =
let strong = f "strong"
let sub = f "sub"
let sup = f "sup"
let svg = f "svg"
let table = f "table"
let tbody = f "tbody"
let td = f "td"
Expand Down
1 change: 1 addition & 0 deletions Microsoft.DotNet.Interactive.Rendering/PocketViewTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public static class PocketViewTags
public static dynamic strong => _.strong;
public static dynamic sub => _.sub;
public static dynamic sup => _.sup;
public static dynamic svg => _.svg;
public static dynamic table => _.table;
public static dynamic tbody => _.tbody;
public static dynamic td => _.td;
Expand Down
771 changes: 750 additions & 21 deletions NotebookExamples/csharp/Docs/Plotting with Xplot.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

876 changes: 876 additions & 0 deletions NotebookExamples/fsharp/Docs/Plotting with Xplot.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 8 additions & 6 deletions XPlot.DotNet.Interactive.KernelExtensions/XPlotKernelExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ public class XPlotKernelExtension : IKernelExtension
{
public Task OnLoadAsync(IKernel kernel)
{
Formatter<PlotlyChart>.Register((chart, writer) =>
{
writer.Write(GetChartHtml(chart));
}, "text/html");
Formatter<PlotlyChart>.Register(
(chart, writer) =>
{
writer.Write(GetChartHtml(chart));
},
HtmlFormatter.MimeType);

return Task.CompletedTask;
}
Expand All @@ -31,13 +33,13 @@ public string GetChartHtml(PlotlyChart chart)
var scriptNode = document.DocumentNode.SelectSingleNode("//script");

var newHtmlDocument = new HtmlDocument();

newHtmlDocument.DocumentNode.ChildNodes.Add(divNode);
newHtmlDocument.DocumentNode.ChildNodes.Add(GetScriptNodeWithRequire(scriptNode));

return newHtmlDocument.DocumentNode.WriteContentTo();
}


private static HtmlNode GetScriptNodeWithRequire(HtmlNode scriptNode)
{
Expand Down