Skip to content

G
gargantext-ihaskell
Commit 783bcb94 authored by Andrew Gibiansky's avatar Andrew Gibiansky
Browse files
Options

Merge branch 'master' of github.com:gibiansky/IHaskell

parents 89ba1ded 0a3a8995
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 336 additions and 2193 deletions
ihaskell-display/ihaskell-plot/ihaskell-plot.cabal
View file @ 783bcb94
...@@ -61,6 +61,7 @@ library ...@@ -61,6 +61,7 @@ library
build-depends: base >=4.6 && <4.9, build-depends: base >=4.6 && <4.9,
plot, plot,
bytestring, bytestring,
hmatrix >= 0.10 && <0.17,
ihaskell >= 0.6.2 ihaskell >= 0.6.2
-- Directories containing source files. -- Directories containing source files.
......
ihaskell-display/ihaskell-widgets/Examples/Bool Widgets.ipynb
View file @ 783bcb94
...@@ -22,13 +22,14 @@ ...@@ -22,13 +22,14 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 1, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"{-# LANGUAGE OverloadedStrings #-}\n", "{-# LANGUAGE OverloadedStrings #-}\n",
"{-# LANGUAGE FlexibleContexts #-}\n",
"import IHaskell.Display.Widgets\n", "import IHaskell.Display.Widgets\n",
"import Data.Text (pack, unpack)\n", "import Data.Text (pack, unpack)\n",
"import Text.Printf (printf)" "import Text.Printf (printf)"
...@@ -43,18 +44,20 @@ ...@@ -43,18 +44,20 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 2, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"-- Constructors\n", "-- Check box\n",
"chk <- mkCheckBox\n", "chk <- mkCheckBox\n",
"\n",
"-- Toggle button\n",
"tgb <- mkToggleButton\n", "tgb <- mkToggleButton\n",
"\n", "\n",
"-- For demonstration\n", "-- Valid widget: Displaying booleans conveniently\n",
"o <- mkHTMLWidget" "vld <- mkValidWidget"
] ]
}, },
{ {
...@@ -66,16 +69,16 @@ ...@@ -66,16 +69,16 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 3, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"-- Display\n", "-- Display the widgets\n",
"chk\n", "chk\n",
"tgb\n", "tgb\n",
"o" "vld"
] ]
}, },
{ {
...@@ -87,38 +90,23 @@ ...@@ -87,38 +90,23 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 4, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"setField chk Description \"Bool 1: \"\n", "setField chk Description \"Bool 1: \"\n",
"setField tgb Description \"Bool 2\"\n", "setField tgb Description \"Bool 2\"\n",
"\n", "\n",
"-- Helper function\n",
"refresh b =\n",
" let stat = if b then \"green\" else \"red\"\n",
" fmt = \"<div style=\\\"background:%s;color:#ffffff\\\"><b>%s</b></div>\"\n",
" in setField o StringValue $ pack $ printf fmt stat (show b)\n",
"\n",
" -- Cosmetic changes\n", " -- Cosmetic changes\n",
"setField o Description \"Bool 1 && Bool 2\"\n", "setField vld Description \"Bool 1 && Bool 2\"\n",
"setField o Padding 10\n",
"\n", "\n",
" -- And (&&) the two values, and send output to html widget\n", " -- And (&&) the two values, and send output to html widget\n",
"setHandler w = setField w ChangeHandler $ do\n", "setHandler w = setField w ChangeHandler $ do\n",
" b1 <- getField chk BoolValue\n", " b1 <- getField chk BoolValue\n",
" b2 <- getField tgb BoolValue\n", " b2 <- getField tgb BoolValue\n",
" refresh (b1 && b2)\n", " setField vld BoolValue (b1 && b2)\n",
"\n", "\n",
"setHandler chk\n", "setHandler chk\n",
"setHandler tgb" "setHandler tgb"
...@@ -142,7 +130,7 @@ ...@@ -142,7 +130,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 5, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -163,19 +151,11 @@ ...@@ -163,19 +151,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 6, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"sign <- mkCheckBox\n", "sign <- mkCheckBox\n",
"bits <- replicateM 7 mkToggleButton\n", "bits <- replicateM 7 mkToggleButton\n",
...@@ -195,19 +175,11 @@ ...@@ -195,19 +175,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 7, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"box <- mkFlexBox\n", "box <- mkFlexBox\n",
"out <- mkHTMLWidget\n", "out <- mkHTMLWidget\n",
...@@ -248,19 +220,11 @@ ...@@ -248,19 +220,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 8, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"import Control.Arrow (first, second)\n", "import Control.Arrow (first, second)\n",
"\n", "\n",
...@@ -295,6 +259,12 @@ ...@@ -295,6 +259,12 @@
"display_name": "Haskell", "display_name": "Haskell",
"language": "haskell", "language": "haskell",
"name": "haskell" "name": "haskell"
},
"language_info": {
"codemirror_mode": "ihaskell",
"file_extension": ".hs",
"name": "haskell",
"version": "7.10.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
ihaskell-display/ihaskell-widgets/Examples/Image Widget.ipynb
View file @ 783bcb94
...@@ -104,6 +104,12 @@ ...@@ -104,6 +104,12 @@
"display_name": "Haskell", "display_name": "Haskell",
"language": "haskell", "language": "haskell",
"name": "haskell" "name": "haskell"
},
"language_info": {
"codemirror_mode": "ihaskell",
"file_extension": ".hs",
"name": "haskell",
"version": "7.10.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
ihaskell-display/ihaskell-widgets/Examples/Numeric Widgets.ipynb
View file @ 783bcb94
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 1, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 2, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": false
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 3, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -77,19 +77,11 @@ ...@@ -77,19 +77,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 4, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"setField bit MaxInt 20\n", "setField bit MaxInt 20\n",
"setField bit MinInt 10\n", "setField bit MinInt 10\n",
...@@ -119,7 +111,7 @@ ...@@ -119,7 +111,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 5, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -131,7 +123,7 @@ ...@@ -131,7 +123,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 6, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -143,21 +135,11 @@ ...@@ -143,21 +135,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 7, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": [
"(25,75)"
]
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"getField irs IntPairValue" "getField irs IntPairValue"
] ]
...@@ -178,7 +160,7 @@ ...@@ -178,7 +160,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 8, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -190,19 +172,11 @@ ...@@ -190,19 +172,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 9, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"setField inp IntValue 42" "setField inp IntValue 42"
] ]
...@@ -213,6 +187,12 @@ ...@@ -213,6 +187,12 @@
"display_name": "Haskell", "display_name": "Haskell",
"language": "haskell", "language": "haskell",
"name": "haskell" "name": "haskell"
},
"language_info": {
"codemirror_mode": "ihaskell",
"file_extension": ".hs",
"name": "haskell",
"version": "7.10.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
ihaskell-display/ihaskell-widgets/Examples/Plotting UI.ipynb
View file @ 783bcb94
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 1, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
"outputs": [], "outputs": [],
"source": [ "source": [
"{-# LANGUAGE OverloadedStrings #-}\n", "{-# LANGUAGE OverloadedStrings #-}\n",
"{-# LANGUAGE FlexibleContexts #-}\n",
"import IHaskell.Display.Widgets" "import IHaskell.Display.Widgets"
] ]
}, },
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 2, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -83,19 +84,11 @@ ...@@ -83,19 +84,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 3, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"import Data.IORef\n", "import Data.IORef\n",
"import Graphics.Rendering.Chart.Easy hiding (tan)\n", "import Graphics.Rendering.Chart.Easy hiding (tan)\n",
...@@ -164,19 +157,11 @@ ...@@ -164,19 +157,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 4, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"divBox <- mkFlexBox\n", "divBox <- mkFlexBox\n",
"setField divBox Orientation HorizontalOrientation\n", "setField divBox Orientation HorizontalOrientation\n",
...@@ -204,20 +189,12 @@ ...@@ -204,20 +189,12 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 5, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false, "collapsed": false,
"scrolled": true "scrolled": true
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"slBox <- mkFlexBox\n", "slBox <- mkFlexBox\n",
"\n", "\n",
...@@ -244,19 +221,11 @@ ...@@ -244,19 +221,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 6, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"-- The four FlexBox widgets.\n", "-- The four FlexBox widgets.\n",
"import Control.Monad (replicateM, forM_)\n", "import Control.Monad (replicateM, forM_)\n",
...@@ -302,19 +271,11 @@ ...@@ -302,19 +271,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 7, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"-- A FlexBox with ToggleButtons\n", "-- A FlexBox with ToggleButtons\n",
"buttonBox <- mkFlexBox\n", "buttonBox <- mkFlexBox\n",
...@@ -339,19 +300,11 @@ ...@@ -339,19 +300,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 8, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"import Control.Arrow (first, second)\n", "import Control.Arrow (first, second)\n",
"\n", "\n",
...@@ -384,19 +337,11 @@ ...@@ -384,19 +337,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 9, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"setField tlBox Children $ map ChildWidget $ boxes ++ [buttonBox] ++ rangeBoxes" "setField tlBox Children $ map ChildWidget $ boxes ++ [buttonBox] ++ rangeBoxes"
] ]
...@@ -410,19 +355,11 @@ ...@@ -410,19 +355,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 10, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"setField tlBox Titles [\"Plot title\", \"X-Label\", \"Y-Label\", \"Grid\", \"X-range\", \"Y-range\"]" "setField tlBox Titles [\"Plot title\", \"X-Label\", \"Y-Label\", \"Grid\", \"X-range\", \"Y-range\"]"
] ]
...@@ -436,19 +373,11 @@ ...@@ -436,19 +373,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 11, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"let syncVal widget value fieldGetter = readIORef plotState >>= setField widget value . fieldGetter\n", "let syncVal widget value fieldGetter = readIORef plotState >>= setField widget value . fieldGetter\n",
" in do\n", " in do\n",
...@@ -478,7 +407,7 @@ ...@@ -478,7 +407,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 12, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -500,22 +429,11 @@ ...@@ -500,22 +429,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 13, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"-- Spurious update to display empty plot instead of empty image initially\n", "-- Spurious update to display empty plot instead of empty image initially\n",
"update return\n", "update return\n",
...@@ -532,7 +450,7 @@ ...@@ -532,7 +450,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 14, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -543,7 +461,7 @@ ...@@ -543,7 +461,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 15, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -554,7 +472,7 @@ ...@@ -554,7 +472,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 16, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -569,6 +487,12 @@ ...@@ -569,6 +487,12 @@
"display_name": "Haskell", "display_name": "Haskell",
"language": "haskell", "language": "haskell",
"name": "haskell" "name": "haskell"
},
"language_info": {
"codemirror_mode": "ihaskell",
"file_extension": ".hs",
"name": "haskell",
"version": "7.10.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
ihaskell-display/ihaskell-widgets/Examples/Selection Widgets.ipynb
View file @ 783bcb94
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 1, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 2, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -49,19 +49,11 @@ ...@@ -49,19 +49,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 3, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"setField msel Description \"Functions to show (One or more)\"\n", "setField msel Description \"Functions to show (One or more)\"\n",
"setField msel Options (OptionLabels [\"sin\", \"cos\"])\n", "setField msel Options (OptionLabels [\"sin\", \"cos\"])\n",
...@@ -79,20 +71,12 @@ ...@@ -79,20 +71,12 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 4, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false, "collapsed": false,
"scrolled": true "scrolled": true
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"import Graphics.Rendering.Chart.Easy hiding (tan)\n", "import Graphics.Rendering.Chart.Easy hiding (tan)\n",
"import Graphics.Rendering.Chart.Backend.Cairo\n", "import Graphics.Rendering.Chart.Backend.Cairo\n",
...@@ -140,92 +124,11 @@ ...@@ -140,92 +124,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 5, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
},
{
"data": {},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"-- Display the widgets\n", "-- Display the widgets\n",
"msel\n", "msel\n",
...@@ -246,6 +149,12 @@ ...@@ -246,6 +149,12 @@
"display_name": "Haskell", "display_name": "Haskell",
"language": "haskell", "language": "haskell",
"name": "haskell" "name": "haskell"
},
"language_info": {
"codemirror_mode": "ihaskell",
"file_extension": ".hs",
"name": "haskell",
"version": "7.10.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
ihaskell-display/ihaskell-widgets/Examples/String Widgets.ipynb
View file @ 783bcb94
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 1, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 2, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 3, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 4, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 5, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 6, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 7, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
...@@ -154,20 +154,12 @@ ...@@ -154,20 +154,12 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 8, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false, "collapsed": false,
"scrolled": true "scrolled": true
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"-- Some padding\n", "-- Some padding\n",
"setField text Padding 5" "setField text Padding 5"
...@@ -182,19 +174,11 @@ ...@@ -182,19 +174,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 9, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"setField text Placeholder \"Enter your text here...\"\n", "setField text Placeholder \"Enter your text here...\"\n",
"setField area Placeholder \"Parsed output will appear here...\"" "setField area Placeholder \"Parsed output will appear here...\""
...@@ -216,7 +200,7 @@ ...@@ -216,7 +200,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 10, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -239,7 +223,7 @@ ...@@ -239,7 +223,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 11, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -300,19 +284,11 @@ ...@@ -300,19 +284,11 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 12, "execution_count": null,
"metadata": { "metadata": {
"collapsed": false "collapsed": false
}, },
"outputs": [ "outputs": [],
{
"data": {
"text/plain": []
},
"metadata": {},
"output_type": "display_data"
}
],
"source": [ "source": [
"setField text ChangeHandler $ do\n", "setField text ChangeHandler $ do\n",
" input <- unpack <$> getField text StringValue\n", " input <- unpack <$> getField text StringValue\n",
...@@ -338,7 +314,7 @@ ...@@ -338,7 +314,7 @@
}, },
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": 13, "execution_count": null,
"metadata": { "metadata": {
"collapsed": true "collapsed": true
}, },
...@@ -354,6 +330,12 @@ ...@@ -354,6 +330,12 @@
"display_name": "Haskell", "display_name": "Haskell",
"language": "haskell", "language": "haskell",
"name": "haskell" "name": "haskell"
},
"language_info": {
"codemirror_mode": "ihaskell",
"file_extension": ".hs",
"name": "haskell",
"version": "7.10.2"
} }
}, },
"nbformat": 4, "nbformat": 4,
......
ihaskell-display/ihaskell-widgets/MsgSpec.md
View file @ 783bcb94
...@@ -8,26 +8,17 @@ ...@@ -8,26 +8,17 @@
## Creating widgets ## Creating widgets
Let's say the user types in some code, and the only effect of that code is the creation of a widget. Let's say the user types in some code, and the only effect of that code is the creation of a widget.
The kernel will open a comm for the widget, and store a reference to that comm inside it. Then, to The kernel will open a comm for the widget, and store a reference to that comm. The comm_open message
notify the frontend about the creation of a widget, an initial state update is sent on the widget's also holds the initial state of the widget in it, which is used by the frontend to create a model for
comm. the widget.
> The comm should be opened with a `target_name` of `"ipython.widget"`. > The comm should be opened with a `target_name` of `"ipython.widget"`.
The initial state update message looks like this:
```json
{
"method": "update",
"state": { "<some/all widget properties>" }
}
```
Any *numeric* property initialized with the empty string is provided the default value by the Any *numeric* property initialized with the empty string is provided the default value by the
frontend. Some numbers need to be sent as actual numbers (when non-null), whereas some (especially frontend. Some numbers need to be sent as actual numbers (when non-null), whereas the ones representing
those used by sliders) need to be sent as strings. lengths in CSS units need to be sent as strings.
The initial state update must *at least* have the following fields: The initial state must *at least* have the following fields:
- `msg_throttle` (default 3): To prevent the kernel from flooding with messages, the messages from - `msg_throttle` (default 3): To prevent the kernel from flooding with messages, the messages from
the widget to the kernel are throttled. If `msg_throttle` messages were sent, and all are still the widget to the kernel are throttled. If `msg_throttle` messages were sent, and all are still
...@@ -43,8 +34,8 @@ The initial state update must *at least* have the following fields: ...@@ -43,8 +34,8 @@ The initial state update must *at least* have the following fields:
- Rest of the properties as required initially. - Rest of the properties as required initially.
This state update is also used with fragments of the overall state to sync changes between the This state is also used with fragments of the overall state to sync changes between the frontend and
frontend and the kernel. the kernel.
## Displaying widgets ## Displaying widgets
...@@ -111,7 +102,7 @@ If this were not so, the frontend would not be able to determine under which cel ...@@ -111,7 +102,7 @@ If this were not so, the frontend would not be able to determine under which cel
input widget, when an `input_request` is received. input widget, when an `input_request` is received.
Now, widgets cannot send `execute_request` messages. They can only send `comm_data` messages, which Now, widgets cannot send `execute_request` messages. They can only send `comm_data` messages, which
means that it's not possible to fetch input through widget events. means that it's not possible to fetch input inside widget event handlers.
--- ---
......
ihaskell-display/ihaskell-widgets/ihaskell-widgets.cabal
View file @ 783bcb94
...@@ -104,7 +104,7 @@ library ...@@ -104,7 +104,7 @@ library
, nats -any , nats -any
, vinyl >= 0.5 , vinyl >= 0.5
, vector -any , vector -any
, singletons >= 0.9.0 , singletons >= 0.9.0 && <2.0.0.0
, scientific -any , scientific -any
, unix -any , unix -any
......
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets.hs
View file @ 783bcb94
...@@ -41,7 +41,6 @@ import IHaskell.Display.Widgets.String.Text as X ...@@ -41,7 +41,6 @@ import IHaskell.Display.Widgets.String.Text as X
import IHaskell.Display.Widgets.String.TextArea as X import IHaskell.Display.Widgets.String.TextArea as X
import IHaskell.Display.Widgets.Common as X import IHaskell.Display.Widgets.Common as X
import IHaskell.Display.Widgets.Types as X (setField, getField, properties, import IHaskell.Display.Widgets.Types as X (setField, getField, properties, triggerDisplay,
triggerDisplay, triggerChange, triggerClick, triggerChange, triggerClick, triggerSelection,
triggerSelection, triggerSubmit, triggerSubmit, ChildWidget(..))
ChildWidget(..))
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Bool/Valid.hs
View file @ 783bcb94
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
{-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE TypeSynonymInstances #-}
module IHaskell.Display.Widgets.Bool.Valid ( module IHaskell.Display.Widgets.Bool.Valid (
-- * The Valid Widget -- * The Valid Widget
ValidWidget, ValidWidget,
-- * Constructor -- * Constructor
mkValidWidget) where mkValidWidget) where
-- To keep `cabal repl` happy when running from the ihaskell repo -- To keep `cabal repl` happy when running from the ihaskell repo
import Prelude import Prelude
......
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Box/PlaceProxy.hs
View file @ 783bcb94
...@@ -3,12 +3,11 @@ ...@@ -3,12 +3,11 @@
{-# LANGUAGE DataKinds #-} {-# LANGUAGE DataKinds #-}
{-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE TypeSynonymInstances #-}
module IHaskell.Display.Widgets.Box.PlaceProxy ( module IHaskell.Display.Widgets.Box.PlaceProxy (
-- * The PlaceProxy widget -- * The PlaceProxy widget
PlaceProxy, PlaceProxy,
-- * Constructor -- * Constructor
mkPlaceProxy) where mkPlaceProxy) where
-- To keep `cabal repl` happy when running from the ihaskell repo -- To keep `cabal repl` happy when running from the ihaskell repo
import Prelude import Prelude
......
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Box/Proxy.hs
View file @ 783bcb94
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
module IHaskell.Display.Widgets.Box.Proxy ( module IHaskell.Display.Widgets.Box.Proxy (
-- * The Proxy widget -- * The Proxy widget
ProxyWidget, ProxyWidget,
-- * Constructor -- * Constructor
mkProxyWidget) where mkProxyWidget) where
-- To keep `cabal repl` happy when running from the ihaskell repo -- To keep `cabal repl` happy when running from the ihaskell repo
import Prelude import Prelude
......
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Common.hs
View file @ 783bcb94
...@@ -97,11 +97,11 @@ pattern Selector = S.SSelector ...@@ -97,11 +97,11 @@ pattern Selector = S.SSelector
closeWidget :: IHaskellWidget w => w -> IO () closeWidget :: IHaskellWidget w => w -> IO ()
closeWidget w = widgetSendClose w emptyObject closeWidget w = widgetSendClose w emptyObject
newtype StrInt = StrInt Integer newtype PixCount = PixCount Integer
deriving (Num, Ord, Eq, Enum) deriving (Num, Ord, Eq, Enum)
instance ToJSON StrInt where instance ToJSON PixCount where
toJSON (StrInt x) = toJSON . pack $ show x toJSON (PixCount x) = toJSON . pack $ show x ++ "px"
-- | Pre-defined border styles -- | Pre-defined border styles
data BorderStyleValue = NoBorder data BorderStyleValue = NoBorder
......
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs
View file @ 783bcb94
...@@ -13,7 +13,7 @@ import Data.Singletons.TH ...@@ -13,7 +13,7 @@ import Data.Singletons.TH
-- Widget properties -- Widget properties
singletons singletons
[d| [d|
data Field = ViewModule data Field = ViewModule
| ViewName | ViewName
| ModelModule | ModelModule
......
ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Types.hs
View file @ 783bcb94
...@@ -48,8 +48,8 @@ module IHaskell.Display.Widgets.Types where ...@@ -48,8 +48,8 @@ module IHaskell.Display.Widgets.Types where
-- --
-- The IPython widgets expect state updates of the form {"property": value}, where an empty string -- The IPython widgets expect state updates of the form {"property": value}, where an empty string
-- for numeric values is ignored by the frontend and the default value is used instead. Some numbers -- for numeric values is ignored by the frontend and the default value is used instead. Some numbers
-- need to be sent as numbers (represented by @Integer@), whereas some need to be sent as Strings -- need to be sent as numbers (represented by @Integer@), whereas some (css lengths) need to be sent
-- (@StrInt@). -- as Strings (@PixCount@).
-- --
-- Child widgets are expected to be sent as strings of the form "IPY_MODEL_<uuid>", where @<uuid>@ -- Child widgets are expected to be sent as strings of the form "IPY_MODEL_<uuid>", where @<uuid>@
-- represents the uuid of the widget's comm. -- represents the uuid of the widget's comm.
...@@ -58,7 +58,7 @@ module IHaskell.Display.Widgets.Types where ...@@ -58,7 +58,7 @@ module IHaskell.Display.Widgets.Types where
-- look at the supplied MsgSpec.md. -- look at the supplied MsgSpec.md.
-- --
-- Widgets are not able to do console input, the reason for that can be found in the messaging -- Widgets are not able to do console input, the reason for that can be found in the messaging
-- specification -- specification.
import Control.Monad (unless, join, when, void, mapM_) import Control.Monad (unless, join, when, void, mapM_)
import Control.Applicative ((<$>)) import Control.Applicative ((<$>))
import qualified Control.Exception as Ex import qualified Control.Exception as Ex
...@@ -128,7 +128,7 @@ type BoxClass = DOMWidgetClass :++ '[S.Children, S.OverflowX, S.OverflowY, S.Box ...@@ -128,7 +128,7 @@ type BoxClass = DOMWidgetClass :++ '[S.Children, S.OverflowX, S.OverflowY, S.Box
type SelectionContainerClass = BoxClass :++ '[S.Titles, S.SelectedIndex, S.ChangeHandler] type SelectionContainerClass = BoxClass :++ '[S.Titles, S.SelectedIndex, S.ChangeHandler]
-- Types associated with Fields. -- Types associated with Fields.
type family FieldType (f :: Field) :: * where type family FieldType (f :: Field) :: * where
FieldType S.ViewModule = Text FieldType S.ViewModule = Text
FieldType S.ViewName = Text FieldType S.ViewName = Text
...@@ -140,19 +140,19 @@ type family FieldType (f :: Field) :: * where ...@@ -140,19 +140,19 @@ type family FieldType (f :: Field) :: * where
FieldType S.Visible = Bool FieldType S.Visible = Bool
FieldType S.CSS = [(Text, Text, Text)] FieldType S.CSS = [(Text, Text, Text)]
FieldType S.DOMClasses = [Text] FieldType S.DOMClasses = [Text]
FieldType S.Width = StrInt FieldType S.Width = PixCount
FieldType S.Height = StrInt FieldType S.Height = PixCount
FieldType S.Padding = StrInt FieldType S.Padding = PixCount
FieldType S.Margin = StrInt FieldType S.Margin = PixCount
FieldType S.Color = Text FieldType S.Color = Text
FieldType S.BackgroundColor = Text FieldType S.BackgroundColor = Text
FieldType S.BorderColor = Text FieldType S.BorderColor = Text
FieldType S.BorderWidth = StrInt FieldType S.BorderWidth = PixCount
FieldType S.BorderRadius = StrInt FieldType S.BorderRadius = PixCount
FieldType S.BorderStyle = BorderStyleValue FieldType S.BorderStyle = BorderStyleValue
FieldType S.FontStyle = FontStyleValue FieldType S.FontStyle = FontStyleValue
FieldType S.FontWeight = FontWeightValue FieldType S.FontWeight = FontWeightValue
FieldType S.FontSize = StrInt FieldType S.FontSize = PixCount
FieldType S.FontFamily = Text FieldType S.FontFamily = Text
FieldType S.Description = Text FieldType S.Description = Text
FieldType S.ClickHandler = IO () FieldType S.ClickHandler = IO ()
...@@ -220,7 +220,7 @@ class CustomBounded a where ...@@ -220,7 +220,7 @@ class CustomBounded a where
upperBound :: a upperBound :: a
-- Set according to what IPython widgets use -- Set according to what IPython widgets use
instance CustomBounded StrInt where instance CustomBounded PixCount where
upperBound = 10 ^ 16 - 1 upperBound = 10 ^ 16 - 1
lowerBound = -(10 ^ 16 - 1) lowerBound = -(10 ^ 16 - 1)
...@@ -266,7 +266,7 @@ data WidgetType = ButtonType ...@@ -266,7 +266,7 @@ data WidgetType = ButtonType
| TabType | TabType
-- Fields associated with a widget -- Fields associated with a widget
type family WidgetFields (w :: WidgetType) :: [Field] where type family WidgetFields (w :: WidgetType) :: [Field] where
WidgetFields ButtonType = WidgetFields ButtonType =
DOMWidgetClass :++ DOMWidgetClass :++
...@@ -312,7 +312,8 @@ type family WidgetFields (w :: WidgetType) :: [Field] where ...@@ -312,7 +312,8 @@ type family WidgetFields (w :: WidgetType) :: [Field] where
'[S.Orientation, S.ShowRange, S.ReadOut, S.SliderColor] '[S.Orientation, S.ShowRange, S.ReadOut, S.SliderColor]
WidgetFields BoxType = BoxClass WidgetFields BoxType = BoxClass
WidgetFields ProxyType = WidgetClass :++ '[S.Child] WidgetFields ProxyType = WidgetClass :++ '[S.Child]
WidgetFields PlaceProxyType = WidgetFields ProxyType :++ '[S.Selector] WidgetFields PlaceProxyType =
WidgetFields ProxyType :++ '[S.Selector]
WidgetFields FlexBoxType = WidgetFields FlexBoxType =
BoxClass :++ '[S.Orientation, S.Flex, S.Pack, S.Align] BoxClass :++ '[S.Orientation, S.Flex, S.Pack, S.Align]
WidgetFields AccordionType = SelectionContainerClass WidgetFields AccordionType = SelectionContainerClass
......
src/IHaskell/IPython.hs
View file @ 783bcb94
...@@ -72,6 +72,13 @@ ipythonCommand = do ...@@ -72,6 +72,13 @@ ipythonCommand = do
Nothing -> "ipython" Nothing -> "ipython"
Just _ -> "jupyter" Just _ -> "jupyter"
locateIPython :: SH.Sh SH.FilePath
locateIPython = do
mbinary <- SH.which "ipython"
case mbinary of
Nothing -> SH.errorExit "The IPython binary could not be located"
Just ipython -> return ipython
-- | Run the IPython command with any arguments. The kernel is set to IHaskell. -- | Run the IPython command with any arguments. The kernel is set to IHaskell.
ipython :: Bool -- ^ Whether to suppress output. ipython :: Bool -- ^ Whether to suppress output.
-> [Text] -- ^ IPython command line arguments. -> [Text] -- ^ IPython command line arguments.
...@@ -201,15 +208,17 @@ installKernelspec replace opts = void $ do ...@@ -201,15 +208,17 @@ installKernelspec replace opts = void $ do
src <- liftIO $ Paths.getDataFileName $ "html/" ++ file src <- liftIO $ Paths.getDataFileName $ "html/" ++ file
SH.cp (SH.fromText $ T.pack src) (tmp SH.</> kernelName SH.</> file) SH.cp (SH.fromText $ T.pack src) (tmp SH.</> kernelName SH.</> file)
Just ipython <- SH.which "ipython" ipython <- locateIPython
let replaceFlag = ["--replace" | replace] let replaceFlag = ["--replace" | replace]
installPrefixFlag = maybe ["--user"] (\prefix -> ["--prefix", T.pack prefix]) (kernelSpecInstallPrefix opts) installPrefixFlag = maybe ["--user"] (\prefix -> ["--prefix", T.pack prefix]) (kernelSpecInstallPrefix opts)
cmd = concat [["kernelspec", "install"], installPrefixFlag, [SH.toTextIgnore kernelDir], replaceFlag] cmd = concat [["kernelspec", "install"], installPrefixFlag, [SH.toTextIgnore kernelDir], replaceFlag]
SH.silently $ SH.run ipython cmd SH.silently $ SH.run ipython cmd
kernelSpecCreated :: SH.Sh Bool kernelSpecCreated :: SH.Sh Bool
kernelSpecCreated = do kernelSpecCreated = do
Just ipython <- SH.which "ipython" ipython <- locateIPython
out <- SH.silently $ SH.run ipython ["kernelspec", "list"] out <- SH.silently $ SH.run ipython ["kernelspec", "list"]
let kernelspecs = map T.strip $ T.lines out let kernelspecs = map T.strip $ T.lines out
return $ T.pack kernelName `elem` kernelspecs return $ T.pack kernelName `elem` kernelspecs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment