diff --git a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/main_connectivity.html b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/main_connectivity.html index 45c636ef3..fa10860cb 100644 --- a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/main_connectivity.html +++ b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/main_connectivity.html @@ -19,58 +19,101 @@ - + + + + - + + + + +
- -
+
- +
${label}
${label}
${label}
-
+
- + +
+ +
- + + + + + + + + - + ${drawConnectivityViewer(True)} ${drawConnectivityPlotViewer()} - -
+ +
- +
+
+ + - - + + ${drawmytractmatrix()} + - -
+ + -
-
- ${draw2DConnectivityMatrix('leftHemisphereTracts', 0, pointsLabels, 0, halfNodeCount, 0, halfNodeCount, 't')} - ${draw2DConnectivityMatrix('leftRightQuarterTracts', 2, pointsLabels, 0, halfNodeCount, halfNodeCount, nodeCount, 't')} - ${draw2DConnectivityMatrix('rightLeftQuarterTracts', 1, pointsLabels, halfNodeCount, nodeCount, 0, halfNodeCount, 't')} - ${draw2DConnectivityMatrix('rightHemisphereTracts', 3, pointsLabels, halfNodeCount, nodeCount, halfNodeCount, nodeCount, 't')} -
+
--> + + + + + + + +
- + - +
diff --git a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/myconnectivityMatrix.html b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/myconnectivityMatrix.html new file mode 100644 index 000000000..28bdc57a1 --- /dev/null +++ b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/myconnectivityMatrix.html @@ -0,0 +1,21 @@ +
+ + +
+ + + + + +
+ + +
+
+ + +
diff --git a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/connectivityGlobals.js b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/connectivityGlobals.js index e5ed99e6e..1a82cc454 100644 --- a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/connectivityGlobals.js +++ b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/connectivityGlobals.js @@ -251,6 +251,7 @@ function patchContextMenu() { cmenu.showShadow(pos.x,pos.y,e); // Resize the iframe if needed if (cmenu.useIframe) { + $c.find('iframe').css({width:$c.width()+cmenu.shadowOffsetX+cmenu.shadowWidthAdjust,height:$c.height()+cmenu.shadowOffsetY+cmenu.shadowHeightAdjust}); } $c.css( {top:pos.y+"px", left:pos.x+"px", position:"fixed",zIndex:9999} )[cmenu.showTransition](cmenu.showSpeed,((cmenu.showCallback)?function(){cmenu.showCallback.call(cmenu);}:null)); @@ -395,6 +396,7 @@ function showTractsTable() { /* * ------------------------------Left side tab functions below------------------------------------ */ +var CONNECTIVITY_MATRIX_TAB = 5; // my work... var CONNECTIVITY_TAB = 1; var CONNECTIVITY_2D_TAB = 2; var CONNECTIVITY_SPACE_TIME_TAB = 4; @@ -492,11 +494,34 @@ function start2DConnectivity(idx) { function startSpaceTimeConnectivity() { SELECTED_TAB = CONNECTIVITY_SPACE_TIME_TAB; $("#monitor-plot-id").show(); + document.getElementById(CONNECTIVITY_SPACE_TIME_CANVAS_ID).redrawFunctionRef = drawSceneSpaceTime; // interface-like function used in HiRes image exporting + connectivitySpaceTime_startGL(); + GFUNC_bind_gl_resize_handler(); // Sync size to parent. While the other tabs had been active the window might have resized. updateGLCanvasSize(CONNECTIVITY_SPACE_TIME_CANVAS_ID); + drawSceneSpaceTime(); } + +/* + +My work for connectivity ..... +.......................................................... +........................................................... + +*/ + + + +function startConnectivityMatrix() { + + connectivityMatrix_startGL(); + + updateGLCanvasSize(CONNECTIVITY_MATRIX_ID); + draw(); +} + diff --git a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/connectivityStepPlot.js b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/connectivityStepPlot.js index e50cd0b8c..ee0d808a1 100644 --- a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/connectivityStepPlot.js +++ b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/connectivityStepPlot.js @@ -126,13 +126,12 @@ function createConnectivityMatrix() { // The size of a matrix element var elementSize = plotSize / nrElems; // Create arrays from start for performance reasons + var ext = gl.getExtension('OES_element_index_uint'); var vertices = new Float32Array(nrElems * nrElems * 4 * 3); var normals = new Float32Array(nrElems * nrElems * 4 * 3); - var indices = new Uint16Array(nrElems * nrElems * 2 * 3); - var linesIndices = new Uint16Array(nrElems * nrElems * 2 * 4); - + var indices = new Uint32Array(nrElems * nrElems * 2 * 3); + var linesIndices = new Uint32Array(nrElems * nrElems * 2 * 4); var linearIndex = -1; - for (var i = 0; i < nrElems; i++) { for (var j = 0; j < nrElems; j++) { linearIndex += 1; @@ -227,7 +226,6 @@ function generateColors(tractValue, intervalLength) { var nrElems = matrixWeightsValues.length; var colors = new Float32Array(nrElems * nrElems * 3 * 4); var linearIndex = -1; - for (var i = 0; i < nrElems; i++) { for (var j = 0; j < nrElems; j++) { linearIndex += 1; @@ -404,17 +402,18 @@ function drawFullMatrix(doPick, idx) { var currentPickColor = colorsForPicking[idx]; gl.uniform3f(GL_shaderProgram.pickingColor, currentPickColor[0], currentPickColor[1], currentPickColor[2]); gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, indexBuffer); - gl.drawElements(gl.TRIANGLES, indexBuffer.numItems, gl.UNSIGNED_SHORT, 0); - } else { - gl.bindBuffer(gl.ARRAY_BUFFER, plotColorBuffers[idx]); + gl.drawElements(gl.TRIANGLES, indexBuffer.numItems, gl.UNSIGNED_INT, 0); + } + else { + gl.bindBuffer(gl.ARRAY_BUFFER, plotColorBuffers[idx]); gl.vertexAttribPointer(GL_shaderProgram.vertexColorAttribute, 3, gl.FLOAT, false, 0, 0); gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, indexBuffer); - gl.drawElements(gl.TRIANGLES, indexBuffer.numItems, gl.UNSIGNED_SHORT, 0); + gl.drawElements(gl.TRIANGLES, indexBuffer.numItems, gl.UNSIGNED_INT, 0); gl.uniform3f(GL_shaderProgram.lineColor, theme.lineColor[0], theme.lineColor[1], theme.lineColor[2]); gl.uniform1i(GL_shaderProgram.drawLines, true); gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, linesIndexBuffer); gl.lineWidth(1.0); - gl.drawElements(gl.LINES, linesIndexBuffer.numItems, gl.UNSIGNED_SHORT, 0); + gl.drawElements(gl.LINES, linesIndexBuffer.numItems, gl.UNSIGNED_INT, 0); gl.uniform1i(GL_shaderProgram.drawLines, false); // Now draw the square outline @@ -422,19 +421,19 @@ function drawFullMatrix(doPick, idx) { gl.uniform3f(GL_shaderProgram.lineColor, theme.selectedOutlineColor[0], theme.selectedOutlineColor[1], theme.selectedOutlineColor[2]); gl.lineWidth(3.0); } else { - gl.uniform3f(GL_shaderProgram.lineColor, theme.outlineColor[0], theme.outlineColor[1], theme.outlineColor[2]); + gl.uniform3f(GL_shaderProgram.lineColor, theme.outlineColor[0], theme.outlineColor[1], theme.outlineColor[2]); gl.lineWidth(2.0); } gl.bindBuffer(gl.ARRAY_BUFFER, outlineVerticeBuffer); gl.vertexAttribPointer(GL_shaderProgram.vertexPositionAttribute, 3, gl.FLOAT, false, 0, 0); -// gl.bindBuffer(gl.ARRAY_BUFFER, outlineNormalsBuffer); -// gl.vertexAttribPointer(GL_shaderProgram.vertexNormalAttribute, 3, gl.FLOAT, false, 0, 0); + gl.bindBuffer(gl.ARRAY_BUFFER, outlineNormalsBuffer); + gl.vertexAttribPointer(GL_shaderProgram.vertexNormalAttribute, 3, gl.FLOAT, false, 0, 0); gl.uniform1i(GL_shaderProgram.drawLines, true); gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, outlineLinesBuffer); - gl.drawElements(gl.LINES, outlineLinesBuffer.numItems, gl.UNSIGNED_SHORT, 0); + gl.drawElements(gl.LINES, outlineLinesBuffer.numItems, gl.UNSIGNED_INT, 0); gl.lineWidth(2.0); - gl.uniform1i(GL_shaderProgram.drawLines, false); - } + gl.uniform1i(GL_shaderProgram.drawLines, false); + } mvPopMatrix(); } @@ -535,6 +534,7 @@ function doZoomOutAnimation() { /* * Draw the entire space plot matrices. */ + function drawSceneSpaceTime() { gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight); // View angle is 45, we want to see object from 0.1 up to 800 distance from viewer @@ -543,17 +543,17 @@ function drawSceneSpaceTime() { loadIdentity(); // Translate to get a good view. mvTranslate([0.0, 0.0, -600]); - + if (!doPick) { gl.uniform1f(GL_shaderProgram.alphaValue, alphaValueSpaceTime); gl.uniform1f(GL_shaderProgram.isPicking, 0); gl.uniform3f(GL_shaderProgram.pickingColor, 1, 1, 1); gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); - for (var ii = 0; ii < plotColorBuffers.length; ii++) { drawFullMatrix(false, ii); } - } else { + } + else { gl.bindFramebuffer(gl.FRAMEBUFFER, GL_colorPickerBuffer); gl.disable(gl.BLEND); gl.disable(gl.DITHER); @@ -570,7 +570,7 @@ function drawSceneSpaceTime() { if (clickedMatrix >= 0) { doZoomInAnimation(); } - } + } } diff --git a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/myconnectivityMatrix.js b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/myconnectivityMatrix.js new file mode 100644 index 000000000..86922e4d3 --- /dev/null +++ b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/myconnectivityMatrix.js @@ -0,0 +1,365 @@ +/** + * TheVirtualBrain-Framework Package. This package holds all Data Management, and + * Web-UI helpful to run brain-simulations. To use it, you also need do download + * TheVirtualBrain-Scientific Package (for simulators). See content of the + * documentation-folder for more details. See also http://www.thevirtualbrain.org + * + * (c) 2012-2017, Baycrest Centre for Geriatric Care ("Baycrest") and others + * + * This program is free software: you can redistribute it and/or modify it under the + * terms of the GNU General Public License as published by the Free Software Foundation, + * either version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. + * You should have received a copy of the GNU General Public License along with this + * program. If not, see . + * + **/ + +/* + +* This js code let you draw the connectivity matrix with weight and tract components. + This aims to measure the performance with respect to the older one ... + + work in progress................ + +*/ + + +var CONNECTIVITY_MATRIX_ID = "GLcanvas_MATRIX" // canvas id for the matrix +var myplotColorBuffers; // A list of color buffers for the connectivity matrices + +var myoutlineNormalsBuffer = null; // Normals for the full matrix outline square +var myoutlineLinesBuffer = null; // The line indices for thr full matrix outline square +var myverticesBuffer = []; // A list of vertex buffers for the various space-time connectivity matrices +var mynormalsBuffer = []; // A list of normal buffers for the various space-time connecitivty matrices +var myindexBuffer = []; // A list of triangles index buffers for the various space-time connectivity matrices +var mylinesIndexBuffer = []; // A list of line index buffers for the various space-time connectivity matrices +var colorBuffer //mywork..... +var myplotSize = 480; // Default plot size of 250 pixels +var mydefaultZ = -2.0; // Default plot Z position of -2.0 +var myalphaValueMatrix = 1.0; // original alpha value for default plot +var mybackupAlphaValue = myalphaValueMatrix; // backup used in animations + + +/* + +Generating the color for the connectivity matrices ....... + +*/ + +function mygenerateColors(tractValue, intervalLength) { + var theme = ColSchGetTheme().connectivityStepPlot; // this is the theme of the matrix,same is space time plot. + var matrixWeightsValues = GVAR_interestAreaVariables[1].values; //An 2D array with all weight data. + var matrixTractsValues = GVAR_interestAreaVariables[2].values; + var minWeightsValue = GVAR_interestAreaVariables[1].min_val; // Minimum weights value in range(0,>0); + var maxWeightsValue = GVAR_interestAreaVariables[1].max_val; // Maximum weights value in range(>0); + var nrElems = matrixWeightsValues.length; // Dimensions of matrix....let N X N. + var colors = new Float32Array(nrElems * nrElems * 3 * 4); // Array for the colors... + var linearIndex = -1; + + for (var i = 0; i < nrElems; i++) { + for (var j = 0; j < nrElems; j++) { + linearIndex += 1; + + var weight = matrixWeightsValues[i][nrElems - j - 1]; + + var color; + + + + color = weight!=0?getGradientColor(weight, minWeightsValue, maxWeightsValue).slice(0, 3): theme.noValueColor; + + + color = [].concat(color, color, color, color); + colors.set(color, 3 * 4 * linearIndex); + } + } + var buffer = gl.createBuffer(); + gl.bindBuffer(gl.ARRAY_BUFFER, buffer); + gl.bufferData(gl.ARRAY_BUFFER, colors, gl.STATIC_DRAW); + return buffer; +} + + + +function myConnStepPlotInitColorBuffers() { + myinitColorsForPicking(); + myplotColorBuffers + mynrOfSteps = 1; + myplotColorBuffers=(mygenerateColors((maxSelectedDelayValue + minSelectedDelayValue) / 2, maxSelectedDelayValue - minSelectedDelayValue)); + // In order to avoid floating number approximations which keep the loop for one more iteration just approximate by + // substracting 0.1 + var theme = ColSchGetTheme().connectivityStepPlot; + gl.clearColor(theme.backgroundColor[0], theme.backgroundColor[1], theme.backgroundColor[2], theme.backgroundColor[3]); +} + + +function myinitColorsForPicking() { + colorsForPicking = []; + mynrOfSteps = 1; + for (var i=0; i <= mynrOfSteps; i++) { + // Go up to nrOfSteps since for 0 we will consider the full matrix as being clicked + var r = parseInt(1.0 / (i + 1) * 255); + var g = parseInt(i / mynrOfSteps * 255); + var b = 0.0; + colorsForPicking.push([r / 255, g / 255, b / 255]); + var colorKey = r + '' + g + '0'; + GL_colorPickerMappingDict[colorKey] = i; + } + GL_initColorPickFrameBuffer(); +} + + +/* + * Custom shader initializations specific for the weight connectivity matrix + */ +function initShaders_MATRIX() { + createAndUseShader("shader-mymatrix-fs", "shader-mymatrix-vs"); + SHADING_Context.basic_program_init(GL_shaderProgram); + + GL_shaderProgram.drawLines = gl.getUniformLocation(GL_shaderProgram, "uDrawLines"); + GL_shaderProgram.alphaValue = gl.getUniformLocation(GL_shaderProgram, "uAlpha"); + GL_shaderProgram.lineColor = gl.getUniformLocation(GL_shaderProgram, "uLineColor"); + GL_shaderProgram.isPicking = gl.getUniformLocation(GL_shaderProgram, "isPicking"); + GL_shaderProgram.pickingColor = gl.getUniformLocation(GL_shaderProgram, "pickingColor"); + + GL_shaderProgram.vertexColorAttribute = gl.getAttribLocation(GL_shaderProgram, "aVertexColor"); + gl.enableVertexAttribArray(GL_shaderProgram.vertexColorAttribute); +} + +/* + +* Initializing the connectivity matrix webgl part.. + +*/ +function connectivityMatrix_startGL() { + conectivityMatrix_initCanvas(); + //Do the required initializations for the connectivity weighted matrix + initShaders_MATRIX(); + + gl.clearDepth(1.0); + gl.enable(gl.DEPTH_TEST); + gl.depthFunc(gl.LEQUAL); + myConnStepPlotInitColorBuffers(); + + } + + /* + + * Create the buffer for the requirements by all Functions in General. + + */ + +function _GL_createBuffer(data, type){ + type = type || gl.ARRAY_BUFFER; + var buff = gl.createBuffer(); + gl.bindBuffer(type, buff); + gl.bufferData(type, data, gl.STATIC_DRAW); + buff.numItems = data.length; + return buff; +} + +/* + * Create the required buffers for the weight matrix. + */ +function createMatrix() { + var nrElems = GVAR_interestAreaVariables[GVAR_selectedAreaType].values.length; + console.log(nrElems); + // starting 'x' and 'y' axis values for the plot in order to center around (0, 0) + var startX = - myplotSize / 2; + var startY = - myplotSize / 2; + // The size of a matrix element + var elementSize = myplotSize / nrElems; + var ext = gl.getExtension('OES_element_index_uint'); + // Create arrays from start for performance reasons + var vertices = new Float32Array(nrElems * nrElems * 4 * 3); + var normals = new Float32Array(nrElems * nrElems * 4 * 3); + var indices = new Uint32Array(nrElems * nrElems * 2 * 3); + var linesIndices = new Uint32Array(nrElems * nrElems * 2 * 4); + + var linearIndex = -1; + + for (var i = 0; i < nrElems; i++) { + for (var j = 0; j < nrElems; j++) { + linearIndex += 1; + // For each separate element, compute the position of the 4 required vertices + // depending on the position from the connectivity matrix + var upperLeftX = startX + j * elementSize; + var upperLeftY = startY + i * elementSize; + + // Since the vertex array is flatten, and there are 4 vertices per one element, + // in order to fill the position in the vertice array we need to fill all 12 elements + var elemVertices = [ + upperLeftX, upperLeftY, mydefaultZ, + upperLeftX + elementSize, upperLeftY, mydefaultZ, //upper right + upperLeftX, upperLeftY + elementSize, mydefaultZ, //lower left + upperLeftX + elementSize, upperLeftY + elementSize, mydefaultZ // lower right + ]; + + var indexBase = 4 * linearIndex; + + // For the normals it's easier since we only need one normal for each vertex + var elemNormals = [ + 0, 0, -1, + 0, 0, -1, + 0, 0, -1, + 0, 0, -1 + ]; + + // We have 2 triangles, which again are flatten so we need to fill 6 index elements + var elemIndices = [ + indexBase + 0, indexBase + 1, indexBase + 2, + indexBase + 1, indexBase + 2, indexBase + 3 + ]; + + // For the lines we have 4 lines per element, flatten again, so 8 index elements to fill + var elemLines = [ + indexBase + 0, indexBase + 1, + indexBase + 1, indexBase + 3, + indexBase + 2, indexBase + 3, + indexBase + 2, indexBase + 0 + ]; + + vertices.set(elemVertices, 3 * 4 * linearIndex); + normals.set(elemNormals, 3 * 4 * linearIndex); + indices.set(elemIndices, 3 * 2 * linearIndex); + linesIndices.set(elemLines, 4 * 2 * linearIndex); + } + } + // Now create all the required buffers having the computed data. + myverticesBuffer = _GL_createBuffer(vertices); + mynormalsBuffer = _GL_createBuffer(normals); + myindexBuffer = _GL_createBuffer(indices, gl.ELEMENT_ARRAY_BUFFER); + mylinesIndexBuffer = _GL_createBuffer(linesIndices, gl.ELEMENT_ARRAY_BUFFER); + mycreateOutlineSquare(startX, startY, elementSize, nrElems); + + /* + * the standard color scheme + */ + + var colors = [ + 1.0, 1.0, 1.0, 1.0, // white + 1.0, 0.0, 0.0, 1.0, // red + 0.0, 1.0, 0.0, 1.0, // green + 0.0, 0.0, 1.0, 1.0, // blue + ]; + + colorBuffer = _GL_createBuffer(new Float32Array(colors)); + +} + +/* + * Compute the required vertex and idex for the square outline of the full connectivity matrix + */ +function mycreateOutlineSquare(startX, startY, elementSize, nrElems) { + var width = nrElems * elementSize; + var outlineVertices = [ + startX, startY, mydefaultZ, + startX + width, startY, mydefaultZ, + startX, startY + width, mydefaultZ, + startX + width, startY + width, mydefaultZ + ]; + var outlineNormals = [0, 0, -1, 0, 0, -1, 0, 0, -1, 0, 0, -1]; + var outlineLines = [0, 1, 0, 2, 1, 3, 2, 3]; + myoutlineVerticeBuffer = _GL_createBuffer(new Float32Array(outlineVertices)); + myoutlineNormalsBuffer = _GL_createBuffer(new Float32Array(outlineNormals)); + myoutlineLinesBuffer = _GL_createBuffer(new Uint16Array(outlineLines), gl.ELEMENT_ARRAY_BUFFER); +} + + +/* + * Generate a color buffer which represents the weights for + * a given edges between two vertex + * + * + * @returns: a color buffer + * a gradient color is assigned based on the weights strenght, and for the + * rest the color black is used. + */ + +function conectivityMatrix_initCanvas() { + + var canvas = document.getElementById(CONNECTIVITY_MATRIX_ID); + initGL(canvas); + var theme = ColSchGetTheme().connectivityStepPlot; + gl.clearColor(theme.backgroundColor[0], theme.backgroundColor[1], theme.backgroundColor[2], theme.backgroundColor[3]); + plotSize = parseInt(canvas.clientWidth / 3); // Compute the size of one connectivity plot depending on the canvas width + createMatrix(); + +} + + + +/* + * Draw the full matrix, with the outline square. + */ +function drawMyMatrix() { + + var theme = ColSchGetTheme().connectivityStepPlot; + mvPushMatrix(); + + // Draw the actual matrix. + gl.bindBuffer(gl.ARRAY_BUFFER, myverticesBuffer); + gl.vertexAttribPointer(GL_shaderProgram.vertexPositionAttribute, 3, gl.FLOAT, false, 0, 0); + + gl.bindBuffer(gl.ARRAY_BUFFER, mynormalsBuffer); + gl.vertexAttribPointer(GL_shaderProgram.vertexNormalAttribute, 3, gl.FLOAT, false, 0, 0); + setMatrixUniforms(); + + gl.bindBuffer(gl.ARRAY_BUFFER, myplotColorBuffers); + gl.vertexAttribPointer(GL_shaderProgram.vertexColorAttribute, 3, gl.FLOAT, false, 0, 0); + + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, myindexBuffer); + gl.drawElements(gl.TRIANGLES, myindexBuffer.numItems, gl.UNSIGNED_INT, 0); + gl.uniform3f(GL_shaderProgram.lineColor, theme.lineColor[0], theme.lineColor[1], theme.lineColor[2]); + + gl.uniform1i(GL_shaderProgram.drawLines, true); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, mylinesIndexBuffer); + gl.lineWidth(1.0); + + gl.drawElements(gl.LINES, mylinesIndexBuffer.numItems, gl.UNSIGNED_INT, 0); + gl.uniform1i(GL_shaderProgram.drawLines, false); + + + gl.uniform3f(GL_shaderProgram.lineColor, theme.outlineColor[0], theme.outlineColor[1], theme.outlineColor[2]); + gl.lineWidth(2.0); + gl.bindBuffer(gl.ARRAY_BUFFER, myoutlineVerticeBuffer); + + gl.vertexAttribPointer(GL_shaderProgram.vertexPositionAttribute, 3, gl.FLOAT, false, 0, 0); + gl.bindBuffer(gl.ARRAY_BUFFER, myoutlineNormalsBuffer); + + gl.vertexAttribPointer(GL_shaderProgram.vertexNormalAttribute, 3, gl.FLOAT, false, 0, 0); + gl.uniform1i(GL_shaderProgram.drawLines, true); + + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, outlineLinesBuffer); + gl.drawElements(gl.LINES, myoutlineLinesBuffer.numItems, gl.UNSIGNED_INT, 0); + gl.lineWidth(2.0); + + gl.uniform1i(GL_shaderProgram.drawLines, false); + + mvPopMatrix(); +} + +function draw() { + + gl.viewport(0, 0, gl.viewportWidth, gl.viewportHeight); + // View angle is 45, we want to see object from 0.1 up to 800 distance from viewer + perspective(45, gl.viewportWidth / gl.viewportHeight, near, 800.0); + + loadIdentity(); + // Translate to get a good view. + mvTranslate([0.0, 0.0, -600]); + + gl.uniform1f(GL_shaderProgram.alphaValue, myalphaValueMatrix); + gl.uniform1f(GL_shaderProgram.isPicking, 0); + gl.uniform3f(GL_shaderProgram.pickingColor, 1, 1, 1); + gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT); + + drawMyMatrix(); + + +} + + diff --git a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/selectionControlScript.js b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/selectionControlScript.js index b0bbcdd8f..c584b012c 100644 --- a/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/selectionControlScript.js +++ b/tvb/interfaces/web/templates/genshi/visualizers/connectivity/scripts/selectionControlScript.js @@ -102,6 +102,7 @@ function doGroupOperation() { var quantity = getOperationArguments(); document.getElementById('con-op-arguments').value = ''; + console.log(quantity); if (isNaN(quantity)) { displayMessage("Operation failed. Be sure you provided the correct arguments.", "errorMessage"); return false; @@ -138,9 +139,9 @@ function doGroupOperation() { } } GFUNC_recomputeMinMaxW(); - MATRIX_colorTable(); displayMessage("Operation finished successfully.", "infoMessage"); - } catch(err) { + } + catch(err) { displayMessage("Operation failed. Be sure you provided the correct arguments.", "errorMessage"); } }