Remove hard FSCharting dependency #65

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
cgravill merged 8 commits into from
Sep 7, 2016
Merged

Remove hard FSCharting dependency #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
581a611
Initial rip out of FSCharting. Note that FSCharting.Gtk depends a loc…
npmurphy May 5, 2016
c023cfc
merge
npmurphy May 5, 2016
f2c3251
Merge branch 'xplot' into fscharting_ripout
npmurphy May 5, 2016
b863186
merge with jupyter branch
npmurphy May 6, 2016
eaf94b1
Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65
cgravill Sep 1, 2016
01704a9
Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65
cgravill Sep 1, 2016
03c1e84
Use Paket.Core.dll to get dependencies on install
cgravill Sep 1, 2016
07b1f27
Merge pull request #6 from fsprojects/pr/65
npmurphy Sep 6, 2016
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
130 changes: 109 additions & 21 deletions Feature Notebook format 4_0.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions paket.dependencies
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ nuget FSharp.Compiler.Service 3.0.0 framework: >= net451
nuget FSharp.Core.Microsoft.Signed 3.1.1.1 framework: >= net45
nuget NetMQ 3.3.3.1
nuget Newtonsoft.Json 5.0.8 framework: >= net45
nuget FSharp.Charting 0.90.5 framework: >= net45
nuget FAKE
nuget xUnit >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget Paket.Core >= 3.17.2
542 changes: 538 additions & 4 deletions paket.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/IfSharp.Kernel/App.fs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -244,6 +244,10 @@ module App =
printfn "Saving kernel icon [%s]" logo32File
IfSharpResources.ifsharp_32logo().Save(logo32File)

printfn "Installing dependencies via Paket"
let dependencies = Paket.Dependencies.Locate()
dependencies.Install(false)

if start then
(
printfn "Starting ipython..."
Expand Down
2 changes: 0 additions & 2 deletions src/IfSharp.Kernel/Globals.fs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@
/// This module provides access to common types and functions so the user can get intellisense
[<AutoOpen>]
module Globals =

type Chart = FSharp.Charting.Chart

type Util = IfSharp.Kernel.Util

Expand Down
857 changes: 849 additions & 8 deletions src/IfSharp.Kernel/IfSharp.Kernel.fsproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/IfSharp.Kernel/Include.fsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,8 @@
#r "System.Data.dll"
#r "System.Windows.Forms.DataVisualization.dll"
//#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead
#r "FSharp.Charting.dll"
#r "NetMQ.dll"

// open the global functions and methods
open FSharp.Charting
open IfSharp.Kernel
open IfSharp.Kernel.Globals
1 change: 0 additions & 1 deletion src/IfSharp.Kernel/MainTypes.fs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
namespace IfSharp.Kernel

open System.Collections.Generic
open FSharp.Charting

type ConnectionInformation =
{
Expand Down
56 changes: 13 additions & 43 deletions src/IfSharp.Kernel/Printers.fs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,29 +3,28 @@
open System
open System.Text
open System.Web
open System.Drawing
open System.Drawing.Imaging
open System.IO
open FSharp.Charting
//open System.Drawing
//open System.Drawing.Imaging
//open System.IO

module Printers =
module Printers =

let mutable internal displayPrinters : list<Type * (obj -> BinaryOutput)> = []

/// Convenience method for encoding a string within HTML
let internal htmlEncode(str) = HttpUtility.HtmlEncode(str)

/// Adds a custom display printer for extensibility
let internal addDisplayPrinter(printer : 'T -> BinaryOutput) =
let addDisplayPrinter(printer : 'T -> BinaryOutput) =
displayPrinters <- (typeof<'T>, (fun (x:obj) -> printer (unbox x))) :: displayPrinters

/// Default display printer
let internal defaultDisplayPrinter(x) =
let defaultDisplayPrinter(x) =
{ ContentType = "text/plain"; Data = sprintf "%A" x }

/// Finds a display printer based off of the type
let internal findDisplayPrinter(findType) =
let printers =
let findDisplayPrinter(findType) =
let printers =
displayPrinters
|> Seq.filter (fun (t, _) -> t.IsAssignableFrom(findType))
|> Seq.toList
Expand All@@ -36,39 +35,10 @@ module Printers =
(typeof<obj>, defaultDisplayPrinter)

/// Adds default display printers
let internal addDefaultDisplayPrinters() =

// add generic chart printer
addDisplayPrinter(fun (x:ChartTypes.GenericChart) ->
{ ContentType = "image/png"; Data = x.ToPng() }
)

// add chart printer
addDisplayPrinter(fun (x:GenericChartWithSize) ->
{ ContentType = "image/png"; Data = x.Chart.ToPng(x.Size) }
)

addDisplayPrinter(fun (x:GenericChartsWithSize) ->
let count = x.Charts.Length
let (width, height) = x.Size
let totalWidth = if count = 1 then width else width * x.Columns
let numRows = int (Math.Ceiling (float count / float x.Columns))
let totalHeight = numRows * height
let finalBitmap = new Bitmap(totalWidth, totalHeight)
let finalGraphics = Graphics.FromImage(finalBitmap)
let copy i (chart:ChartTypes.GenericChart) =
let img = chart.ToPng(x.Size)
let bitmap = new Bitmap(new MemoryStream(img))
finalGraphics.DrawImage(bitmap, i % x.Columns * width, i / x.Columns * height)
List.iteri copy x.Charts;
finalGraphics.Dispose();
let ms = new MemoryStream()
finalBitmap.Save(ms, ImageFormat.Png);
{ ContentType = "image/png"; Data = ms.ToArray() }
)
let addDefaultDisplayPrinters() =

// add table printer
addDisplayPrinter(fun (x:TableOutput) ->
addDisplayPrinter(fun (x:TableOutput) ->
let sb = StringBuilder()
sb.Append("<table>") |> ignore

Expand All@@ -90,13 +60,13 @@ module Printers =
sb.Append("<td>") |> ignore
sb.Append(htmlEncode cell) |> ignore
sb.Append("</td>") |> ignore

sb.Append("</tr>") |> ignore
sb.Append("<tbody>") |> ignore
sb.Append("</tbody>") |> ignore
sb.Append("</table>") |> ignore

{ ContentType = "text/html"; Data = sb.ToString() }
{ ContentType = "text/html"; Data = sb.ToString() }
)

// add svg printer
Expand All@@ -108,7 +78,7 @@ module Printers =
addDisplayPrinter(fun (x:HtmlOutput) ->
{ ContentType = "text/html"; Data = x.Html }
)

// add latex printer
addDisplayPrinter(fun (x:LatexOutput) ->
{ ContentType = "text/latex"; Data = x.Latex }
Expand Down
58 changes: 3 additions & 55 deletions src/IfSharp.Kernel/Util.fs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,9 @@ open System.Net
open System.Text
open System.Drawing.Imaging
open System.Windows.Forms
open System.Xml;
open System.Xml.Linq;
open System.Xml.XPath;
open FSharp.Charting
open System.Xml
open System.Xml.Linq
open System.Xml.XPath

type BinaryOutput =
{
Expand DownExpand Up@@ -39,18 +38,7 @@ type SvgOutput =
Svg: string;
}

type GenericChartWithSize =
{
Chart: ChartTypes.GenericChart;
Size: int * int;
}

type GenericChartsWithSize =
{
Charts: ChartTypes.GenericChart list;
Size: int * int;
Columns: int;
}

[<AutoOpen>]
module ExtensionMethods =
Expand All@@ -71,45 +59,7 @@ module ExtensionMethods =

sb.ToString()

type ChartTypes.GenericChart with

/// Wraps a GenericChartWithSize around the GenericChart
member self.WithSize(x:int, y:int) =
{
Chart = self;
Size = (x, y);
}

/// Converts the GenericChart to a PNG, in order to do this, we must show a form with ChartControl on it, save the bmp, then write the png to memory
member self.ToPng(?size) =

// get the size
let (width, height) = if size.IsNone then (320, 240) else size.Value

// create a new ChartControl in order to get the underlying Chart
let ctl = new ChartTypes.ChartControl(self)

// save
use ms = new MemoryStream()
let actualChart = ctl.Controls.[0] :?> System.Windows.Forms.DataVisualization.Charting.Chart
actualChart.Dock <- DockStyle.None
actualChart.Size <- Size(width, height)
actualChart.SaveImage(ms, ImageFormat.Png)
ms.ToArray()

member self.ToData(?size) =
let bytes = match size with Some size -> self.ToPng(size) | _ -> self.ToPng()
let base64 = Convert.ToBase64String(bytes)
let data = "data:image/png;base64,"+base64
data

type FSharp.Charting.Chart with

/// Wraps a GenericChartWithSize around the GenericChart
static member WithSize(x:int, y:int) =

fun (ch : #ChartTypes.GenericChart) ->
ch.WithSize(x, y)

type Util =

Expand DownExpand Up@@ -177,8 +127,6 @@ type Util =
static member Image (fileName:string) =
Util.Image (File.ReadAllBytes(fileName))

static member MultipleCharts (charts: ChartTypes.GenericChart list) (size:int*int) (cols:int) =
{ Charts = charts; Size = size; Columns = cols }

static member CreatePublicFile (name:string) (content:byte[]) =
try
Expand Down
17 changes: 16 additions & 1 deletion src/IfSharp.Kernel/app.config
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,19 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
<bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All@@ -20,4 +32,7 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
</startup>
</configuration>
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove hard FSCharting dependency #65

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

cgravill
merged 8 commits into

from

Sep 7, 2016
 Merged


Remove hard FSCharting dependency #65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
581a611

Initial rip out of FSCharting. Note that FSCharting.Gtk depends a loc…


npmurphy May 5, 2016
c023cfc

merge


npmurphy May 5, 2016
f2c3251

Merge branch 'xplot' into fscharting_ripout


npmurphy May 5, 2016
b863186

merge with jupyter branch


npmurphy May 6, 2016
eaf94b1

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
01704a9

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
03c1e84

Use Paket.Core.dll to get dependencies on install


cgravill Sep 1, 2016
07b1f27

Merge pull request #6 from fsprojects/pr/65


npmurphy Sep 6, 2016

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


130 changes: 109 additions & 21 deletions
Feature Notebook format 4_0.ipynb

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
paket.dependencies

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ nuget FSharp.Compiler.Service 3.0.0 framework: >= net451
nuget FSharp.Core.Microsoft.Signed 3.1.1.1 framework: >= net45
nuget NetMQ 3.3.3.1
nuget Newtonsoft.Json 5.0.8 framework: >= net45
nuget FSharp.Charting 0.90.5 framework: >= net45
nuget FAKE
nuget xUnit >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget Paket.Core >= 3.17.2

542 changes: 538 additions & 4 deletions
paket.lock

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
src/IfSharp.Kernel/App.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,6 +244,10 @@ module App =
 printfn "Saving kernel icon [%s]" logo32File
 IfSharpResources.ifsharp_32logo().Save(logo32File)

 printfn "Installing dependencies via Paket"
 let dependencies = Paket.Dependencies.Locate()
 dependencies.Install(false)

 if start then
 (
 printfn "Starting ipython..."
Expand Down

2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Globals.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@
/// This module provides access to common types and functions so the user can get intellisense
[<AutoOpen>]
module Globals = 

 type Chart = FSharp.Charting.Chart

 type Util = IfSharp.Kernel.Util

Expand Down

857 changes: 849 additions & 8 deletions
src/IfSharp.Kernel/IfSharp.Kernel.fsproj

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Include.fsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,8 @@
#r "System.Data.dll"
#r "System.Windows.Forms.DataVisualization.dll"
//#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead
#r "FSharp.Charting.dll"
#r "NetMQ.dll"

// open the global functions and methods
open FSharp.Charting
open IfSharp.Kernel
open IfSharp.Kernel.Globals

1 change: 0 additions & 1 deletion
src/IfSharp.Kernel/MainTypes.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
namespace IfSharp.Kernel

open System.Collections.Generic
open FSharp.Charting

type ConnectionInformation = 
 {
Expand Down

56 changes: 13 additions & 43 deletions
src/IfSharp.Kernel/Printers.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,29 +3,28 @@
open System
open System.Text
open System.Web
open System.Drawing
open System.Drawing.Imaging
open System.IO
open FSharp.Charting
//open System.Drawing
//open System.Drawing.Imaging
//open System.IO

module Printers =
module Printers =

 let mutable internal displayPrinters : list<Type * (obj -> BinaryOutput)> = []

 /// Convenience method for encoding a string within HTML
 let internal htmlEncode(str) = HttpUtility.HtmlEncode(str)

 /// Adds a custom display printer for extensibility
 let internal addDisplayPrinter(printer : 'T -> BinaryOutput) =
 let addDisplayPrinter(printer : 'T -> BinaryOutput) =
 displayPrinters <- (typeof<'T>, (fun (x:obj) -> printer (unbox x))) :: displayPrinters

 /// Default display printer
 let internal defaultDisplayPrinter(x) =
 let defaultDisplayPrinter(x) =
 { ContentType = "text/plain"; Data = sprintf "%A" x }

 /// Finds a display printer based off of the type
 let internal findDisplayPrinter(findType) =
 let printers =
 let findDisplayPrinter(findType) =
 let printers =
 displayPrinters
 |> Seq.filter (fun (t, _) -> t.IsAssignableFrom(findType))
 |> Seq.toList
Expand All@@ -36,39 +35,10 @@ module Printers =
 (typeof<obj>, defaultDisplayPrinter)

 /// Adds default display printers
 let internal addDefaultDisplayPrinters() = 

 // add generic chart printer
 addDisplayPrinter(fun (x:ChartTypes.GenericChart) ->
 { ContentType = "image/png"; Data = x.ToPng() }
 )

 // add chart printer
 addDisplayPrinter(fun (x:GenericChartWithSize) ->
 { ContentType = "image/png"; Data = x.Chart.ToPng(x.Size) }
 )

 addDisplayPrinter(fun (x:GenericChartsWithSize) ->
 let count = x.Charts.Length
 let (width, height) = x.Size
 let totalWidth = if count = 1 then width else width * x.Columns
 let numRows = int (Math.Ceiling (float count / float x.Columns))
 let totalHeight = numRows * height
 let finalBitmap = new Bitmap(totalWidth, totalHeight)
 let finalGraphics = Graphics.FromImage(finalBitmap)
 let copy i (chart:ChartTypes.GenericChart) =
 let img = chart.ToPng(x.Size)
 let bitmap = new Bitmap(new MemoryStream(img))
 finalGraphics.DrawImage(bitmap, i % x.Columns * width, i / x.Columns * height)
 List.iteri copy x.Charts;
 finalGraphics.Dispose();
 let ms = new MemoryStream()
 finalBitmap.Save(ms, ImageFormat.Png);
 { ContentType = "image/png"; Data = ms.ToArray() }
 )
 let addDefaultDisplayPrinters() =

 // add table printer
 addDisplayPrinter(fun (x:TableOutput) ->
 addDisplayPrinter(fun (x:TableOutput) ->
 let sb = StringBuilder()
 sb.Append("<table>") |> ignore

Expand All@@ -90,13 +60,13 @@ module Printers =
 sb.Append("<td>") |> ignore
 sb.Append(htmlEncode cell) |> ignore
 sb.Append("</td>") |> ignore

 sb.Append("</tr>") |> ignore
 sb.Append("<tbody>") |> ignore
 sb.Append("</tbody>") |> ignore
 sb.Append("</table>") |> ignore

 { ContentType = "text/html"; Data = sb.ToString() }
 { ContentType = "text/html"; Data = sb.ToString() }
 )

 // add svg printer
Expand All@@ -108,7 +78,7 @@ module Printers =
 addDisplayPrinter(fun (x:HtmlOutput) ->
 { ContentType = "text/html"; Data = x.Html }
 )

 // add latex printer
 addDisplayPrinter(fun (x:LatexOutput) ->
 { ContentType = "text/latex"; Data = x.Latex }
Expand Down

58 changes: 3 additions & 55 deletions
src/IfSharp.Kernel/Util.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,9 @@ open System.Net
open System.Text
open System.Drawing.Imaging
open System.Windows.Forms
open System.Xml;
open System.Xml.Linq;
open System.Xml.XPath;
open FSharp.Charting
open System.Xml
open System.Xml.Linq
open System.Xml.XPath

type BinaryOutput =
 { 
Expand DownExpand Up@@ -39,18 +38,7 @@ type SvgOutput =
 Svg: string;
 }

type GenericChartWithSize = 
 {
 Chart: ChartTypes.GenericChart;
 Size: int * int;
 }

type GenericChartsWithSize =
 {
 Charts: ChartTypes.GenericChart list;
 Size: int * int;
 Columns: int;
 }

[<AutoOpen>]
module ExtensionMethods =
Expand All@@ -71,45 +59,7 @@ module ExtensionMethods =

 sb.ToString()

 type ChartTypes.GenericChart with 

 /// Wraps a GenericChartWithSize around the GenericChart
 member self.WithSize(x:int, y:int) =
 {
 Chart = self;
 Size = (x, y);
 }

 /// Converts the GenericChart to a PNG, in order to do this, we must show a form with ChartControl on it, save the bmp, then write the png to memory
 member self.ToPng(?size) =

 // get the size
 let (width, height) = if size.IsNone then (320, 240) else size.Value

 // create a new ChartControl in order to get the underlying Chart
 let ctl = new ChartTypes.ChartControl(self)

 // save
 use ms = new MemoryStream()
 let actualChart = ctl.Controls.[0] :?> System.Windows.Forms.DataVisualization.Charting.Chart
 actualChart.Dock <- DockStyle.None
 actualChart.Size <- Size(width, height)
 actualChart.SaveImage(ms, ImageFormat.Png)
 ms.ToArray()

 member self.ToData(?size) =
 let bytes = match size with Some size -> self.ToPng(size) | _ -> self.ToPng()
 let base64 = Convert.ToBase64String(bytes)
 let data = "data:image/png;base64,"+base64
 data

 type FSharp.Charting.Chart with

 /// Wraps a GenericChartWithSize around the GenericChart
 static member WithSize(x:int, y:int) = 

 fun (ch : #ChartTypes.GenericChart) ->
 ch.WithSize(x, y)

type Util = 

Expand DownExpand Up@@ -177,8 +127,6 @@ type Util =
 static member Image (fileName:string) =
 Util.Image (File.ReadAllBytes(fileName))

 static member MultipleCharts (charts: ChartTypes.GenericChart list) (size:int*int) (cols:int) =
 { Charts = charts; Size = size; Columns = cols }

 static member CreatePublicFile (name:string) (content:byte[]) =
 try
Expand Down

17 changes: 16 additions & 1 deletion
src/IfSharp.Kernel/app.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,19 @@
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
 </dependentAssembly>
 <dependentAssembly>
 <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All@@ -20,4 +32,7 @@
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
 <startup>
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
 </startup>
</configuration>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove hard FSCharting dependency #65

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

cgravill
merged 8 commits into

from

Sep 7, 2016
 Merged


Remove hard FSCharting dependency #65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
581a611

Initial rip out of FSCharting. Note that FSCharting.Gtk depends a loc…


npmurphy May 5, 2016
c023cfc

merge


npmurphy May 5, 2016
f2c3251

Merge branch 'xplot' into fscharting_ripout


npmurphy May 5, 2016
b863186

merge with jupyter branch


npmurphy May 6, 2016
eaf94b1

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
01704a9

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
03c1e84

Use Paket.Core.dll to get dependencies on install


cgravill Sep 1, 2016
07b1f27

Merge pull request #6 from fsprojects/pr/65


npmurphy Sep 6, 2016

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


130 changes: 109 additions & 21 deletions
Feature Notebook format 4_0.ipynb

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
paket.dependencies

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ nuget FSharp.Compiler.Service 3.0.0 framework: >= net451
nuget FSharp.Core.Microsoft.Signed 3.1.1.1 framework: >= net45
nuget NetMQ 3.3.3.1
nuget Newtonsoft.Json 5.0.8 framework: >= net45
nuget FSharp.Charting 0.90.5 framework: >= net45
nuget FAKE
nuget xUnit >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget Paket.Core >= 3.17.2

542 changes: 538 additions & 4 deletions
paket.lock

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
src/IfSharp.Kernel/App.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,6 +244,10 @@ module App =
 printfn "Saving kernel icon [%s]" logo32File
 IfSharpResources.ifsharp_32logo().Save(logo32File)

 printfn "Installing dependencies via Paket"
 let dependencies = Paket.Dependencies.Locate()
 dependencies.Install(false)

 if start then
 (
 printfn "Starting ipython..."
Expand Down

2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Globals.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@
/// This module provides access to common types and functions so the user can get intellisense
[<AutoOpen>]
module Globals = 

 type Chart = FSharp.Charting.Chart

 type Util = IfSharp.Kernel.Util

Expand Down

857 changes: 849 additions & 8 deletions
src/IfSharp.Kernel/IfSharp.Kernel.fsproj

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Include.fsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,8 @@
#r "System.Data.dll"
#r "System.Windows.Forms.DataVisualization.dll"
//#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead
#r "FSharp.Charting.dll"
#r "NetMQ.dll"

// open the global functions and methods
open FSharp.Charting
open IfSharp.Kernel
open IfSharp.Kernel.Globals

1 change: 0 additions & 1 deletion
src/IfSharp.Kernel/MainTypes.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
namespace IfSharp.Kernel

open System.Collections.Generic
open FSharp.Charting

type ConnectionInformation = 
 {
Expand Down

56 changes: 13 additions & 43 deletions
src/IfSharp.Kernel/Printers.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,29 +3,28 @@
open System
open System.Text
open System.Web
open System.Drawing
open System.Drawing.Imaging
open System.IO
open FSharp.Charting
//open System.Drawing
//open System.Drawing.Imaging
//open System.IO

module Printers =
module Printers =

 let mutable internal displayPrinters : list<Type * (obj -> BinaryOutput)> = []

 /// Convenience method for encoding a string within HTML
 let internal htmlEncode(str) = HttpUtility.HtmlEncode(str)

 /// Adds a custom display printer for extensibility
 let internal addDisplayPrinter(printer : 'T -> BinaryOutput) =
 let addDisplayPrinter(printer : 'T -> BinaryOutput) =
 displayPrinters <- (typeof<'T>, (fun (x:obj) -> printer (unbox x))) :: displayPrinters

 /// Default display printer
 let internal defaultDisplayPrinter(x) =
 let defaultDisplayPrinter(x) =
 { ContentType = "text/plain"; Data = sprintf "%A" x }

 /// Finds a display printer based off of the type
 let internal findDisplayPrinter(findType) =
 let printers =
 let findDisplayPrinter(findType) =
 let printers =
 displayPrinters
 |> Seq.filter (fun (t, _) -> t.IsAssignableFrom(findType))
 |> Seq.toList
Expand All@@ -36,39 +35,10 @@ module Printers =
 (typeof<obj>, defaultDisplayPrinter)

 /// Adds default display printers
 let internal addDefaultDisplayPrinters() = 

 // add generic chart printer
 addDisplayPrinter(fun (x:ChartTypes.GenericChart) ->
 { ContentType = "image/png"; Data = x.ToPng() }
 )

 // add chart printer
 addDisplayPrinter(fun (x:GenericChartWithSize) ->
 { ContentType = "image/png"; Data = x.Chart.ToPng(x.Size) }
 )

 addDisplayPrinter(fun (x:GenericChartsWithSize) ->
 let count = x.Charts.Length
 let (width, height) = x.Size
 let totalWidth = if count = 1 then width else width * x.Columns
 let numRows = int (Math.Ceiling (float count / float x.Columns))
 let totalHeight = numRows * height
 let finalBitmap = new Bitmap(totalWidth, totalHeight)
 let finalGraphics = Graphics.FromImage(finalBitmap)
 let copy i (chart:ChartTypes.GenericChart) =
 let img = chart.ToPng(x.Size)
 let bitmap = new Bitmap(new MemoryStream(img))
 finalGraphics.DrawImage(bitmap, i % x.Columns * width, i / x.Columns * height)
 List.iteri copy x.Charts;
 finalGraphics.Dispose();
 let ms = new MemoryStream()
 finalBitmap.Save(ms, ImageFormat.Png);
 { ContentType = "image/png"; Data = ms.ToArray() }
 )
 let addDefaultDisplayPrinters() =

 // add table printer
 addDisplayPrinter(fun (x:TableOutput) ->
 addDisplayPrinter(fun (x:TableOutput) ->
 let sb = StringBuilder()
 sb.Append("<table>") |> ignore

Expand All@@ -90,13 +60,13 @@ module Printers =
 sb.Append("<td>") |> ignore
 sb.Append(htmlEncode cell) |> ignore
 sb.Append("</td>") |> ignore

 sb.Append("</tr>") |> ignore
 sb.Append("<tbody>") |> ignore
 sb.Append("</tbody>") |> ignore
 sb.Append("</table>") |> ignore

 { ContentType = "text/html"; Data = sb.ToString() }
 { ContentType = "text/html"; Data = sb.ToString() }
 )

 // add svg printer
Expand All@@ -108,7 +78,7 @@ module Printers =
 addDisplayPrinter(fun (x:HtmlOutput) ->
 { ContentType = "text/html"; Data = x.Html }
 )

 // add latex printer
 addDisplayPrinter(fun (x:LatexOutput) ->
 { ContentType = "text/latex"; Data = x.Latex }
Expand Down

58 changes: 3 additions & 55 deletions
src/IfSharp.Kernel/Util.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,9 @@ open System.Net
open System.Text
open System.Drawing.Imaging
open System.Windows.Forms
open System.Xml;
open System.Xml.Linq;
open System.Xml.XPath;
open FSharp.Charting
open System.Xml
open System.Xml.Linq
open System.Xml.XPath

type BinaryOutput =
 { 
Expand DownExpand Up@@ -39,18 +38,7 @@ type SvgOutput =
 Svg: string;
 }

type GenericChartWithSize = 
 {
 Chart: ChartTypes.GenericChart;
 Size: int * int;
 }

type GenericChartsWithSize =
 {
 Charts: ChartTypes.GenericChart list;
 Size: int * int;
 Columns: int;
 }

[<AutoOpen>]
module ExtensionMethods =
Expand All@@ -71,45 +59,7 @@ module ExtensionMethods =

 sb.ToString()

 type ChartTypes.GenericChart with 

 /// Wraps a GenericChartWithSize around the GenericChart
 member self.WithSize(x:int, y:int) =
 {
 Chart = self;
 Size = (x, y);
 }

 /// Converts the GenericChart to a PNG, in order to do this, we must show a form with ChartControl on it, save the bmp, then write the png to memory
 member self.ToPng(?size) =

 // get the size
 let (width, height) = if size.IsNone then (320, 240) else size.Value

 // create a new ChartControl in order to get the underlying Chart
 let ctl = new ChartTypes.ChartControl(self)

 // save
 use ms = new MemoryStream()
 let actualChart = ctl.Controls.[0] :?> System.Windows.Forms.DataVisualization.Charting.Chart
 actualChart.Dock <- DockStyle.None
 actualChart.Size <- Size(width, height)
 actualChart.SaveImage(ms, ImageFormat.Png)
 ms.ToArray()

 member self.ToData(?size) =
 let bytes = match size with Some size -> self.ToPng(size) | _ -> self.ToPng()
 let base64 = Convert.ToBase64String(bytes)
 let data = "data:image/png;base64,"+base64
 data

 type FSharp.Charting.Chart with

 /// Wraps a GenericChartWithSize around the GenericChart
 static member WithSize(x:int, y:int) = 

 fun (ch : #ChartTypes.GenericChart) ->
 ch.WithSize(x, y)

type Util = 

Expand DownExpand Up@@ -177,8 +127,6 @@ type Util =
 static member Image (fileName:string) =
 Util.Image (File.ReadAllBytes(fileName))

 static member MultipleCharts (charts: ChartTypes.GenericChart list) (size:int*int) (cols:int) =
 { Charts = charts; Size = size; Columns = cols }

 static member CreatePublicFile (name:string) (content:byte[]) =
 try
Expand Down

17 changes: 16 additions & 1 deletion
src/IfSharp.Kernel/app.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,19 @@
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
 </dependentAssembly>
 <dependentAssembly>
 <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All@@ -20,4 +32,7 @@
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
 <startup>
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
 </startup>
</configuration>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove hard FSCharting dependency #65

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

cgravill
merged 8 commits into

from

Sep 7, 2016
 Merged


Remove hard FSCharting dependency #65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
581a611

Initial rip out of FSCharting. Note that FSCharting.Gtk depends a loc…


npmurphy May 5, 2016
c023cfc

merge


npmurphy May 5, 2016
f2c3251

Merge branch 'xplot' into fscharting_ripout


npmurphy May 5, 2016
b863186

merge with jupyter branch


npmurphy May 6, 2016
eaf94b1

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
01704a9

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
03c1e84

Use Paket.Core.dll to get dependencies on install


cgravill Sep 1, 2016
07b1f27

Merge pull request #6 from fsprojects/pr/65


npmurphy Sep 6, 2016

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


130 changes: 109 additions & 21 deletions
Feature Notebook format 4_0.ipynb

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
paket.dependencies

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ nuget FSharp.Compiler.Service 3.0.0 framework: >= net451
nuget FSharp.Core.Microsoft.Signed 3.1.1.1 framework: >= net45
nuget NetMQ 3.3.3.1
nuget Newtonsoft.Json 5.0.8 framework: >= net45
nuget FSharp.Charting 0.90.5 framework: >= net45
nuget FAKE
nuget xUnit >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget Paket.Core >= 3.17.2

542 changes: 538 additions & 4 deletions
paket.lock

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
src/IfSharp.Kernel/App.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,6 +244,10 @@ module App =
 printfn "Saving kernel icon [%s]" logo32File
 IfSharpResources.ifsharp_32logo().Save(logo32File)

 printfn "Installing dependencies via Paket"
 let dependencies = Paket.Dependencies.Locate()
 dependencies.Install(false)

 if start then
 (
 printfn "Starting ipython..."
Expand Down

2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Globals.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@
/// This module provides access to common types and functions so the user can get intellisense
[<AutoOpen>]
module Globals = 

 type Chart = FSharp.Charting.Chart

 type Util = IfSharp.Kernel.Util

Expand Down

857 changes: 849 additions & 8 deletions
src/IfSharp.Kernel/IfSharp.Kernel.fsproj

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Include.fsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,8 @@
#r "System.Data.dll"
#r "System.Windows.Forms.DataVisualization.dll"
//#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead
#r "FSharp.Charting.dll"
#r "NetMQ.dll"

// open the global functions and methods
open FSharp.Charting
open IfSharp.Kernel
open IfSharp.Kernel.Globals

1 change: 0 additions & 1 deletion
src/IfSharp.Kernel/MainTypes.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
namespace IfSharp.Kernel

open System.Collections.Generic
open FSharp.Charting

type ConnectionInformation = 
 {
Expand Down

56 changes: 13 additions & 43 deletions
src/IfSharp.Kernel/Printers.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,29 +3,28 @@
open System
open System.Text
open System.Web
open System.Drawing
open System.Drawing.Imaging
open System.IO
open FSharp.Charting
//open System.Drawing
//open System.Drawing.Imaging
//open System.IO

module Printers =
module Printers =

 let mutable internal displayPrinters : list<Type * (obj -> BinaryOutput)> = []

 /// Convenience method for encoding a string within HTML
 let internal htmlEncode(str) = HttpUtility.HtmlEncode(str)

 /// Adds a custom display printer for extensibility
 let internal addDisplayPrinter(printer : 'T -> BinaryOutput) =
 let addDisplayPrinter(printer : 'T -> BinaryOutput) =
 displayPrinters <- (typeof<'T>, (fun (x:obj) -> printer (unbox x))) :: displayPrinters

 /// Default display printer
 let internal defaultDisplayPrinter(x) =
 let defaultDisplayPrinter(x) =
 { ContentType = "text/plain"; Data = sprintf "%A" x }

 /// Finds a display printer based off of the type
 let internal findDisplayPrinter(findType) =
 let printers =
 let findDisplayPrinter(findType) =
 let printers =
 displayPrinters
 |> Seq.filter (fun (t, _) -> t.IsAssignableFrom(findType))
 |> Seq.toList
Expand All@@ -36,39 +35,10 @@ module Printers =
 (typeof<obj>, defaultDisplayPrinter)

 /// Adds default display printers
 let internal addDefaultDisplayPrinters() = 

 // add generic chart printer
 addDisplayPrinter(fun (x:ChartTypes.GenericChart) ->
 { ContentType = "image/png"; Data = x.ToPng() }
 )

 // add chart printer
 addDisplayPrinter(fun (x:GenericChartWithSize) ->
 { ContentType = "image/png"; Data = x.Chart.ToPng(x.Size) }
 )

 addDisplayPrinter(fun (x:GenericChartsWithSize) ->
 let count = x.Charts.Length
 let (width, height) = x.Size
 let totalWidth = if count = 1 then width else width * x.Columns
 let numRows = int (Math.Ceiling (float count / float x.Columns))
 let totalHeight = numRows * height
 let finalBitmap = new Bitmap(totalWidth, totalHeight)
 let finalGraphics = Graphics.FromImage(finalBitmap)
 let copy i (chart:ChartTypes.GenericChart) =
 let img = chart.ToPng(x.Size)
 let bitmap = new Bitmap(new MemoryStream(img))
 finalGraphics.DrawImage(bitmap, i % x.Columns * width, i / x.Columns * height)
 List.iteri copy x.Charts;
 finalGraphics.Dispose();
 let ms = new MemoryStream()
 finalBitmap.Save(ms, ImageFormat.Png);
 { ContentType = "image/png"; Data = ms.ToArray() }
 )
 let addDefaultDisplayPrinters() =

 // add table printer
 addDisplayPrinter(fun (x:TableOutput) ->
 addDisplayPrinter(fun (x:TableOutput) ->
 let sb = StringBuilder()
 sb.Append("<table>") |> ignore

Expand All@@ -90,13 +60,13 @@ module Printers =
 sb.Append("<td>") |> ignore
 sb.Append(htmlEncode cell) |> ignore
 sb.Append("</td>") |> ignore

 sb.Append("</tr>") |> ignore
 sb.Append("<tbody>") |> ignore
 sb.Append("</tbody>") |> ignore
 sb.Append("</table>") |> ignore

 { ContentType = "text/html"; Data = sb.ToString() }
 { ContentType = "text/html"; Data = sb.ToString() }
 )

 // add svg printer
Expand All@@ -108,7 +78,7 @@ module Printers =
 addDisplayPrinter(fun (x:HtmlOutput) ->
 { ContentType = "text/html"; Data = x.Html }
 )

 // add latex printer
 addDisplayPrinter(fun (x:LatexOutput) ->
 { ContentType = "text/latex"; Data = x.Latex }
Expand Down

58 changes: 3 additions & 55 deletions
src/IfSharp.Kernel/Util.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,9 @@ open System.Net
open System.Text
open System.Drawing.Imaging
open System.Windows.Forms
open System.Xml;
open System.Xml.Linq;
open System.Xml.XPath;
open FSharp.Charting
open System.Xml
open System.Xml.Linq
open System.Xml.XPath

type BinaryOutput =
 { 
Expand DownExpand Up@@ -39,18 +38,7 @@ type SvgOutput =
 Svg: string;
 }

type GenericChartWithSize = 
 {
 Chart: ChartTypes.GenericChart;
 Size: int * int;
 }

type GenericChartsWithSize =
 {
 Charts: ChartTypes.GenericChart list;
 Size: int * int;
 Columns: int;
 }

[<AutoOpen>]
module ExtensionMethods =
Expand All@@ -71,45 +59,7 @@ module ExtensionMethods =

 sb.ToString()

 type ChartTypes.GenericChart with 

 /// Wraps a GenericChartWithSize around the GenericChart
 member self.WithSize(x:int, y:int) =
 {
 Chart = self;
 Size = (x, y);
 }

 /// Converts the GenericChart to a PNG, in order to do this, we must show a form with ChartControl on it, save the bmp, then write the png to memory
 member self.ToPng(?size) =

 // get the size
 let (width, height) = if size.IsNone then (320, 240) else size.Value

 // create a new ChartControl in order to get the underlying Chart
 let ctl = new ChartTypes.ChartControl(self)

 // save
 use ms = new MemoryStream()
 let actualChart = ctl.Controls.[0] :?> System.Windows.Forms.DataVisualization.Charting.Chart
 actualChart.Dock <- DockStyle.None
 actualChart.Size <- Size(width, height)
 actualChart.SaveImage(ms, ImageFormat.Png)
 ms.ToArray()

 member self.ToData(?size) =
 let bytes = match size with Some size -> self.ToPng(size) | _ -> self.ToPng()
 let base64 = Convert.ToBase64String(bytes)
 let data = "data:image/png;base64,"+base64
 data

 type FSharp.Charting.Chart with

 /// Wraps a GenericChartWithSize around the GenericChart
 static member WithSize(x:int, y:int) = 

 fun (ch : #ChartTypes.GenericChart) ->
 ch.WithSize(x, y)

type Util = 

Expand DownExpand Up@@ -177,8 +127,6 @@ type Util =
 static member Image (fileName:string) =
 Util.Image (File.ReadAllBytes(fileName))

 static member MultipleCharts (charts: ChartTypes.GenericChart list) (size:int*int) (cols:int) =
 { Charts = charts; Size = size; Columns = cols }

 static member CreatePublicFile (name:string) (content:byte[]) =
 try
Expand Down

17 changes: 16 additions & 1 deletion
src/IfSharp.Kernel/app.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,19 @@
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
 </dependentAssembly>
 <dependentAssembly>
 <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All@@ -20,4 +32,7 @@
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
 <startup>
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
 </startup>
</configuration>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Remove hard FSCharting dependency #65

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

cgravill
merged 8 commits into

from

Sep 7, 2016
 Merged


Remove hard FSCharting dependency #65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
581a611

Initial rip out of FSCharting. Note that FSCharting.Gtk depends a loc…


npmurphy May 5, 2016
c023cfc

merge


npmurphy May 5, 2016
f2c3251

Merge branch 'xplot' into fscharting_ripout


npmurphy May 5, 2016
b863186

merge with jupyter branch


npmurphy May 6, 2016
eaf94b1

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
01704a9

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
03c1e84

Use Paket.Core.dll to get dependencies on install


cgravill Sep 1, 2016
07b1f27

Merge pull request #6 from fsprojects/pr/65


npmurphy Sep 6, 2016

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


130 changes: 109 additions & 21 deletions
Feature Notebook format 4_0.ipynb

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
paket.dependencies

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ nuget FSharp.Compiler.Service 3.0.0 framework: >= net451
nuget FSharp.Core.Microsoft.Signed 3.1.1.1 framework: >= net45
nuget NetMQ 3.3.3.1
nuget Newtonsoft.Json 5.0.8 framework: >= net45
nuget FSharp.Charting 0.90.5 framework: >= net45
nuget FAKE
nuget xUnit >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget Paket.Core >= 3.17.2

542 changes: 538 additions & 4 deletions
paket.lock

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
src/IfSharp.Kernel/App.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,6 +244,10 @@ module App =
 printfn "Saving kernel icon [%s]" logo32File
 IfSharpResources.ifsharp_32logo().Save(logo32File)

 printfn "Installing dependencies via Paket"
 let dependencies = Paket.Dependencies.Locate()
 dependencies.Install(false)

 if start then
 (
 printfn "Starting ipython..."
Expand Down

2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Globals.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@
/// This module provides access to common types and functions so the user can get intellisense
[<AutoOpen>]
module Globals = 

 type Chart = FSharp.Charting.Chart

 type Util = IfSharp.Kernel.Util

Expand Down

857 changes: 849 additions & 8 deletions
src/IfSharp.Kernel/IfSharp.Kernel.fsproj

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Include.fsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,8 @@
#r "System.Data.dll"
#r "System.Windows.Forms.DataVisualization.dll"
//#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead
#r "FSharp.Charting.dll"
#r "NetMQ.dll"

// open the global functions and methods
open FSharp.Charting
open IfSharp.Kernel
open IfSharp.Kernel.Globals

1 change: 0 additions & 1 deletion
src/IfSharp.Kernel/MainTypes.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
namespace IfSharp.Kernel

open System.Collections.Generic
open FSharp.Charting

type ConnectionInformation = 
 {
Expand Down

56 changes: 13 additions & 43 deletions
src/IfSharp.Kernel/Printers.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,29 +3,28 @@
open System
open System.Text
open System.Web
open System.Drawing
open System.Drawing.Imaging
open System.IO
open FSharp.Charting
//open System.Drawing
//open System.Drawing.Imaging
//open System.IO

module Printers =
module Printers =

 let mutable internal displayPrinters : list<Type * (obj -> BinaryOutput)> = []

 /// Convenience method for encoding a string within HTML
 let internal htmlEncode(str) = HttpUtility.HtmlEncode(str)

 /// Adds a custom display printer for extensibility
 let internal addDisplayPrinter(printer : 'T -> BinaryOutput) =
 let addDisplayPrinter(printer : 'T -> BinaryOutput) =
 displayPrinters <- (typeof<'T>, (fun (x:obj) -> printer (unbox x))) :: displayPrinters

 /// Default display printer
 let internal defaultDisplayPrinter(x) =
 let defaultDisplayPrinter(x) =
 { ContentType = "text/plain"; Data = sprintf "%A" x }

 /// Finds a display printer based off of the type
 let internal findDisplayPrinter(findType) =
 let printers =
 let findDisplayPrinter(findType) =
 let printers =
 displayPrinters
 |> Seq.filter (fun (t, _) -> t.IsAssignableFrom(findType))
 |> Seq.toList
Expand All@@ -36,39 +35,10 @@ module Printers =
 (typeof<obj>, defaultDisplayPrinter)

 /// Adds default display printers
 let internal addDefaultDisplayPrinters() = 

 // add generic chart printer
 addDisplayPrinter(fun (x:ChartTypes.GenericChart) ->
 { ContentType = "image/png"; Data = x.ToPng() }
 )

 // add chart printer
 addDisplayPrinter(fun (x:GenericChartWithSize) ->
 { ContentType = "image/png"; Data = x.Chart.ToPng(x.Size) }
 )

 addDisplayPrinter(fun (x:GenericChartsWithSize) ->
 let count = x.Charts.Length
 let (width, height) = x.Size
 let totalWidth = if count = 1 then width else width * x.Columns
 let numRows = int (Math.Ceiling (float count / float x.Columns))
 let totalHeight = numRows * height
 let finalBitmap = new Bitmap(totalWidth, totalHeight)
 let finalGraphics = Graphics.FromImage(finalBitmap)
 let copy i (chart:ChartTypes.GenericChart) =
 let img = chart.ToPng(x.Size)
 let bitmap = new Bitmap(new MemoryStream(img))
 finalGraphics.DrawImage(bitmap, i % x.Columns * width, i / x.Columns * height)
 List.iteri copy x.Charts;
 finalGraphics.Dispose();
 let ms = new MemoryStream()
 finalBitmap.Save(ms, ImageFormat.Png);
 { ContentType = "image/png"; Data = ms.ToArray() }
 )
 let addDefaultDisplayPrinters() =

 // add table printer
 addDisplayPrinter(fun (x:TableOutput) ->
 addDisplayPrinter(fun (x:TableOutput) ->
 let sb = StringBuilder()
 sb.Append("<table>") |> ignore

Expand All@@ -90,13 +60,13 @@ module Printers =
 sb.Append("<td>") |> ignore
 sb.Append(htmlEncode cell) |> ignore
 sb.Append("</td>") |> ignore

 sb.Append("</tr>") |> ignore
 sb.Append("<tbody>") |> ignore
 sb.Append("</tbody>") |> ignore
 sb.Append("</table>") |> ignore

 { ContentType = "text/html"; Data = sb.ToString() }
 { ContentType = "text/html"; Data = sb.ToString() }
 )

 // add svg printer
Expand All@@ -108,7 +78,7 @@ module Printers =
 addDisplayPrinter(fun (x:HtmlOutput) ->
 { ContentType = "text/html"; Data = x.Html }
 )

 // add latex printer
 addDisplayPrinter(fun (x:LatexOutput) ->
 { ContentType = "text/latex"; Data = x.Latex }
Expand Down

58 changes: 3 additions & 55 deletions
src/IfSharp.Kernel/Util.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,9 @@ open System.Net
open System.Text
open System.Drawing.Imaging
open System.Windows.Forms
open System.Xml;
open System.Xml.Linq;
open System.Xml.XPath;
open FSharp.Charting
open System.Xml
open System.Xml.Linq
open System.Xml.XPath

type BinaryOutput =
 { 
Expand DownExpand Up@@ -39,18 +38,7 @@ type SvgOutput =
 Svg: string;
 }

type GenericChartWithSize = 
 {
 Chart: ChartTypes.GenericChart;
 Size: int * int;
 }

type GenericChartsWithSize =
 {
 Charts: ChartTypes.GenericChart list;
 Size: int * int;
 Columns: int;
 }

[<AutoOpen>]
module ExtensionMethods =
Expand All@@ -71,45 +59,7 @@ module ExtensionMethods =

 sb.ToString()

 type ChartTypes.GenericChart with 

 /// Wraps a GenericChartWithSize around the GenericChart
 member self.WithSize(x:int, y:int) =
 {
 Chart = self;
 Size = (x, y);
 }

 /// Converts the GenericChart to a PNG, in order to do this, we must show a form with ChartControl on it, save the bmp, then write the png to memory
 member self.ToPng(?size) =

 // get the size
 let (width, height) = if size.IsNone then (320, 240) else size.Value

 // create a new ChartControl in order to get the underlying Chart
 let ctl = new ChartTypes.ChartControl(self)

 // save
 use ms = new MemoryStream()
 let actualChart = ctl.Controls.[0] :?> System.Windows.Forms.DataVisualization.Charting.Chart
 actualChart.Dock <- DockStyle.None
 actualChart.Size <- Size(width, height)
 actualChart.SaveImage(ms, ImageFormat.Png)
 ms.ToArray()

 member self.ToData(?size) =
 let bytes = match size with Some size -> self.ToPng(size) | _ -> self.ToPng()
 let base64 = Convert.ToBase64String(bytes)
 let data = "data:image/png;base64,"+base64
 data

 type FSharp.Charting.Chart with

 /// Wraps a GenericChartWithSize around the GenericChart
 static member WithSize(x:int, y:int) = 

 fun (ch : #ChartTypes.GenericChart) ->
 ch.WithSize(x, y)

type Util = 

Expand DownExpand Up@@ -177,8 +127,6 @@ type Util =
 static member Image (fileName:string) =
 Util.Image (File.ReadAllBytes(fileName))

 static member MultipleCharts (charts: ChartTypes.GenericChart list) (size:int*int) (cols:int) =
 { Charts = charts; Size = size; Columns = cols }

 static member CreatePublicFile (name:string) (content:byte[]) =
 try
Expand Down

17 changes: 16 additions & 1 deletion
src/IfSharp.Kernel/app.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,19 @@
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
 </dependentAssembly>
 <dependentAssembly>
 <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All@@ -20,4 +32,7 @@
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
 <startup>
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
 </startup>
</configuration>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove hard FSCharting dependency #65

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

cgravill
merged 8 commits into

from

Sep 7, 2016
 Merged


Remove hard FSCharting dependency #65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
581a611

Initial rip out of FSCharting. Note that FSCharting.Gtk depends a loc…


npmurphy May 5, 2016
c023cfc

merge


npmurphy May 5, 2016
f2c3251

Merge branch 'xplot' into fscharting_ripout


npmurphy May 5, 2016
b863186

merge with jupyter branch


npmurphy May 6, 2016
eaf94b1

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
01704a9

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
03c1e84

Use Paket.Core.dll to get dependencies on install


cgravill Sep 1, 2016
07b1f27

Merge pull request #6 from fsprojects/pr/65


npmurphy Sep 6, 2016

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


130 changes: 109 additions & 21 deletions
Feature Notebook format 4_0.ipynb

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
paket.dependencies

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ nuget FSharp.Compiler.Service 3.0.0 framework: >= net451
nuget FSharp.Core.Microsoft.Signed 3.1.1.1 framework: >= net45
nuget NetMQ 3.3.3.1
nuget Newtonsoft.Json 5.0.8 framework: >= net45
nuget FSharp.Charting 0.90.5 framework: >= net45
nuget FAKE
nuget xUnit >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget Paket.Core >= 3.17.2

542 changes: 538 additions & 4 deletions
paket.lock

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
src/IfSharp.Kernel/App.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,6 +244,10 @@ module App =
 printfn "Saving kernel icon [%s]" logo32File
 IfSharpResources.ifsharp_32logo().Save(logo32File)

 printfn "Installing dependencies via Paket"
 let dependencies = Paket.Dependencies.Locate()
 dependencies.Install(false)

 if start then
 (
 printfn "Starting ipython..."
Expand Down

2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Globals.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@
/// This module provides access to common types and functions so the user can get intellisense
[<AutoOpen>]
module Globals = 

 type Chart = FSharp.Charting.Chart

 type Util = IfSharp.Kernel.Util

Expand Down

857 changes: 849 additions & 8 deletions
src/IfSharp.Kernel/IfSharp.Kernel.fsproj

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Include.fsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,8 @@
#r "System.Data.dll"
#r "System.Windows.Forms.DataVisualization.dll"
//#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead
#r "FSharp.Charting.dll"
#r "NetMQ.dll"

// open the global functions and methods
open FSharp.Charting
open IfSharp.Kernel
open IfSharp.Kernel.Globals

1 change: 0 additions & 1 deletion
src/IfSharp.Kernel/MainTypes.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
namespace IfSharp.Kernel

open System.Collections.Generic
open FSharp.Charting

type ConnectionInformation = 
 {
Expand Down

56 changes: 13 additions & 43 deletions
src/IfSharp.Kernel/Printers.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,29 +3,28 @@
open System
open System.Text
open System.Web
open System.Drawing
open System.Drawing.Imaging
open System.IO
open FSharp.Charting
//open System.Drawing
//open System.Drawing.Imaging
//open System.IO

module Printers =
module Printers =

 let mutable internal displayPrinters : list<Type * (obj -> BinaryOutput)> = []

 /// Convenience method for encoding a string within HTML
 let internal htmlEncode(str) = HttpUtility.HtmlEncode(str)

 /// Adds a custom display printer for extensibility
 let internal addDisplayPrinter(printer : 'T -> BinaryOutput) =
 let addDisplayPrinter(printer : 'T -> BinaryOutput) =
 displayPrinters <- (typeof<'T>, (fun (x:obj) -> printer (unbox x))) :: displayPrinters

 /// Default display printer
 let internal defaultDisplayPrinter(x) =
 let defaultDisplayPrinter(x) =
 { ContentType = "text/plain"; Data = sprintf "%A" x }

 /// Finds a display printer based off of the type
 let internal findDisplayPrinter(findType) =
 let printers =
 let findDisplayPrinter(findType) =
 let printers =
 displayPrinters
 |> Seq.filter (fun (t, _) -> t.IsAssignableFrom(findType))
 |> Seq.toList
Expand All@@ -36,39 +35,10 @@ module Printers =
 (typeof<obj>, defaultDisplayPrinter)

 /// Adds default display printers
 let internal addDefaultDisplayPrinters() = 

 // add generic chart printer
 addDisplayPrinter(fun (x:ChartTypes.GenericChart) ->
 { ContentType = "image/png"; Data = x.ToPng() }
 )

 // add chart printer
 addDisplayPrinter(fun (x:GenericChartWithSize) ->
 { ContentType = "image/png"; Data = x.Chart.ToPng(x.Size) }
 )

 addDisplayPrinter(fun (x:GenericChartsWithSize) ->
 let count = x.Charts.Length
 let (width, height) = x.Size
 let totalWidth = if count = 1 then width else width * x.Columns
 let numRows = int (Math.Ceiling (float count / float x.Columns))
 let totalHeight = numRows * height
 let finalBitmap = new Bitmap(totalWidth, totalHeight)
 let finalGraphics = Graphics.FromImage(finalBitmap)
 let copy i (chart:ChartTypes.GenericChart) =
 let img = chart.ToPng(x.Size)
 let bitmap = new Bitmap(new MemoryStream(img))
 finalGraphics.DrawImage(bitmap, i % x.Columns * width, i / x.Columns * height)
 List.iteri copy x.Charts;
 finalGraphics.Dispose();
 let ms = new MemoryStream()
 finalBitmap.Save(ms, ImageFormat.Png);
 { ContentType = "image/png"; Data = ms.ToArray() }
 )
 let addDefaultDisplayPrinters() =

 // add table printer
 addDisplayPrinter(fun (x:TableOutput) ->
 addDisplayPrinter(fun (x:TableOutput) ->
 let sb = StringBuilder()
 sb.Append("<table>") |> ignore

Expand All@@ -90,13 +60,13 @@ module Printers =
 sb.Append("<td>") |> ignore
 sb.Append(htmlEncode cell) |> ignore
 sb.Append("</td>") |> ignore

 sb.Append("</tr>") |> ignore
 sb.Append("<tbody>") |> ignore
 sb.Append("</tbody>") |> ignore
 sb.Append("</table>") |> ignore

 { ContentType = "text/html"; Data = sb.ToString() }
 { ContentType = "text/html"; Data = sb.ToString() }
 )

 // add svg printer
Expand All@@ -108,7 +78,7 @@ module Printers =
 addDisplayPrinter(fun (x:HtmlOutput) ->
 { ContentType = "text/html"; Data = x.Html }
 )

 // add latex printer
 addDisplayPrinter(fun (x:LatexOutput) ->
 { ContentType = "text/latex"; Data = x.Latex }
Expand Down

58 changes: 3 additions & 55 deletions
src/IfSharp.Kernel/Util.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,9 @@ open System.Net
open System.Text
open System.Drawing.Imaging
open System.Windows.Forms
open System.Xml;
open System.Xml.Linq;
open System.Xml.XPath;
open FSharp.Charting
open System.Xml
open System.Xml.Linq
open System.Xml.XPath

type BinaryOutput =
 { 
Expand DownExpand Up@@ -39,18 +38,7 @@ type SvgOutput =
 Svg: string;
 }

type GenericChartWithSize = 
 {
 Chart: ChartTypes.GenericChart;
 Size: int * int;
 }

type GenericChartsWithSize =
 {
 Charts: ChartTypes.GenericChart list;
 Size: int * int;
 Columns: int;
 }

[<AutoOpen>]
module ExtensionMethods =
Expand All@@ -71,45 +59,7 @@ module ExtensionMethods =

 sb.ToString()

 type ChartTypes.GenericChart with 

 /// Wraps a GenericChartWithSize around the GenericChart
 member self.WithSize(x:int, y:int) =
 {
 Chart = self;
 Size = (x, y);
 }

 /// Converts the GenericChart to a PNG, in order to do this, we must show a form with ChartControl on it, save the bmp, then write the png to memory
 member self.ToPng(?size) =

 // get the size
 let (width, height) = if size.IsNone then (320, 240) else size.Value

 // create a new ChartControl in order to get the underlying Chart
 let ctl = new ChartTypes.ChartControl(self)

 // save
 use ms = new MemoryStream()
 let actualChart = ctl.Controls.[0] :?> System.Windows.Forms.DataVisualization.Charting.Chart
 actualChart.Dock <- DockStyle.None
 actualChart.Size <- Size(width, height)
 actualChart.SaveImage(ms, ImageFormat.Png)
 ms.ToArray()

 member self.ToData(?size) =
 let bytes = match size with Some size -> self.ToPng(size) | _ -> self.ToPng()
 let base64 = Convert.ToBase64String(bytes)
 let data = "data:image/png;base64,"+base64
 data

 type FSharp.Charting.Chart with

 /// Wraps a GenericChartWithSize around the GenericChart
 static member WithSize(x:int, y:int) = 

 fun (ch : #ChartTypes.GenericChart) ->
 ch.WithSize(x, y)

type Util = 

Expand DownExpand Up@@ -177,8 +127,6 @@ type Util =
 static member Image (fileName:string) =
 Util.Image (File.ReadAllBytes(fileName))

 static member MultipleCharts (charts: ChartTypes.GenericChart list) (size:int*int) (cols:int) =
 { Charts = charts; Size = size; Columns = cols }

 static member CreatePublicFile (name:string) (content:byte[]) =
 try
Expand Down

17 changes: 16 additions & 1 deletion
src/IfSharp.Kernel/app.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,19 @@
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
 </dependentAssembly>
 <dependentAssembly>
 <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All@@ -20,4 +32,7 @@
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
 <startup>
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
 </startup>
</configuration>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Remove hard FSCharting dependency #65

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

cgravill
merged 8 commits into

from

Sep 7, 2016
 Merged


Remove hard FSCharting dependency #65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
581a611

Initial rip out of FSCharting. Note that FSCharting.Gtk depends a loc…


npmurphy May 5, 2016
c023cfc

merge


npmurphy May 5, 2016
f2c3251

Merge branch 'xplot' into fscharting_ripout


npmurphy May 5, 2016
b863186

merge with jupyter branch


npmurphy May 6, 2016
eaf94b1

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
01704a9

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
03c1e84

Use Paket.Core.dll to get dependencies on install


cgravill Sep 1, 2016
07b1f27

Merge pull request #6 from fsprojects/pr/65


npmurphy Sep 6, 2016

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


130 changes: 109 additions & 21 deletions
Feature Notebook format 4_0.ipynb

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
paket.dependencies

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ nuget FSharp.Compiler.Service 3.0.0 framework: >= net451
nuget FSharp.Core.Microsoft.Signed 3.1.1.1 framework: >= net45
nuget NetMQ 3.3.3.1
nuget Newtonsoft.Json 5.0.8 framework: >= net45
nuget FSharp.Charting 0.90.5 framework: >= net45
nuget FAKE
nuget xUnit >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget Paket.Core >= 3.17.2

542 changes: 538 additions & 4 deletions
paket.lock

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
src/IfSharp.Kernel/App.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,6 +244,10 @@ module App =
 printfn "Saving kernel icon [%s]" logo32File
 IfSharpResources.ifsharp_32logo().Save(logo32File)

 printfn "Installing dependencies via Paket"
 let dependencies = Paket.Dependencies.Locate()
 dependencies.Install(false)

 if start then
 (
 printfn "Starting ipython..."
Expand Down

2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Globals.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@
/// This module provides access to common types and functions so the user can get intellisense
[<AutoOpen>]
module Globals = 

 type Chart = FSharp.Charting.Chart

 type Util = IfSharp.Kernel.Util

Expand Down

857 changes: 849 additions & 8 deletions
src/IfSharp.Kernel/IfSharp.Kernel.fsproj

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Include.fsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,8 @@
#r "System.Data.dll"
#r "System.Windows.Forms.DataVisualization.dll"
//#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead
#r "FSharp.Charting.dll"
#r "NetMQ.dll"

// open the global functions and methods
open FSharp.Charting
open IfSharp.Kernel
open IfSharp.Kernel.Globals

1 change: 0 additions & 1 deletion
src/IfSharp.Kernel/MainTypes.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
namespace IfSharp.Kernel

open System.Collections.Generic
open FSharp.Charting

type ConnectionInformation = 
 {
Expand Down

56 changes: 13 additions & 43 deletions
src/IfSharp.Kernel/Printers.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,29 +3,28 @@
open System
open System.Text
open System.Web
open System.Drawing
open System.Drawing.Imaging
open System.IO
open FSharp.Charting
//open System.Drawing
//open System.Drawing.Imaging
//open System.IO

module Printers =
module Printers =

 let mutable internal displayPrinters : list<Type * (obj -> BinaryOutput)> = []

 /// Convenience method for encoding a string within HTML
 let internal htmlEncode(str) = HttpUtility.HtmlEncode(str)

 /// Adds a custom display printer for extensibility
 let internal addDisplayPrinter(printer : 'T -> BinaryOutput) =
 let addDisplayPrinter(printer : 'T -> BinaryOutput) =
 displayPrinters <- (typeof<'T>, (fun (x:obj) -> printer (unbox x))) :: displayPrinters

 /// Default display printer
 let internal defaultDisplayPrinter(x) =
 let defaultDisplayPrinter(x) =
 { ContentType = "text/plain"; Data = sprintf "%A" x }

 /// Finds a display printer based off of the type
 let internal findDisplayPrinter(findType) =
 let printers =
 let findDisplayPrinter(findType) =
 let printers =
 displayPrinters
 |> Seq.filter (fun (t, _) -> t.IsAssignableFrom(findType))
 |> Seq.toList
Expand All@@ -36,39 +35,10 @@ module Printers =
 (typeof<obj>, defaultDisplayPrinter)

 /// Adds default display printers
 let internal addDefaultDisplayPrinters() = 

 // add generic chart printer
 addDisplayPrinter(fun (x:ChartTypes.GenericChart) ->
 { ContentType = "image/png"; Data = x.ToPng() }
 )

 // add chart printer
 addDisplayPrinter(fun (x:GenericChartWithSize) ->
 { ContentType = "image/png"; Data = x.Chart.ToPng(x.Size) }
 )

 addDisplayPrinter(fun (x:GenericChartsWithSize) ->
 let count = x.Charts.Length
 let (width, height) = x.Size
 let totalWidth = if count = 1 then width else width * x.Columns
 let numRows = int (Math.Ceiling (float count / float x.Columns))
 let totalHeight = numRows * height
 let finalBitmap = new Bitmap(totalWidth, totalHeight)
 let finalGraphics = Graphics.FromImage(finalBitmap)
 let copy i (chart:ChartTypes.GenericChart) =
 let img = chart.ToPng(x.Size)
 let bitmap = new Bitmap(new MemoryStream(img))
 finalGraphics.DrawImage(bitmap, i % x.Columns * width, i / x.Columns * height)
 List.iteri copy x.Charts;
 finalGraphics.Dispose();
 let ms = new MemoryStream()
 finalBitmap.Save(ms, ImageFormat.Png);
 { ContentType = "image/png"; Data = ms.ToArray() }
 )
 let addDefaultDisplayPrinters() =

 // add table printer
 addDisplayPrinter(fun (x:TableOutput) ->
 addDisplayPrinter(fun (x:TableOutput) ->
 let sb = StringBuilder()
 sb.Append("<table>") |> ignore

Expand All@@ -90,13 +60,13 @@ module Printers =
 sb.Append("<td>") |> ignore
 sb.Append(htmlEncode cell) |> ignore
 sb.Append("</td>") |> ignore

 sb.Append("</tr>") |> ignore
 sb.Append("<tbody>") |> ignore
 sb.Append("</tbody>") |> ignore
 sb.Append("</table>") |> ignore

 { ContentType = "text/html"; Data = sb.ToString() }
 { ContentType = "text/html"; Data = sb.ToString() }
 )

 // add svg printer
Expand All@@ -108,7 +78,7 @@ module Printers =
 addDisplayPrinter(fun (x:HtmlOutput) ->
 { ContentType = "text/html"; Data = x.Html }
 )

 // add latex printer
 addDisplayPrinter(fun (x:LatexOutput) ->
 { ContentType = "text/latex"; Data = x.Latex }
Expand Down

58 changes: 3 additions & 55 deletions
src/IfSharp.Kernel/Util.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,9 @@ open System.Net
open System.Text
open System.Drawing.Imaging
open System.Windows.Forms
open System.Xml;
open System.Xml.Linq;
open System.Xml.XPath;
open FSharp.Charting
open System.Xml
open System.Xml.Linq
open System.Xml.XPath

type BinaryOutput =
 { 
Expand DownExpand Up@@ -39,18 +38,7 @@ type SvgOutput =
 Svg: string;
 }

type GenericChartWithSize = 
 {
 Chart: ChartTypes.GenericChart;
 Size: int * int;
 }

type GenericChartsWithSize =
 {
 Charts: ChartTypes.GenericChart list;
 Size: int * int;
 Columns: int;
 }

[<AutoOpen>]
module ExtensionMethods =
Expand All@@ -71,45 +59,7 @@ module ExtensionMethods =

 sb.ToString()

 type ChartTypes.GenericChart with 

 /// Wraps a GenericChartWithSize around the GenericChart
 member self.WithSize(x:int, y:int) =
 {
 Chart = self;
 Size = (x, y);
 }

 /// Converts the GenericChart to a PNG, in order to do this, we must show a form with ChartControl on it, save the bmp, then write the png to memory
 member self.ToPng(?size) =

 // get the size
 let (width, height) = if size.IsNone then (320, 240) else size.Value

 // create a new ChartControl in order to get the underlying Chart
 let ctl = new ChartTypes.ChartControl(self)

 // save
 use ms = new MemoryStream()
 let actualChart = ctl.Controls.[0] :?> System.Windows.Forms.DataVisualization.Charting.Chart
 actualChart.Dock <- DockStyle.None
 actualChart.Size <- Size(width, height)
 actualChart.SaveImage(ms, ImageFormat.Png)
 ms.ToArray()

 member self.ToData(?size) =
 let bytes = match size with Some size -> self.ToPng(size) | _ -> self.ToPng()
 let base64 = Convert.ToBase64String(bytes)
 let data = "data:image/png;base64,"+base64
 data

 type FSharp.Charting.Chart with

 /// Wraps a GenericChartWithSize around the GenericChart
 static member WithSize(x:int, y:int) = 

 fun (ch : #ChartTypes.GenericChart) ->
 ch.WithSize(x, y)

type Util = 

Expand DownExpand Up@@ -177,8 +127,6 @@ type Util =
 static member Image (fileName:string) =
 Util.Image (File.ReadAllBytes(fileName))

 static member MultipleCharts (charts: ChartTypes.GenericChart list) (size:int*int) (cols:int) =
 { Charts = charts; Size = size; Columns = cols }

 static member CreatePublicFile (name:string) (content:byte[]) =
 try
Expand Down

17 changes: 16 additions & 1 deletion
src/IfSharp.Kernel/app.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,19 @@
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
 </dependentAssembly>
 <dependentAssembly>
 <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All@@ -20,4 +32,7 @@
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
 <startup>
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
 </startup>
</configuration>
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Remove hard FSCharting dependency #65

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

cgravill
merged 8 commits into

from

Sep 7, 2016
 Merged


Remove hard FSCharting dependency #65
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
581a611

Initial rip out of FSCharting. Note that FSCharting.Gtk depends a loc…


npmurphy May 5, 2016
c023cfc

merge


npmurphy May 5, 2016
f2c3251

Merge branch 'xplot' into fscharting_ripout


npmurphy May 5, 2016
b863186

merge with jupyter branch


npmurphy May 6, 2016
eaf94b1

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
01704a9

Merge remote-tracking branch 'refs/remotes/origin/jupyter' into pr/65


cgravill Sep 1, 2016
03c1e84

Use Paket.Core.dll to get dependencies on install


cgravill Sep 1, 2016
07b1f27

Merge pull request #6 from fsprojects/pr/65


npmurphy Sep 6, 2016

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


130 changes: 109 additions & 21 deletions
Feature Notebook format 4_0.ipynb

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 2 additions & 2 deletions
paket.dependencies

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ nuget FSharp.Compiler.Service 3.0.0 framework: >= net451
nuget FSharp.Core.Microsoft.Signed 3.1.1.1 framework: >= net45
nuget NetMQ 3.3.3.1
nuget Newtonsoft.Json 5.0.8 framework: >= net45
nuget FSharp.Charting 0.90.5 framework: >= net45
nuget FAKE
nuget xUnit >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget xunit.runner.console >= 2.1 framework: >= net451
nuget Paket.Core >= 3.17.2

542 changes: 538 additions & 4 deletions
paket.lock

View file


Open in desktop


Large diffs are not rendered by default.


4 changes: 4 additions & 0 deletions
src/IfSharp.Kernel/App.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -244,6 +244,10 @@ module App =
 printfn "Saving kernel icon [%s]" logo32File
 IfSharpResources.ifsharp_32logo().Save(logo32File)

 printfn "Installing dependencies via Paket"
 let dependencies = Paket.Dependencies.Locate()
 dependencies.Install(false)

 if start then
 (
 printfn "Starting ipython..."
Expand Down

2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Globals.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,8 +3,6 @@
/// This module provides access to common types and functions so the user can get intellisense
[<AutoOpen>]
module Globals = 

 type Chart = FSharp.Charting.Chart

 type Util = IfSharp.Kernel.Util

Expand Down

857 changes: 849 additions & 8 deletions
src/IfSharp.Kernel/IfSharp.Kernel.fsproj

View file


Open in desktop


Large diffs are not rendered by default.


2 changes: 0 additions & 2 deletions
src/IfSharp.Kernel/Include.fsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,10 +6,8 @@
#r "System.Data.dll"
#r "System.Windows.Forms.DataVisualization.dll"
//#r "FSharp.Data.TypeProviders.dll" //Can be accessed by #N "FSharp.Data.TypeProviders" instead
#r "FSharp.Charting.dll"
#r "NetMQ.dll"

// open the global functions and methods
open FSharp.Charting
open IfSharp.Kernel
open IfSharp.Kernel.Globals

1 change: 0 additions & 1 deletion
src/IfSharp.Kernel/MainTypes.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
namespace IfSharp.Kernel

open System.Collections.Generic
open FSharp.Charting

type ConnectionInformation = 
 {
Expand Down

56 changes: 13 additions & 43 deletions
src/IfSharp.Kernel/Printers.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,29 +3,28 @@
open System
open System.Text
open System.Web
open System.Drawing
open System.Drawing.Imaging
open System.IO
open FSharp.Charting
//open System.Drawing
//open System.Drawing.Imaging
//open System.IO

module Printers =
module Printers =

 let mutable internal displayPrinters : list<Type * (obj -> BinaryOutput)> = []

 /// Convenience method for encoding a string within HTML
 let internal htmlEncode(str) = HttpUtility.HtmlEncode(str)

 /// Adds a custom display printer for extensibility
 let internal addDisplayPrinter(printer : 'T -> BinaryOutput) =
 let addDisplayPrinter(printer : 'T -> BinaryOutput) =
 displayPrinters <- (typeof<'T>, (fun (x:obj) -> printer (unbox x))) :: displayPrinters

 /// Default display printer
 let internal defaultDisplayPrinter(x) =
 let defaultDisplayPrinter(x) =
 { ContentType = "text/plain"; Data = sprintf "%A" x }

 /// Finds a display printer based off of the type
 let internal findDisplayPrinter(findType) =
 let printers =
 let findDisplayPrinter(findType) =
 let printers =
 displayPrinters
 |> Seq.filter (fun (t, _) -> t.IsAssignableFrom(findType))
 |> Seq.toList
Expand All@@ -36,39 +35,10 @@ module Printers =
 (typeof<obj>, defaultDisplayPrinter)

 /// Adds default display printers
 let internal addDefaultDisplayPrinters() = 

 // add generic chart printer
 addDisplayPrinter(fun (x:ChartTypes.GenericChart) ->
 { ContentType = "image/png"; Data = x.ToPng() }
 )

 // add chart printer
 addDisplayPrinter(fun (x:GenericChartWithSize) ->
 { ContentType = "image/png"; Data = x.Chart.ToPng(x.Size) }
 )

 addDisplayPrinter(fun (x:GenericChartsWithSize) ->
 let count = x.Charts.Length
 let (width, height) = x.Size
 let totalWidth = if count = 1 then width else width * x.Columns
 let numRows = int (Math.Ceiling (float count / float x.Columns))
 let totalHeight = numRows * height
 let finalBitmap = new Bitmap(totalWidth, totalHeight)
 let finalGraphics = Graphics.FromImage(finalBitmap)
 let copy i (chart:ChartTypes.GenericChart) =
 let img = chart.ToPng(x.Size)
 let bitmap = new Bitmap(new MemoryStream(img))
 finalGraphics.DrawImage(bitmap, i % x.Columns * width, i / x.Columns * height)
 List.iteri copy x.Charts;
 finalGraphics.Dispose();
 let ms = new MemoryStream()
 finalBitmap.Save(ms, ImageFormat.Png);
 { ContentType = "image/png"; Data = ms.ToArray() }
 )
 let addDefaultDisplayPrinters() =

 // add table printer
 addDisplayPrinter(fun (x:TableOutput) ->
 addDisplayPrinter(fun (x:TableOutput) ->
 let sb = StringBuilder()
 sb.Append("<table>") |> ignore

Expand All@@ -90,13 +60,13 @@ module Printers =
 sb.Append("<td>") |> ignore
 sb.Append(htmlEncode cell) |> ignore
 sb.Append("</td>") |> ignore

 sb.Append("</tr>") |> ignore
 sb.Append("<tbody>") |> ignore
 sb.Append("</tbody>") |> ignore
 sb.Append("</table>") |> ignore

 { ContentType = "text/html"; Data = sb.ToString() }
 { ContentType = "text/html"; Data = sb.ToString() }
 )

 // add svg printer
Expand All@@ -108,7 +78,7 @@ module Printers =
 addDisplayPrinter(fun (x:HtmlOutput) ->
 { ContentType = "text/html"; Data = x.Html }
 )

 // add latex printer
 addDisplayPrinter(fun (x:LatexOutput) ->
 { ContentType = "text/latex"; Data = x.Latex }
Expand Down

58 changes: 3 additions & 55 deletions
src/IfSharp.Kernel/Util.fs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,9 @@ open System.Net
open System.Text
open System.Drawing.Imaging
open System.Windows.Forms
open System.Xml;
open System.Xml.Linq;
open System.Xml.XPath;
open FSharp.Charting
open System.Xml
open System.Xml.Linq
open System.Xml.XPath

type BinaryOutput =
 { 
Expand DownExpand Up@@ -39,18 +38,7 @@ type SvgOutput =
 Svg: string;
 }

type GenericChartWithSize = 
 {
 Chart: ChartTypes.GenericChart;
 Size: int * int;
 }

type GenericChartsWithSize =
 {
 Charts: ChartTypes.GenericChart list;
 Size: int * int;
 Columns: int;
 }

[<AutoOpen>]
module ExtensionMethods =
Expand All@@ -71,45 +59,7 @@ module ExtensionMethods =

 sb.ToString()

 type ChartTypes.GenericChart with 

 /// Wraps a GenericChartWithSize around the GenericChart
 member self.WithSize(x:int, y:int) =
 {
 Chart = self;
 Size = (x, y);
 }

 /// Converts the GenericChart to a PNG, in order to do this, we must show a form with ChartControl on it, save the bmp, then write the png to memory
 member self.ToPng(?size) =

 // get the size
 let (width, height) = if size.IsNone then (320, 240) else size.Value

 // create a new ChartControl in order to get the underlying Chart
 let ctl = new ChartTypes.ChartControl(self)

 // save
 use ms = new MemoryStream()
 let actualChart = ctl.Controls.[0] :?> System.Windows.Forms.DataVisualization.Charting.Chart
 actualChart.Dock <- DockStyle.None
 actualChart.Size <- Size(width, height)
 actualChart.SaveImage(ms, ImageFormat.Png)
 ms.ToArray()

 member self.ToData(?size) =
 let bytes = match size with Some size -> self.ToPng(size) | _ -> self.ToPng()
 let base64 = Convert.ToBase64String(bytes)
 let data = "data:image/png;base64,"+base64
 data

 type FSharp.Charting.Chart with

 /// Wraps a GenericChartWithSize around the GenericChart
 static member WithSize(x:int, y:int) = 

 fun (ch : #ChartTypes.GenericChart) ->
 ch.WithSize(x, y)

type Util = 

Expand DownExpand Up@@ -177,8 +127,6 @@ type Util =
 static member Image (fileName:string) =
 Util.Image (File.ReadAllBytes(fileName))

 static member MultipleCharts (charts: ChartTypes.GenericChart list) (size:int*int) (cols:int) =
 { Charts = charts; Size = size; Columns = cols }

 static member CreatePublicFile (name:string) (content:byte[]) =
 try
Expand Down

17 changes: 16 additions & 1 deletion
src/IfSharp.Kernel/app.config

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,19 @@
 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 <dependentAssembly>
 <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
 <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
 <bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
 <bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
 </dependentAssembly>
 <dependentAssembly>
 <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All@@ -20,4 +32,7 @@
 </dependentAssembly>
 </assemblyBinding>
 </runtime>
 <startup>
 <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1" />
 </startup>
</configuration>
Loading