Skip to content

Commit ed58d0d

Browse files
NicolasRannouNicolasRannou
committed
Merge branch 'dev'
2 parents 85aa5c5 + b13d810 commit ed58d0d

File tree

23 files changed

+454
-81
lines changed

23 files changed

+454
-81
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ Volume rendering, 2D viewer, arbitrary reslicing and more examples and advanced
212212
|-------------------- |----------- |----------------- |------------------------ |
213213
| ✅ 2D Visulization | ✅ Dicom | ✅ VTK (THREEJS) | 🔶 Handle (2D/3D) |
214214
| ✅ 3D Visualization | ✅ NRRD | ✅ STL (THREEJS) | 🔶 Probe (2D/3D) |
215-
| ✅ Volume Rendering | 🔶 Nifti | 🔶 TRK | 🔶 Ruler (2D/3D) |
215+
| ✅ Volume Rendering | ✅ Nifti | 🔶 TRK | 🔶 Ruler (2D/3D) |
216216
| ✅ Lookup Tables | ❌ MGH/MGZ | ❌ CURV | 🔶 Angle (2D/3D) |
217-
| 🔶 Label Maps | ❌ JPEG | ❌ FSM | 🔶 Orientation (2D/3D) |
217+
| 🔶 Label Maps | ❌ JPEG | ❌ FSM | 🔶 Orientation (2D/3D) |
218218

219219
## Usage
220220

@@ -247,7 +247,7 @@ Add AMI in your index.html **after** THREEJS.
247247
```
248248
# index.html
249249
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r81/three.js"></script>
250-
<script src="https://cdnjs.cloudflare.com/ajax/libs/ami.js/0.0.11/ami.min.js"></script>
250+
<script src="https://cdnjs.cloudflare.com/ajax/libs/ami.js/0.0.12/ami.min.js"></script>
251251
<script src="app.js"></script>
252252
253253
#app.js

‎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.12",
3+
"version": "0.0.13",
44
"dependencies": {}
5-
}
5+
}

‎build/ami.js‎

Lines changed: 152 additions & 12 deletions
Large diffs are not rendered by default.

‎build/ami.min.js‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/viewers_upload/viewers_upload.css‎

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,9 @@
33
outline: none;
44
}
55

6-
#stats {
7-
position: absolute;
8-
top:0;
9-
left: 0;
10-
}
116

12-
#r3d {
13-
background-color: #000;
7+
#viewer, #r3d, #orientation {
8+
background-color: #212121;
149
left: 0;
1510
right: 0;
1611
top: 0;
@@ -21,6 +16,44 @@
2116
overflow:hidden;
2217
}
2318

19+
#orientation {
20+
display: flex;
21+
align-items: center;
22+
justify-content: center;
23+
24+
}
25+
26+
.direction {
27+
z-index: 1;
28+
color: #fff;
29+
text-transform: uppercase;
30+
font-size: 16px;
31+
position: absolute;
32+
margin: 14px;
33+
padding: 4px;
34+
border-radius: 50%;
35+
width: 18px;
36+
height: 18px;
37+
text-align: center;
38+
background-color: rgba(0, 0, 0, .3);
39+
}
40+
41+
#top {
42+
top: 24px;
43+
}
44+
45+
#bottom {
46+
bottom: 0;
47+
}
48+
49+
#left {
50+
left: 0;
51+
}
52+
53+
#right {
54+
right: 0;
55+
}
56+
2457
#my-gui-container {
2558
position: fixed;
2659
top: 30px;
@@ -65,7 +98,7 @@
6598
left: 0;
6699
bottom: 0;
67100
right: 0;
68-
background-color: #B0BEC5;
101+
background-color: #212121;
69102
z-index: 99;
70103
align-items: center;
71104
display: flex;

‎examples/viewers_upload/viewers_upload.html‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,15 @@
1212
<div id="my-lut-canvases"></div>
1313
</div>
1414

15-
<div id="r3d"></div>
15+
<div id="viewer">
16+
<div id="orientation">
17+
<div id="top" class="direction"></div>
18+
<div id="bottom" class="direction"></div>
19+
<div id="left" class="direction"></div>
20+
<div id="right" class="direction"></div>
21+
</div>
22+
<div id="r3d"></div>
23+
</div>
24+
25+
1626
<div style="background-color: #f9f9f9; width: 0; height: 0;"></div>

‎examples/viewers_upload/viewers_upload.js‎

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ function init() {
3232
// render
3333
controls.update();
3434
renderer.render(scene, camera);
35-
statsyay.update();
3635

3736
// request new frame
3837
requestAnimationFrame(function() {
@@ -46,17 +45,10 @@ function init() {
4645
antialias: true
4746
});
4847
renderer.setSize(threeD.clientWidth, threeD.clientHeight);
49-
renderer.setClearColor(0x607D8B, 1);
50-
51-
//let maxTextureSize = renderer.context.getParameter(renderer.context.MAX_TEXTURE_SIZE);
52-
//let maxTextureImageUnits = renderer.context.getParameter(renderer.context.MAX_TEXTURE_IMAGE_UNITS);
48+
renderer.setClearColor(0x212121, 1);
5349

5450
threeD.appendChild(renderer.domElement);
5551

56-
// stats
57-
statsyay = new Stats();
58-
threeD.appendChild(statsyay.domElement);
59-
6052
// scene
6153
scene = new THREE.Scene();
6254
// camera
@@ -81,6 +73,29 @@ window.onload = function() {
8173
// init threeJS...
8274
init();
8375

76+
function updateLabels( labels, modality ){
77+
78+
if( modality === 'CR' ||
79+
modality === 'DX' ){
80+
81+
return;
82+
83+
}
84+
85+
var top = document.getElementById('top');
86+
top.innerHTML = labels[0];
87+
88+
var bottom = document.getElementById('bottom');
89+
bottom.innerHTML = labels[1];
90+
91+
var right = document.getElementById('right');
92+
right.innerHTML = labels[2];
93+
94+
var left = document.getElementById('left');
95+
left.innerHTML = labels[3];
96+
97+
}
98+
8499
function buildGUI(stackHelper) {
85100
let stack = stackHelper._stack;
86101

@@ -126,18 +141,24 @@ window.onload = function() {
126141
let invertRows = cameraFolder.add(camUtils, 'invertRows');
127142
invertRows.onChange(function() {
128143
camera.invertRows();
144+
updateLabels( camera.directionsLabel, stack.modality );
129145
});
130146

131147
let invertColumns = cameraFolder.add(camUtils, 'invertColumns');
132148
invertColumns.onChange(function() {
133149
camera.invertColumns();
150+
updateLabels( camera.directionsLabel, stack.modality );
134151
});
135152

136153
let angle = cameraFolder.add(camera, 'angle', 0, 360).step(1).listen();
154+
angle.onChange(function() {
155+
updateLabels( camera.directionsLabel, stack.modality );
156+
});
137157

138158
let rotate = cameraFolder.add(camUtils, 'rotate');
139159
rotate.onChange(function() {
140160
camera.rotate();
161+
updateLabels( camera.directionsLabel, stack.modality );
141162
});
142163

143164
let orientationUpdate = cameraFolder.add(camUtils, 'orientation', ['default', 'axial', 'coronal', 'sagittal']);
@@ -146,16 +167,18 @@ window.onload = function() {
146167
camera.update();
147168
camera.fitBox(2);
148169
stackHelper.orientation = camera.stackOrientation;
170+
updateLabels( camera.directionsLabel, stack.modality );
149171
});
150172

151173
let conventionUpdate = cameraFolder.add(camUtils, 'convention', ['radio', 'neuro']);
152174
conventionUpdate.onChange(function(value) {
153175
camera.convention = value;
154176
camera.update();
155177
camera.fitBox(2);
178+
updateLabels( camera.directionsLabel, stack.modality );
156179
});
157180

158-
cameraFolder.open();
181+
//cameraFolder.open();
159182
}
160183

161184
function hookCallbacks(stackHelper) {
@@ -239,7 +262,7 @@ window.onload = function() {
239262

240263
let stackHelper = new HelpersStack(stack);
241264
stackHelper.bbox.visible = false;
242-
stackHelper.border.color = 0x9996F3;
265+
stackHelper.border.visible = false;
243266
scene.add(stackHelper);
244267

245268
// set camera
@@ -268,6 +291,7 @@ window.onload = function() {
268291
camera.update();
269292
camera.fitBox(2);
270293

294+
updateLabels( camera.directionsLabel, stack.modality );
271295
buildGUI(stackHelper);
272296
hookCallbacks(stackHelper);
273297
}

‎lessons/00/demo.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515

1616
<!-- AMI CDN -->
17-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ami.js//0.0.12/ami.min.js"></script>
17+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ami.js//0.0.13/ami.min.js"></script>
1818

1919

2020

‎lessons/01/demo.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
<!-- AMI CDN -->
18-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ami.js//0.0.12/ami.min.js"></script>
18+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ami.js//0.0.13/ami.min.js"></script>
1919

2020

2121

‎lessons/02/demo.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222

2323
<!-- AMI CDN -->
24-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ami.js//0.0.12/ami.min.js"></script>
24+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ami.js//0.0.13/ami.min.js"></script>
2525

2626

2727

0 commit comments

Comments
 (0)