Skip to content

Fix #312, force the expected ordering of scans in volume viewer. #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
natacha-beck merged 2 commits into from
Oct 5, 2016
Merged

Fix #312, force the expected ordering of scans in volume viewer. #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
410e9da
Fix #312, force the expected ordering of scans in volume viewer.
Oct 4, 2016
310ad14
Handle ordering of larger numbers of images.
Oct 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/brainbrowser/volume-viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@
* @name viewer
* @property {array} volumes Volumes to be displayed.
* @property {boolean} synced Are the cursors being synced across volumes?
* @property {array} containers The div containers for each volume.
* @property {DOMElement} dom_element The DOM element where the viewer
* will be inserted.
* @property {active_panel} active_panel The slice panel that's currently
Expand Down Expand Up @@ -316,6 +317,7 @@
var viewer = {
dom_element: dom_element,
volumes: [],
containers: [],
synced: false
};

Expand Down
19 changes: 18 additions & 1 deletion src/brainbrowser/volume-viewer/modules/loading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ BrainBrowser.VolumeViewer.modules.loading = function(viewer) {
});

viewer.volumes = [];
viewer.containers = [];
viewer.active_panel = null;
viewer.dom_element.innerHTML = "";
};
Expand Down Expand Up @@ -719,7 +720,23 @@ BrainBrowser.VolumeViewer.modules.loading = function(viewer) {
});
})();

dom_element.appendChild(container);
viewer.containers[vol_id] = container;

/* See if a subsequent volume has already been loaded. If so we want
* to be sure that this container is inserted before the subsequent
* container. This guarantees the ordering of elements.
*/
var containers = viewer.containers;
var next_id;
for (next_id = vol_id + 1; next_id < containers.length; next_id++) {
if (next_id in containers) {
dom_element.insertBefore(container, containers[next_id]);
break;
}
}
if (next_id === containers.length) {
dom_element.appendChild(container);
}
viewer.triggerEvent("volumeuiloaded", {
container: container,
volume: volume,
Expand Down