Permalink
Browse files

Revert to 6f0b28d

  • Loading branch information...
1 parent 0bbc500 commit 8dbde3f043e6f80b2ad5615e1fafb62e7a7e78fd Daniel Haehn committed Sep 26, 2012
View
0 .gitignore 100755 → 100644
No changes.
View
0 README.md 100755 → 100644
No changes.
View
0 css/bootstrap-responsive.css 100755 → 100644
No changes.
View
0 css/bootstrap.css 100755 → 100644
No changes.
View
0 css/frontpage.css 100755 → 100644
No changes.
View
0 css/jquery.miniColors.css 100755 → 100644
No changes.
View
0 css/jquery.sidebar.css 100755 → 100644
No changes.
View
28 css/viewer.css 100755 → 100644
@@ -4,12 +4,6 @@
left: 10px;
}
-#bch_logo {
- position: absolute;
- bottom: 47px;
- left: 10px;
-}
-
.threeDRenderer {
background-color: #000;
width: 80%;
@@ -64,24 +58,4 @@
transform: scaleX(-1);
filter: FlipH;
-ms-filter: "FlipH";
-}
-
-#atlas_selector {
- position: absolute;
- bottom: 14px;
- left: 200px;
- font-size: 1.2em;
-}
-
-#credits {
- position: absolute;
- left: 10px;
- bottom: 15px;
-}
-
-.toolbar_icon {
- cursor: pointer;
- position: absolute;
- opacity: 0.7;
- left:10px;
-}
+}
View
BIN gfx/._hide.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN gfx/._show.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/14yrold.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/2d.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/2yrold_small.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/3d.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/avf_small.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Deleted file not rendered
View
0 gfx/brainstem_small.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/dicom.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/fibers.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/filebutton.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/hide.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/miniColors/circle.gif 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/miniColors/gradient.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/miniColors/line.gif 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/miniColors/rainbow.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/miniColors/trigger.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/show.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/slicedrop.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/slicedrop_logo.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/slicedrop_transparent.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 gfx/surface.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
101 index.html 100755 → 100644
@@ -71,7 +71,6 @@
<script type='text/javascript' src='js/x.rendering.js'></script>
<script type='text/javascript' src='js/xtk.js'></script>
-
<!-- Google Analytics -->
<script type="text/javascript">
var _gaq = _gaq || [];
@@ -156,7 +155,8 @@
<ul class='thumbnails'>
<li>
<div class='thumbnail'>
- <img src='gfx/fibers.png' alt='' /> Fibers<br />(.trk)<br /> <br />
+ <img src='gfx/fibers.png' alt='' /> Fibers<br />(.trk)<br />
+ <br />
</div>
</li>
<li>
@@ -168,7 +168,8 @@
<li>
<div class='thumbnail'>
<img src='gfx/surface.png' alt='' /> Models<br />(.vtk / .stl /
- FreeSurfer)<br /> <br />
+ FreeSurfer)<br />
+ <br />
</div>
</li>
</ul>
@@ -182,8 +183,8 @@
href='http://childrenshospital.org/FNNDSC' target='_blank'>Boston
Children's Hospital</a></li>
<li style='line-height: 18px'><a
- href='https://github.com/slicedrop/slicedrop.github.com'
- target='_blank'>Source Code</a></li>
+ href='https://github.com/slicedrop/slicedrop.github.com' target='_blank'>Source
+ Code</a></li>
<li style='line-height: 18px'><a href='mailto:dev@goxtk.com'
target='_blank'>Send Feedback</a></li>
</ul>
@@ -394,95 +395,37 @@
<div id='sliceX' class='twoDRenderer' style='top: 0%;'>
<div id='yellow_slider'></div>
<span class='ui-icon ui-icon-extlink ren2d_icon ren2d_icon_flip'
- onclick='javascript:showLarge(jQuery("#sliceX"),sliceX);'
- title="Enlarge"></span> <span
- class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon'
- onclick='javascript:_current_X_content.rotateCounter();'
- style="left: 20px;" title="Rotate"></span> <span
- class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon ren2d_icon_flip'
- onclick='javascript:_current_X_content.rotate();'
- style="left: 30px;" title="Rotate"></span>
+ onclick='javascript:showLarge(jQuery("#sliceX"),sliceX);' title="Enlarge"></span>
+ <span class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon'
+ onclick='javascript:_current_X_content.rotateCounter();' style="left:20px;" title="Rotate"></span>
+ <span class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon ren2d_icon_flip'
+ onclick='javascript:_current_X_content.rotate();' style="left:30px;" title="Rotate"></span>
</div>
<div id='sliceY' class='twoDRenderer' style='top: 33.333%;'>
<div id='red_slider'></div>
<span class='ui-icon ui-icon-extlink ren2d_icon ren2d_icon_flip'
- onclick='javascript:showLarge(jQuery("#sliceY"), sliceY);'
- title="Enlarge"></span> <span
- class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon'
- onclick='javascript:_current_Y_content.rotateCounter();'
- style="left: 20px;" title="Rotate"></span> <span
- class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon ren2d_icon_flip'
- onclick='javascript:_current_Y_content.rotate();'
- style="left: 30px;" title="Rotate"></span>
+ onclick='javascript:showLarge(jQuery("#sliceY"), sliceY);' title="Enlarge"></span>
+ <span class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon'
+ onclick='javascript:_current_Y_content.rotateCounter();' style="left:20px;" title="Rotate"></span>
+ <span class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon ren2d_icon_flip'
+ onclick='javascript:_current_Y_content.rotate();' style="left:30px;" title="Rotate"></span>
</div>
<div id='sliceZ' class='twoDRenderer' style='top: 66.666%;'>
<div id='green_slider'></div>
<span class='ui-icon ui-icon-extlink ren2d_icon ren2d_icon_flip'
- onclick='javascript:showLarge(jQuery("#sliceZ"), sliceZ);'
- title="Enlarge"></span> <span
- class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon'
- onclick='javascript:_current_Z_content.rotateCounter();'
- style="left: 20px;" title="Rotate"></span> <span
- class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon ren2d_icon_flip'
- onclick='javascript:_current_Z_content.rotate();'
- style="left: 30px;" title="Rotate"></span>
+ onclick='javascript:showLarge(jQuery("#sliceZ"), sliceZ);' title="Enlarge"></span>
+ <span class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon'
+ onclick='javascript:_current_Z_content.rotateCounter();' style="left:20px;" title="Rotate"></span>
+ <span class='ui-icon ui-icon-arrowreturnthick-1-w ren2d_icon ren2d_icon_flip'
+ onclick='javascript:_current_Z_content.rotate();' style="left:30px;" title="Rotate"></span>
</div>
<!-- Slice:Drop logo -->
<div id='blacklogo'>
- <a href=''><img src='gfx/slicedrop_transparent.png' /></a> <span
- class='ui-icon ui-icon-image toolbar_icon' title='Split Screen'
- onclick='javascript:split_screen()'></span><span
- class='ui-icon ui-icon-image toolbar_icon' style='left: 20px'
- title='Split Screen' onclick='javascript:split_screen()'></span>
- </div>
-
-
- <div id='atlas_selector'>
- <span id="atlas_selection" style='margin-top: 3px; float: left;'><input
- type="radio" id="a_23" name="weeks" /><label for="a_23">23</label>
- <input type="radio" id="a_24" name="weeks" /><label for="a_24">24</label>
- <input type="radio" id="a_25" name="weeks" /><label for="a_25">25</label>
- <input type="radio" id="a_26" name="weeks" /><label for="a_26">26</label>
- <input type="radio" id="a_27" name="weeks" /><label for="a_27">27</label>
- <input type="radio" id="a_28" name="weeks" /><label for="a_28">28</label>
- <input type="radio" id="a_29" name="weeks" /><label for="a_29">29</label>
- <input type="radio" id="a_30" name="weeks" /><label for="a_30">30</label>
- <input type="radio" id="a_31" name="weeks" /><label for="a_31">31</label>
- <input type="radio" id="a_32" name="weeks" /><label for="a_32">32</label>
- <input type="radio" id="a_33" name="weeks" /><label for="a_33">33</label>
- <input type="radio" id="a_34" name="weeks" /><label for="a_34">34</label>
- <input type="radio" id="a_35" name="weeks" /><label for="a_35">35</label>
- <input type="radio" id="a_36" name="weeks" /><label for="a_36">36</label>
- <input type="radio" id="a_37" name="weeks" /><label for="a_37">37</label>
- &nbsp;weeks</span> <span id='options'
- style='margin-top: 3px; margin-left: 20px; float: right;'><label
- for="labelmap">Labelmap</label> <input type="checkbox" id="labelmap"
- name="labelmap" onclick='javascript:loadLabelmap();' /> <label
- for="ventricles">3D Ventricles</label> <input type="checkbox"
- id="ventricles" name="ventricles"
- onclick='javascript:loadVentricles();' /> <label for="cortex">3D
- Cortex</label> <input type="checkbox" id="cortex" name="cortex"
- onclick='javascript:loadCortex();' /></span>
+ <a href=''><img src='gfx/slicedrop_transparent.png' /></a>
</div>
- </div>
- <div id='credits'>
- <a
- href="http://biomedic.doc.ic.ac.uk/brain-development/index.php?n=Main.Fetal"
- style='color: darkgrey; font-size: 0.9em;' target='_blank'>Data
- from<br />Imperial College
- </a>
</div>
- <div id='bch_logo'>
- <a href='http://childrenshospital.org/FNNDSC/' target='_blank'><img
- src='gfx/bch_logo.png' /></a>
- </div>
-
-
- </div>
-
-
</body>
</html>
View
BIN js/._jquery.filestyle.js 100755 → 100644
Binary file not shown.
View
0 js/bootstrap-modal.js 100755 → 100644
No changes.
View
0 js/jquery.filestyle.js 100755 → 100644
No changes.
View
@@ -8,25 +8,9 @@
jQuery(document).ready(function() {
- // initBrowserWarning();
- // initDnD();
- // initExamples();
-
-
- // enable the button set for the atlas selection
- jQuery('#atlas_selection').buttonset();
- jQuery('#options').buttonset();
- // .. and the call backs
- jQuery('#atlas_selection :radio').click(function(e) {
-
- var _id = jQuery(this).attr("id");
- _id = _id.split('_')[1];
-
- var _atlas_file = _id;
-
- location.href = "index.html?" + _atlas_file;
-
- });
+ initBrowserWarning();
+ initDnD();
+ initExamples();
ren3d = null;
configurator = function() {
@@ -40,32 +24,27 @@ jQuery(document).ready(function() {
var _file = location.href.match(/(\?)(\w*.\w*)*/)[0];
_file = _file.replace('?', '').replace('/', ''); // replace any ? or /
- __labelmap = null;
-
- // select the correct button for the atlas
- _week = _file.split('.')[0];
- if (_file.split('.').length > 1) {
+ if (_file == '14yrold') {
+
+ load14yrold();
+
+ } else if (_file == 'avf') {
- __labelmap = true;
- jQuery('#labelmap').attr('checked', true);
- jQuery('#options').buttonset('refresh');
+ loadAvf();
+
+ } else if (_file == '2yrold') {
+
+ load2yrold();
+
+ } else if (_file == 'brainstem') {
+
+ loadBrainstem();
+
+ } else {
+
+ loadFile(_file);
}
- jQuery('#a_' + _week).attr('checked', true);
- jQuery('#atlas_selection').buttonset('refresh'); // and refresh to
- // propagate to UI
-
- loadFile(_week + '/template.nii');
-
- } else {
-
- _week = 28;
- __labelmap = null;
- jQuery('#a_' + _week).attr('checked', true);
- jQuery('#atlas_selection').buttonset('refresh'); // and refresh to
- // propagate to UI
-
- loadFile('28/template.nii');
}
View
0 js/jquery.idTabs.js 100755 → 100644
No changes.
View
0 js/jquery.js 100755 → 100644
No changes.
View
0 js/jquery.miniColors.js 100755 → 100644
No changes.
View
0 js/jquery.sidebar.fibers.js 100755 → 100644
No changes.
View
0 js/jquery.sidebar.js 100755 → 100644
No changes.
View
0 js/jquery.sidebar.mesh.js 100755 → 100644
No changes.
View
0 js/jquery.sidebar.volume.js 100755 → 100644
No changes.
View
0 js/jquery.ui.slider.js 100755 → 100644
No changes.
View
16 js/jquery.viewer.js 100755 → 100644
@@ -20,19 +20,3 @@ jQuery(function() {
jQuery("#green_slider .ui-slider-handle").unbind('keydown');
});
-
-
-// splits the document into two frames
-function split_screen() {
-
- if (parent.viewer_left !== undefined) {
- // exit if we are already in split screen mode
- return;
- }
-
- frameset = '<FRAMESET cols="50%,50%" BORDER=3>' + '<FRAME src="' +
- document.location.href + '"' + ' NAME="viewer_left">' + '<FRAME src="' +
- document.location.href + '"' + ' NAME="viewer_right">' + '</FRAMESET>';
- location = 'javascript:frameset';
-
-};
View
10 js/x.controller.js 100755 → 100644
@@ -129,16 +129,6 @@ function setupUi() {
_current_Y_content = sliceY;
_current_Z_content = sliceZ;
- // here show the axial slice large
- showLarge(jQuery("#sliceZ"), sliceZ);
-
- if (!_webgl_supported) {
- // adjust the css for the 3d renderer in case it was not shown
- jQuery('#sliceZ').css('position', 'absolute');
- // also remove all small icons when webgl is not supported
- jQuery('#sliceZ').empty();
- }
-
}
Oops, something went wrong.

0 comments on commit 8dbde3f

Please sign in to comment.