|
42 | 42 | },
|
43 | 43 | {
|
44 | 44 | "cell_type": "code",
|
45 |
| - "execution_count": 1, |
| 45 | + "execution_count": null, |
46 | 46 | "metadata": {},
|
47 |
| - "outputs": [ |
48 |
| - { |
49 |
| - "data": { |
50 |
| - "application/vnd.jupyter.widget-view+json": { |
51 |
| - "model_id": "be93de90-c346-4955-9e83-ce5cb7b4e746", |
52 |
| - "version_major": 2, |
53 |
| - "version_minor": 0 |
54 |
| - } |
55 |
| - }, |
56 |
| - "metadata": {}, |
57 |
| - "output_type": "display_data" |
58 |
| - }, |
59 |
| - { |
60 |
| - "data": { |
61 |
| - "application/vnd.jupyter.widget-view+json": { |
62 |
| - "model_id": "82697020-e4c2-4a71-b28e-96ec8515dd23", |
63 |
| - "version_major": 2, |
64 |
| - "version_minor": 0 |
65 |
| - } |
66 |
| - }, |
67 |
| - "metadata": {}, |
68 |
| - "output_type": "display_data" |
69 |
| - } |
70 |
| - ], |
| 47 | + "outputs": [], |
71 | 48 | "source": [
|
72 | 49 | "import Graphics.Rendering.Chart\n",
|
73 | 50 | "import IHaskell.Display.Widgets\n",
|
|
85 | 62 | "integralTrapezoid _ = 0\n",
|
86 | 63 | "\n",
|
87 | 64 | "sliderRange <- mkFloatRangeSlider\n",
|
88 |
| - "setField sliderRange MinFloat (fst domain)\n", |
89 |
| - "setField sliderRange MaxFloat (snd domain)\n", |
90 |
| - "setField sliderRange StepFloat (Just grain)\n", |
91 |
| - "setField sliderRange FloatPairValue (fst domain, snd domain)\n", |
| 65 | + "setField @MinFloat sliderRange (fst domain)\n", |
| 66 | + "setField @MaxFloat sliderRange (snd domain)\n", |
| 67 | + "setField @StepFloat sliderRange (Just grain)\n", |
| 68 | + "setField @FloatPairValue sliderRange (fst domain, snd domain)\n", |
92 | 69 | "\n",
|
93 | 70 | "outChart <- mkOutput\n",
|
94 | 71 | "\n",
|
95 | 72 | "drawChart = do \n",
|
96 |
| - " (rangeMin, rangeMax) <- getField sliderRange FloatPairValue\n", |
| 73 | + " (rangeMin, rangeMax) <- getField @FloatPairValue sliderRange\n", |
97 | 74 | " let \n",
|
98 | 75 | " pts = [(x, f x) | x <- [fst domain, fst domain + grain .. snd domain]] \n",
|
99 | 76 | " ptsRange = [(x,y) | (x,y) <- pts, x >= rangeMin, x <= rangeMax]\n",
|
|
103 | 80 | " [ toPlot $ def & plot_lines_values .~ [pts]\n",
|
104 | 81 | " , toPlot $ def & plot_fillbetween_values .~ [(x,(0.0,y)) | (x,y) <- ptsRange]\n",
|
105 | 82 | " ]\n",
|
106 |
| - " setField outChart Outputs [OutputData displayCaption, OutputData displayChart]\n", |
| 83 | + " setField @Outputs outChart [OutputData displayCaption, OutputData displayChart]\n", |
107 | 84 | " \n",
|
108 |
| - "setField sliderRange ChangeHandler drawChart\n", |
| 85 | + "setField @ChangeHandler sliderRange drawChart\n", |
109 | 86 | "\n",
|
110 | 87 | "sliderRange\n",
|
111 | 88 | "outChart\n",
|
|
127 | 104 | },
|
128 | 105 | {
|
129 | 106 | "cell_type": "code",
|
130 |
| - "execution_count": 2, |
| 107 | + "execution_count": null, |
131 | 108 | "metadata": {},
|
132 |
| - "outputs": [ |
133 |
| - { |
134 |
| - "data": { |
135 |
| - "application/vnd.jupyter.widget-view+json": { |
136 |
| - "model_id": "42d8c25d-9542-490c-a843-b284e2482e2d", |
137 |
| - "version_major": 2, |
138 |
| - "version_minor": 0 |
139 |
| - } |
140 |
| - }, |
141 |
| - "metadata": {}, |
142 |
| - "output_type": "display_data" |
143 |
| - }, |
144 |
| - { |
145 |
| - "data": { |
146 |
| - "application/vnd.jupyter.widget-view+json": { |
147 |
| - "model_id": "6fd1b872-30e4-4c07-b864-2f293d13dca8", |
148 |
| - "version_major": 2, |
149 |
| - "version_minor": 0 |
150 |
| - } |
151 |
| - }, |
152 |
| - "metadata": {}, |
153 |
| - "output_type": "display_data" |
154 |
| - } |
155 |
| - ], |
| 109 | + "outputs": [], |
156 | 110 | "source": [
|
157 | 111 | "import Diagrams.Prelude\n",
|
158 | 112 | "import Diagrams.TwoD.Apollonian\n",
|
159 | 113 | "import IHaskell.Display.Widgets\n",
|
160 | 114 | "\n",
|
161 | 115 | "sliderApollo <- mkFloatSlider\n",
|
162 |
| - "setField sliderApollo MinFloat 3.0\n", |
163 |
| - "setField sliderApollo MaxFloat 9.0\n", |
164 |
| - "setField sliderApollo StepFloat (Just 0.1)\n", |
165 |
| - "setField sliderApollo FloatValue 6.0\n", |
| 116 | + "setField @MinFloat sliderApollo 3.0\n", |
| 117 | + "setField @MaxFloat sliderApollo 9.0\n", |
| 118 | + "setField @StepFloat sliderApollo (Just 0.1)\n", |
| 119 | + "setField @FloatValue sliderApollo 6.0\n", |
166 | 120 | "\n",
|
167 | 121 | "outApollo <- mkOutput\n",
|
168 | 122 | "\n",
|
169 | 123 | "drawApollo = do\n",
|
170 |
| - " val <- getField sliderApollo FloatValue\n", |
| 124 | + " val <- getField @FloatValue sliderApollo\n", |
171 | 125 | " replaceOutput outApollo $ diagram $ apollonianGasket 0.01 2 4 val\n",
|
172 | 126 | "\n",
|
173 |
| - "setField sliderApollo ChangeHandler drawApollo\n", |
| 127 | + "setField @ChangeHandler sliderApollo drawApollo\n", |
174 | 128 | "\n",
|
175 | 129 | "sliderApollo\n",
|
176 | 130 | "outApollo\n",
|
177 | 131 | "drawApollo"
|
178 | 132 | ]
|
| 133 | + }, |
| 134 | + { |
| 135 | + "cell_type": "code", |
| 136 | + "execution_count": null, |
| 137 | + "metadata": {}, |
| 138 | + "outputs": [], |
| 139 | + "source": [] |
179 | 140 | }
|
180 | 141 | ],
|
181 | 142 | "metadata": {
|
|
190 | 151 | "mimetype": "text/x-haskell",
|
191 | 152 | "name": "haskell",
|
192 | 153 | "pygments_lexer": "Haskell",
|
193 |
| - "version": "8.10.4" |
| 154 | + "version": "9.8.4" |
194 | 155 | }
|
195 | 156 | },
|
196 | 157 | "nbformat": 4,
|
|
0 commit comments