Index: ../trunk-jpl/src/m/plot/applyoptions.js =================================================================== --- ../trunk-jpl/src/m/plot/applyoptions.js (revision 19871) +++ ../trunk-jpl/src/m/plot/applyoptions.js (revision 19872) @@ -203,7 +203,6 @@ ccontext.beginPath(); } var cgradient = ccontext.createLinearGradient(0,cheightoffset/2,0,cheight); - var tgradient = ccontext.createLinearGradient(0,0,0,256); var cmap = options.getfieldvalue('cmap','jet'); var colorbar = colorbars[cmap]; @@ -211,12 +210,10 @@ color = colorbar[colorbar.length-i-1]; color = [Math.round(color[0]*255),Math.round(color[1]*255),Math.round(color[2]*255)]; cgradient.addColorStop(i/colorbar.length,'rgba('+color.toString()+',1.0)'); - tgradient.addColorStop(i/colorbar.length,'rgba('+color.toString()+',1.0)'); } ccontext.fillStyle=cgradient; ccontext.fillRect(0,cheightoffset/2,cwidth,cheight); - //Draw colorbar border ccontext.beginPath(); ccontext.lineWidth='1'; @@ -272,21 +269,17 @@ ccontext.beginPath(); } var cgradient = ccontext.createLinearGradient(cwidth+cwidthoffset,0,cwidthoffset,0); - var tgradient = ccontext.createLinearGradient(cwidthoffset,0,0,256); var cmap = options.getfieldvalue('cmap','jet'); var colorbar = colorbars[cmap]; - console.log(cmap, colorbar); for (var i = 0; i < colorbar.length; i++) { color = colorbar[colorbar.length-i-1]; color = [Math.round(color[0]*255),Math.round(color[1]*255),Math.round(color[2]*255)]; cgradient.addColorStop(i/colorbar.length,'rgba('+color.toString()+',1.0)'); - tgradient.addColorStop(i/colorbar.length,'rgba('+color.toString()+',1.0)'); } ccontext.fillStyle=cgradient; ccontext.fillRect(cwidthoffset,0,cwidth,cheight); - //Draw colorbar border ccontext.beginPath(); ccontext.lineWidth='1'; @@ -309,25 +302,6 @@ ccontext.fillText(labels[cdivisions-i],x+cwidthoffset,cheight+cheightoffset); } } - - //Make texture canvas - var tcontext,tcanvas,tcanvasid,tcanvashtml,tURL; - tcanvasid = 'texturecanvas'; - var tcanvashtml = document.getElementById(tcanvasid); - if (tcanvashtml == null) { - tcanvas = $('').insertAfter(ccanvas); - tcanvas.css({'display':'none'}); - tcanvashtml = document.getElementById(tcanvasid); - } - else { - tcanvas = $('#' + tcanvasid); - } - tcontext = tcanvashtml.getContext('2d'); - tcontext.fillStyle = tgradient; - tcontext.fillRect(0,0,256,256); - tURL = tcanvashtml.toDataURL(); - node["texture"] = initTexture(gl,tURL); - console.log(node["texture"]); /* //{{{ if exist(options,'wrapping') lim=get(c,'Ylim'); @@ -399,6 +373,34 @@ //do nothing } + //Make texture canvas + + var tcontext,tcanvas,tcanvasid,tcanvashtml,tURL,tgradient; + tcanvasid = 'texturecanvas'; + var tcanvashtml = document.getElementById(tcanvasid); + if (tcanvashtml == null) { + tcanvas = $('').insertAfter('#'+String(options.getfieldvalue('canvasid'))); + tcanvas.css({'display':'none'}); + tcanvashtml = document.getElementById(tcanvasid); + } + else { + tcanvas = $('#' + tcanvasid); + } + tcontext = tcanvashtml.getContext('2d'); + tgradient = tcontext.createLinearGradient(0,0,0,256); + + var cmap = options.getfieldvalue('cmap','jet'); + var colorbar = colorbars[cmap]; + for (var i = 0; i < colorbar.length; i++) { + color = colorbar[colorbar.length-i-1]; + color = [Math.round(color[0]*255),Math.round(color[1]*255),Math.round(color[2]*255)]; + tgradient.addColorStop(i/colorbar.length,'rgba('+color.toString()+',1.0)'); + } + + tcontext.fillStyle = tgradient; + tcontext.fillRect(0,0,256,256); + tURL = tcanvashtml.toDataURL(); + node["texture"] = initTexture(gl,tURL); /* //{{{ //area if exist(options,'area'), Index: ../trunk-jpl/src/m/plot/plot_unit.js =================================================================== --- ../trunk-jpl/src/m/plot/plot_unit.js (revision 19871) +++ ../trunk-jpl/src/m/plot/plot_unit.js (revision 19872) @@ -49,12 +49,10 @@ var scale = 1 / (xmax - xmin); node["shaderName"] = "unlit_textured"; node["shader"] = gl["shaders"][node["shaderName"]]["program"]; - console.log(gl["shaders"]); node["scale"] = [scale, scale, scale]; node["rotation"] = options.getfieldvalue('view',[0,0,0]); node["translation"] = [(xmin + xmax) / (-2 / scale), (ymin + ymax) / (-2 / scale), (zmin + zmax) / (-2 / scale)]; node["modelMatrix"] = recalculateModelMatrix(node); - console.log(node); //some defaults: texcoords.itemSize = 2; @@ -109,8 +107,7 @@ else{ //triangular elements vertices.itemSize = 3; - var cmap=options.getfieldvalue('cmap','jet'); - console.log(datamin,datamax,data); + var cmap=options.getfieldvalue('cmap','jet'); for(var i = 0; i < x.length; i++){ vertices[vertices.length] = x[i]; vertices[vertices.length] = y[i];