TVB-2369 Fix wrong sphere buffers generated for the internal sensors

the-virtual-brain · Aug 7, 2018 · 2e0b706 · 2e0b706
1 parent 5fe31f9
commit 2e0b706
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/tvb/interfaces/web/static/js/tvbviz.js b/tvb/interfaces/web/static/js/tvbviz.js
@@ -587,7 +587,12 @@ tv.plot = {
 
         f.energy_callback = function (data) {
             timeselection_energy = data;
-            changeSphereMeasurePoints_energy();
+            if (isInternalSensorView) {
+                VSI_change_energySphericalMeasurePoints()
+            }
+            else {
+                changeSphereMeasurePoints_energy();
+            }
             closeBlockerOverlay();
         };
 

diff --git a/tvb/interfaces/web/templates/genshi/visualizers/commons/scripts/internalBrain.js b/tvb/interfaces/web/templates/genshi/visualizers/commons/scripts/internalBrain.js
@@ -26,6 +26,17 @@ function _VSI_bufferAtPoint(p, idx) {
     return [bufferVertices, bufferNormals, bufferTriangles, vertexRegionBuffer];
 }
 
+function VSI_change_energySphericalMeasurePoints() {
+    for (let i = 0; i < VS_selectedRegions.length; i++) {
+        const result = HLPR_sphereBufferAtPoint(gl, measurePoints[i], timeselection_energy[i][currentTimeValue], 12, 12);
+        const bufferVertices = result[0];
+        const bufferNormals = result[1];
+        const bufferTriangles = result[2];
+        const vertexRegionBuffer = VSI_createColorBufferForSphere(i, bufferVertices.numItems * 3);
+        measurePointsBuffers[i] = [bufferVertices, bufferNormals, bufferTriangles, vertexRegionBuffer];
+    }
+}
+
 /**
  * Method used for creating a color buffer for a cube (measure point).
  */
@@ -75,5 +86,5 @@ function VSI_StartInternalActivityViewer(baseDatatypeURL, onePageSize, urlTimeLi
     _VSI_init_sphericalMeasurePoints();
 
     //pause by default
-    AG_isStopped = true;;
+    AG_isStopped = true;
 }
diff --git a/tvb/interfaces/web/templates/genshi/visualizers/commons/scripts/virtualBrain.js b/tvb/interfaces/web/templates/genshi/visualizers/commons/scripts/virtualBrain.js
@@ -1004,7 +1004,7 @@ function drawBuffers(drawMode, buffersSets, bufferSetsMask, useBlending, cullFac
             gl.uniform1i(GL_shaderProgram.useVertexColors, false);
             gl.uniform1f(GL_shaderProgram.alphaUniform, 1);
 
-            // set sphere color green for the selected channels ones and yellow for the others
+            // set sphere color green for the selected channels and yellow for the others
             if (VS_selectedRegions.includes(i)) {
                 gl.uniform4f(GL_shaderProgram.materialColor, 0.99, 0.99, 0.0, 1.0);
                 drawBuffer(drawMode, buffersSets[i]);
@@ -1112,7 +1112,12 @@ function tick() {
 
     //update energy
     if(timeselection_interval!=0 && !AG_isStopped){
-             changeSphereMeasurePoints_energy();
+        if(isInternalSensorView){
+            VSI_change_energySphericalMeasurePoints()
+        }
+        else{
+            changeSphereMeasurePoints_energy();
+        }
     }
     drawScene();
 
@@ -1184,9 +1189,10 @@ function drawScene() {
         }
 
         if (isInternalSensorView) {
-            gl.uniform1f(GL_shaderProgram.alphaUniform, 1);
+            // for internal sensors we render only the sensors
             drawBuffers(gl.TRIANGLES, measurePointsBuffers);
-        } else {
+        }
+        else {
             //draw the nodes first to make it appear
             if (displayMeasureNodes) {
                 isDrawingSpheres = true;
@@ -1419,4 +1425,5 @@ function changeSphereMeasurePoints_energy() {
         measurePointsBuffers[i] = [bufferVertices, bufferNormals, bufferTriangles, bufferColor];
     }
 }
+
 /////////////////////////////////////// ~~~~~~~~~~ END ENERGY RELATED METHOD ~~~~~~~~~~~~~ //////////////////////////////////