Changeset 19826

Timestamp:

11/27/15 11:09:33 (9 years ago)

Author:

Eric.Larour

Message:

CHG: processed some segfaults in processedd and processmesh on the javascript side ofthings.
Also enabled redrawing of colorbar again and again.

Location:

issm/trunk-jpl/src/m/plot

Files:

• applyoptions.js (modified) (1 diff)
• plot_unit.js (modified) (1 diff)
• processdata.js (modified) (1 diff)
• processmesh.js (modified) (1 diff)

issm/trunk-jpl/src/m/plot/applyoptions.js

@@ -143 +143 @@
                         var color;
                         var cheightoffset = options.getfieldvalue('colorbarfontsize',16);
-                        var ccanvas = $('<canvas id="'+options.getfieldvalue('canvasid')+'_colorbar" width="'+String(cwidth*4)+'" height="'+String(cheight+cheightoffset)+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
-                        ccanvas.css({'position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
-                        var ccontext = ccanvas[0].getContext('2d');
+
+                        var ccontext,ccanvas;
+                        ccanvas=document.getElementById(options.getfieldvalue('canvasid')+'_colorbar');
+                        if(ccanvas==null){
+                                ccanvas = $('<canvas id="'+options.getfieldvalue('canvasid')+'_colorbar" width="'+String(cwidth*4)+'" height="'+String(cheight+cheightoffset)+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
+                                ccanvas.css({'position':'relative','top':((canvassize-cheight-cheightoffset)/-2).toFixed(2)+'px'});
+                                ccontext = ccanvas[0].getContext('2d');
+                        }
+                        else{
+                                ccontext = ccanvas.getContext('2d');
+                                /*erase existing colorbar:*/
+                                ccontext.clearRect(0,0, cwidth*4, cheight+cheightoffset);
+                                ccontext.beginPath();
+                        }
                         var cgradient = ccontext.createLinearGradient(0,cheightoffset/2,0,cheight);
                         for (var i = 0; i < colorbar.length; i++) {

issm/trunk-jpl/src/m/plot/plot_unit.js

@@ -18 +18 @@
         var datamin,datamax;
         var scale;
+
         //Process data and model
         var meshresults = processmesh(md,data,options);

issm/trunk-jpl/src/m/plot/processdata.js

@@ -14 +14 @@
         //   See also: PLOTMODEL, PROCESSMESH
 
+        //variables: 
+        var datatype;
+        
         //check format
         if ( data.length ==0 | data === [] | typeof data === 'number' | ArrayAnyNaN(data) ){

issm/trunk-jpl/src/m/plot/processmesh.js

@@ -12 +12 @@
 //
 //   See also: PLOTMODEL, PROCESSDATA
+
+        var x,y,z,elements,is2d,isplanet;
 
         //some checks