Skip to content

Commit 157f270

Browse files
daniel-lundindaniel-lundin
committed
Moved all tests to test/
1 parent e4461c2 commit 157f270

File tree

6 files changed

+78
-116
lines changed

6 files changed

+78
-116
lines changed

‎test.html

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎tests/file_fixtures.js renamed to ‎test/file_fixtures.js

File renamed without changes.

‎test/glfuse.html

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
<!DOCTYPE HTML>
2+
<html>
3+
4+
<head>
5+
<title>DICOM</title>
6+
7+
<script type="text/javascript" src="../js/glMatrix-0.9.5.min.js"></script>
8+
<script type="text/javascript" src="../js/glpainter.js"></script>
9+
<script type="text/javascript" src="../js/shaders.js"></script>
10+
<script type="text/javascript" src="../jquery/js/jquery-1.6.2.min.js"></script>
11+
<script type="text/javascript" src="../jquery/js/jquery-ui-1.8.16.custom.min.js"></script>
12+
13+
<script type="text/javascript" src="../js/dcmdict.js"></script>
14+
<script type="text/javascript" src="../js/cluts/plain.js"></script>
15+
<script type="text/javascript" src="../js/cluts/rainbow.js"></script>
16+
<script type="text/javascript" src="../js/cluts/blackbody.js"></script>
17+
<script type="text/javascript" src="../js/tools.js"></script>
18+
<script type="text/javascript" src="../js/binutils.js"></script>
19+
<script type="text/javascript" src="../js/utilities.js"></script>
20+
<script type="text/javascript" src="../js/dcmserie.js"></script>
21+
<script type="text/javascript" src="../js/dcmfile.js"></script>
22+
<script type="text/javascript" src="../js/dicomparser.js"></script>
23+
<script type="text/javascript" src="../js/transfersyntax.js"></script>
24+
<script type="text/javascript" src="../js/presentation.js"></script>
25+
<script type="text/javascript" src="file_fixtures.js"></script>
26+
27+
<script type="text/javascript">
28+
var pixel_data;
29+
var file1, file2;
30+
$(document).ready(function() {
31+
32+
var filedata1 = base64_to_typedarray(filefixture1);
33+
var filedata2 = base64_to_typedarray(filefixture2);
34+
35+
var parser = new DicomParser(filedata1);
36+
file1 = parser.parse_file();
37+
38+
var parser = new DicomParser(filedata2);
39+
file2 = parser.parse_file();
40+
41+
painter = new GLPainter("c1");
42+
painter.init();
43+
painter.fuse_files(file1, file2, 0.3);
44+
//painter.fuse_files(file1, file2, 0.5);
45+
//painter.set_file(file1);
46+
painter.set_windowing(40, 200);
47+
painter.set_cluts(plain_red, plain_green, plain_blue);
48+
painter.draw_image();
49+
});
50+
</script>
51+
52+
</head>
53+
<body>
54+
<canvas id="c1" width="512" height="512"></canvas>
55+
</body>
56+
</html>

‎test/glpainter.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$(document).ready(function(){
22
test("Work with GL Unproject", function() {
3-
glp = new GLPainter();
4-
glp.init("testcanvas")
3+
glp = new GLPainter("testcanvas");
4+
glp.init()
55
glp.update_projection_matrix();
66
glp.rows = 1024;
77
glp.columns = 512;

‎touch.html renamed to ‎test/touch.html

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44
<head>
55
<title>DICOM</title>
66

7-
<script type="text/javascript" src="js/touch.min.js"></script>
8-
<script type="text/javascript" src="js/glMatrix-0.9.5.min.js"></script>
9-
<script type="text/javascript" src="js/glpainter.js"></script>
10-
<script type="text/javascript" src="js/canvaspainter.js"></script>
11-
<script type="text/javascript" src="js/shaders.js"></script>
12-
<script type="text/javascript" src="jquery/js/jquery-1.6.2.min.js"></script>
13-
<script type="text/javascript" src="jquery/js/jquery-ui-1.8.16.custom.min.js"></script>
7+
<script type="text/javascript" src="../js/touch.min.js"></script>
8+
<script type="text/javascript" src="../js/glMatrix-0.9.5.min.js"></script>
9+
<script type="text/javascript" src="../js/glpainter.js"></script>
10+
<script type="text/javascript" src="../js/canvaspainter.js"></script>
11+
<script type="text/javascript" src="../js/shaders.js"></script>
12+
<script type="text/javascript" src="../jquery/js/jquery-1.6.2.min.js"></script>
13+
<script type="text/javascript" src="../jquery/js/jquery-ui-1.8.16.custom.min.js"></script>
1414

15-
<script type="text/javascript" src="js/dcmdict.js"></script>
16-
<script type="text/javascript" src="js/cluts/plain.js"></script>
17-
<script type="text/javascript" src="js/cluts/rainbow.js"></script>
18-
<script type="text/javascript" src="js/cluts/blackbody.js"></script>
19-
<script type="text/javascript" src="js/tools.js"></script>
20-
<script type="text/javascript" src="js/binutils.js"></script>
21-
<script type="text/javascript" src="js/utilities.js"></script>
22-
<script type="text/javascript" src="js/dcmserie.js"></script>
23-
<script type="text/javascript" src="js/dcmfile.js"></script>
24-
<script type="text/javascript" src="js/dicomparser.js"></script>
25-
<script type="text/javascript" src="js/transfersyntax.js"></script>
26-
<script type="text/javascript" src="js/presentation.js"></script>
27-
<script type="text/javascript" src="tests/file_fixtures.js"></script>
15+
<script type="text/javascript" src="../js/dcmdict.js"></script>
16+
<script type="text/javascript" src="../js/cluts/plain.js"></script>
17+
<script type="text/javascript" src="../js/cluts/rainbow.js"></script>
18+
<script type="text/javascript" src="../js/cluts/blackbody.js"></script>
19+
<script type="text/javascript" src="../js/tools.js"></script>
20+
<script type="text/javascript" src="../js/binutils.js"></script>
21+
<script type="text/javascript" src="../js/utilities.js"></script>
22+
<script type="text/javascript" src="../js/dcmserie.js"></script>
23+
<script type="text/javascript" src="../js/dcmfile.js"></script>
24+
<script type="text/javascript" src="../js/dicomparser.js"></script>
25+
<script type="text/javascript" src="../js/transfersyntax.js"></script>
26+
<script type="text/javascript" src="../js/presentation.js"></script>
27+
<script type="text/javascript" src="file_fixtures.js"></script>
2828

2929
<script type="text/javascript">
3030
$(document).ready(function() {

‎webgl.html

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)