Skip to content

Commit d075281

Browse files
committed
Bug fix according to Pierre's comments
1 parent c70aebc commit d075281

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

examples/surface-viewer-demo.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ <h4>Views:</h4>
193193
</p>
194194
<p>
195195
<div>
196-
<input type="checkbox" id="model_centric"><label for="model_centric">Origin correspond to model center</label>
196+
<input type="checkbox" id="model_centric"><label for="model_centric">Origin corresponds to model's center</label>
197197
</div>
198198
</p>
199199
<p>

examples/surface-viewer-demo.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,9 @@ $(function() {
923923
complete: function() {
924924
document.getElementById("model_centric").checked = true;
925925
viewer.modelCentric(true);
926+
$("#vertex-data-wrapper").show();
927+
$("#pick-value-wrapper").show();
928+
$("#pick-label-wrapper").show();
926929
hideLoading();
927930
}
928931
});

src/brainbrowser/surface-viewer/modules/rendering.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ BrainBrowser.SurfaceViewer.modules.rendering = function(viewer) {
215215
centroid.z + offset.z
216216
);
217217
} else {
218-
shape.position.set(0 + offset.x, 0 + offset.y, 0 + offset.z);
218+
shape.position.set(offset.x, offset.y, offset.z);
219219
}
220220
shape.rotation.set(0, 0, 0);
221221
shape.material.opacity = 1;
@@ -274,8 +274,9 @@ BrainBrowser.SurfaceViewer.modules.rendering = function(viewer) {
274274
sphere.position.set(x, y, z);
275275

276276
if (viewer.model) {
277-
var offset = viewer.model.userData.model_center_offset;
278-
if (offset !== undefined) {
277+
var offset = viewer.model.userData.model_center_offset;
278+
var is_centric = viewer.model.userData.model_centric;
279+
if (offset !== undefined && is_centric === true) {
279280
sphere.translateX(offset.x);
280281
sphere.translateY(offset.y);
281282
sphere.translateZ(offset.z);
@@ -646,7 +647,7 @@ BrainBrowser.SurfaceViewer.modules.rendering = function(viewer) {
646647
* ```
647648
*/
648649
viewer.modelCentric = function(model_centric) {
649-
model_centric = model_centric === undefined ? false : true;
650+
if (model_centric === undefined) {model_centric = false}
650651

651652
var model = viewer.model;
652653
viewer.findUserDataCentroid(model);
@@ -664,8 +665,9 @@ BrainBrowser.SurfaceViewer.modules.rendering = function(viewer) {
664665
children.translateX(offset_centroid.x);
665666
children.translateY(offset_centroid.y);
666667
children.translateZ(offset_centroid.z);
667-
model.userData.model_centric = model_centric;
668668
});
669+
model.userData.model_centric = model_centric;
670+
669671
viewer.updated = true;
670672
};
671673

0 commit comments

Comments
 (0)