Changeset 20514

Timestamp:

04/16/16 16:55:54 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Resolving options error with incorrect/missing default values.

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_unit.js (modified) (2 diffs)
• processdata.js (modified) (6 diffs)

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

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

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

@@ -143 +143 @@
 
                 //log?
-                if (options.getfieldvalue('log',10)!='off'){
+                if (options.getfieldvalue('log','off')!='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];
@@ -151 +151 @@
                         for(var i=0;i<md.mesh.numberofelements;i++){
                                 if(!IsNaN(data[i])){
-                                        data[i]=Math.log10(data[i])/Math.log10(options.getfieldvalue('log'));
+                                        data[i]=Math.log10(data[i])/Math.log10(options.getfieldvalue('log',10));
                                 }
                         }
@@ -184 +184 @@
 
                 //log?
-                if (options.getfieldvalue('log',10)!='off'){
+                if (options.getfieldvalue('log','off')!='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];
@@ -192 +192 @@
                         }
                         for(var i=0;i<md.mesh.numberofvertices;i++){
-                           data[i]=Math.log10(data[i])/Math.log10(options.getfieldvalue('log'));
+                           data[i]=Math.log10(data[i])/Math.log10(options.getfieldvalue('log',10));
                         }
                 }
@@ -202 +202 @@
                 
                 //log?  
-                if (options.getfieldvalue('log',10)!='off'){
+                if (options.getfieldvalue('log','off')!='off'){
                         var bounds=options.getfieldvalue('caxis',[ArrayMin(data),ArrayMax(data)]);
                         for(var i=0;i<md.mesh.numberofvertices;i++) {
@@ -223 +223 @@
                         for(var i=0;i<md.mesh.numberofvertices;i++){
                                 for(var j=0;j<data[i].length;j++) {
-                                        data[i][j]=Math.log10(data[i][j])/Math.log10(options.getfieldvalue('log'));
+                                        data[i][j]=Math.log10(data[i][j])/Math.log10(options.getfieldvalue('log',10));
                                 }
                         }