Skip to content

Commit 410e9da

Browse files
author
Robert D. Vincent
committed
Fix #312, force the expected ordering of scans in volume viewer.
1 parent 3286157 commit 410e9da

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

src/brainbrowser/volume-viewer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
* @name viewer
279279
* @property {array} volumes Volumes to be displayed.
280280
* @property {boolean} synced Are the cursors being synced across volumes?
281+
* @property {array} containers The div containers for each volume.
281282
* @property {DOMElement} dom_element The DOM element where the viewer
282283
* will be inserted.
283284
* @property {active_panel} active_panel The slice panel that's currently
@@ -316,6 +317,7 @@
316317
var viewer = {
317318
dom_element: dom_element,
318319
volumes: [],
320+
containers: [],
319321
synced: false
320322
};
321323

src/brainbrowser/volume-viewer/modules/loading.js

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ BrainBrowser.VolumeViewer.modules.loading = function(viewer) {
291291
});
292292

293293
viewer.volumes = [];
294+
viewer.containers = [];
294295
viewer.active_panel = null;
295296
viewer.dom_element.innerHTML = "";
296297
};
@@ -719,7 +720,19 @@ BrainBrowser.VolumeViewer.modules.loading = function(viewer) {
719720
});
720721
})();
721722

722-
dom_element.appendChild(container);
723+
viewer.containers[vol_id] = container;
724+
725+
/* See if a subsequent volume has already been loaded. If so we want
726+
* to be sure that this container is inserted before the subsequent
727+
* container. This guarantees the ordering of elements.
728+
*/
729+
var next_id = vol_id + 1;
730+
if (next_id in viewer.containers) {
731+
dom_element.insertBefore(container, viewer.containers[next_id]);
732+
}
733+
else {
734+
dom_element.appendChild(container);
735+
}
723736
viewer.triggerEvent("volumeuiloaded", {
724737
container: container,
725738
volume: volume,

0 commit comments

Comments
 (0)