Skip to content

Commit 99a6e61

Browse files
committed
Merge branch 'master' into dev
2 parents 625c356 + 20c5034 commit 99a6e61

File tree

72 files changed

+4964
-1891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+4964
-1891
lines changed

README.md

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,17 @@ Please submit pull request, open issues or contact us for any question, feature
134134
<tr>
135135
<!-- Lesson 06 -->
136136
<td valign="middle" width="100">
137-
<!--<a href='http://jsfiddle.net/gh/get/library/pure/fnndsc/ami/tree/master/lessons/02#run' target=_blank>-->
138-
<!-- <img src="https://cdn.rawgit.com/fnndsc/ami/master/lessons/02/thumbnail-128x128.jpg" alt="lesson00" title="Click me!">-->
139-
<!-- <img src="http://xtk.github.com/fiddlelogo_small2.png">-->
140-
<!--</a>-->
137+
<a href='http://jsfiddle.net/gh/get/library/pure/fnndsc/ami/tree/master/lessons/06#run' target=_blank>
138+
<img src="https://cloud.githubusercontent.com/assets/214063/20212355/fdf512b2-a802-11e6-884d-bfafd0a1ec7d.gif" style="width:128x, height:128px" alt="lesson00" title="Click me!">
139+
<img src="http://xtk.github.com/fiddlelogo_small2.png">
140+
</a>
141141
</td>
142142
<td valign="top" width="326">
143-
<!--<a href='http://jsfiddle.net/gh/get/library/pure/fnndsc/ami/tree/master/lessons/02#run'>-->
143+
<a href='http://jsfiddle.net/gh/get/library/pure/fnndsc/ami/tree/master/lessons/06#run'>
144144
<b>Lesson 06: Volume Rendering</b>
145-
<!--</a>-->
145+
</a>
146146
<div>
147-
Volume Rendering - coming soon.
147+
Volume Rendering.
148148
</div>
149149
</td>
150150

@@ -185,11 +185,11 @@ Volume rendering, 2D viewer, arbitrary reslicing and more examples and advanced
185185

186186
#### Widgets
187187

188-
:large_orange_diamond: Handle (2D/3D)
188+
:white_check_mark: Handle (2D/3D)
189189

190-
:large_orange_diamond: Probe (2D/3D)
190+
:white_check_mark: Probe (2D/3D)
191191

192-
:large_orange_diamond: Ruler (2D/3D)
192+
:white_check_mark: Ruler (2D/3D)
193193

194194
:large_orange_diamond: Angle (2D/3D)
195195

@@ -201,9 +201,9 @@ Volume rendering, 2D viewer, arbitrary reslicing and more examples and advanced
201201

202202
:white_check_mark: NRRD
203203

204-
:large_orange_diamond: Nifti
204+
:white_check_mark: Nifti
205205

206-
:x: MGH/MGZ
206+
:large_orange_diamond: MGH/MGZ
207207

208208
:x: JPEG
209209

@@ -215,9 +215,9 @@ Volume rendering, 2D viewer, arbitrary reslicing and more examples and advanced
215215

216216
:large_orange_diamond: TRK
217217

218+
:large_orange_diamond: FSM
219+
218220
:x: CURV
219-
220-
:x: FSM
221221

222222
## Pre-requisites
223223

@@ -284,7 +284,7 @@ $> npm run example geometries_slice
284284

285285
To run lessons (browserify/babelify/serve the lesson)
286286
```
287-
$> run lesson <lesson number>
287+
$> npm run lesson <lesson number>
288288
289289
# run lesson 00
290290
$> npm run lesson 00
@@ -331,6 +331,10 @@ AMI would not exist without them:
331331
* Nifti parsing relies on it.
332332
* Author(s): [rii-mango](https://github.com/rii-mango)
333333

334+
##### [NRRD-JS](https://github.com/scijs/nrrd-js)
335+
* NRRD parsing relies on it.
336+
* Author(s): [jaspervdg](https://github.com/jaspervdg)
337+
334338
##### [JPEGLosslessDecoderJS](https://github.com/rii-mango/JPEGLosslessDecoderJS)
335339
* JPEG Lossless Decoder for DICOM images
336340
* Author(s): [rii-mango](https://github.com/rii-mango)

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"name": "ami.js",
3-
"version": "v0.0.9-dev",
3+
"version": "v0.0.9",
44
"dependencies": {}
5-
}
5+
}

0 commit comments

Comments
 (0)