Changeset 20513

Timestamp:

04/14/16 20:12:48 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): log option can now be disabled with 'off' value.

Location:

issm/trunk-jpl/src/m/plot

Files:

• applyoptions.js (modified) (3 diffs)
• plot_unit.js (modified) (2 diffs)
• processdata.js (modified) (3 diffs)

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

@@ -30 +30 @@
                         
                         var caxis = options.getfieldvalue('caxis',[ArrayMin(data),ArrayMax(data)]);
-                        //if (options.exist('log')) options.changefieldvalue('caxis',[ArrayMin(data),ArrayMax(data)]);
                         var canvassize = options.getfieldvalue('canvassize',480);
                         var cheight;
@@ -49 +48 @@
                         var clabelitem;
                         var precision=options.getfieldvalue('colorbarprecision',3);
-                        if (options.exist('log')) {
+                        if (options.getfieldvalue('log',10)!='off') {
                                 for (var i = cdivisions; i >= 0; i--) {
                                         if (caxisdelta*i/cdivisions==caxis[0]) {
@@ -230 +229 @@
         var cmap = options.getfieldvalue('cmap','jet');
         var colorbar = colorbars[cmap];
-        if (options.exist('log')) {
+        if (options.getfieldvalue('log',10)!='off') {
                 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(1.0-Math.exp(Math.log((colorbar.length-i)/colorbar.length)/Math.log(options.getfieldvalue('log',Math.E))*i/colorbar.length),'rgba('+color.toString()+',1.0)');
+                        tgradient.addColorStop(1.0-Math.exp(Math.log((colorbar.length-i)/colorbar.length)/Math.log(options.getfieldvalue('log',10))*i/colorbar.length),'rgba('+color.toString()+',1.0)');
                 }
         } else {

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

@@ -96 +96 @@
                         else{ //triangular elements     
                                 caxis = options.getfieldvalue('caxis',[ArrayMin(data),ArrayMax(data)]);
-                                if (options.exist('log')) caxis = [Math.log10(caxis[0])/Math.log10(options.getfieldvalue('log')),Math.log10(caxis[1])/Math.log10(options.getfieldvalue('log'))];
+                                if (options.getfieldvalue('log',10)!='off') caxis = [Math.log10(caxis[0])/Math.log10(options.getfieldvalue('log')),Math.log10(caxis[1])/Math.log10(options.getfieldvalue('log'))];
                                 datamin = caxis[0];
                                 datamax = caxis[1];
@@ -204 +204 @@
                                         caxis = [ArrayMin(data[0]),ArrayMax(data[0].slice(0,-1))];
                                 }
-                                if (options.exist('log')) caxis = [Math.log10(caxis[0])/Math.log10(options.getfieldvalue('log')),Math.log10(caxis[1])/Math.log10(options.getfieldvalue('log'))];
+                                if (options.getfieldvalue('log',10)!='off') caxis = [Math.log10(caxis[0])/Math.log10(options.getfieldvalue('log')),Math.log10(caxis[1])/Math.log10(options.getfieldvalue('log'))];
                                 
                                 for(var i = 0; i < data.length; i++){                                   

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

@@ -143 +143 @@
 
                 //log?
-                if (options.exist('log')){
+                if (options.getfieldvalue('log',10)!='off'){
                         var bounds=options.getfieldvalue('caxis',[ArrayMin(data),ArrayMax(data)]);
                         for(var i=0;i<md.mesh.numberofelements;i++)if(data[i]<bounds[0])data[i]=bounds[0];
@@ -184 +184 @@
 
                 //log?
-                if (options.exist('log')){
+                if (options.getfieldvalue('log',10)!='off'){
                         var bounds=options.getfieldvalue('caxis',[ArrayMin(data),ArrayMax(data)]);
                         for(var i=0;i<md.mesh.numberofvertices;i++)if(data[i]<bounds[0])data[i]=bounds[0];
@@ -202 +202 @@
                 
                 //log?  
-                if (options.exist('log')){
+                if (options.getfieldvalue('log',10)!='off'){
                         var bounds=options.getfieldvalue('caxis',[ArrayMin(data),ArrayMax(data)]);
                         for(var i=0;i<md.mesh.numberofvertices;i++) {