Changeset 19890

Timestamp:

12/13/15 09:21:30 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Adding colorbar handling for movie data.

File:

• issm/trunk-jpl/src/m/plot/applyoptions.js (modified) (3 diffs)

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

@@ -136 +136 @@
                         } else { 
                         }
-                        var caxis = options.getfieldvalue('caxis',[Math.min.apply(null,data),Math.max.apply(null,data)]);
+                        
+                        //Handle movie data
+                        var     dataresults = processdata(md,data,options);
+                        var     data2 = dataresults[0]; 
+                        var     datatype = dataresults[1];
+                        if (datatype == 5) {
+                                data = data[node["movieFrame"]];
+                        }
+                        
+                        var caxis = options.getfieldvalue('caxis',[ArrayMin(data),ArrayMax(data)]);
                         var canvassize = options.getfieldvalue('canvassize',480);
                         var cheight;
@@ -250 +259 @@
                                 ccanvashtml = document.getElementById(ccanvasid);
                                 if (ccanvashtml==null) {
-                                        ccanvas = $('<canvas id="'+ccanvasid+'" width="'+String(cwidth+cheightoffset*4)+'" height="'+String(cheight+cheightoffset*2)+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
+                                        ccanvas = $('<canvas id="'+ccanvasid+'" width="'+String(cwidth+cheightoffset*4)+'" height="'+String(cheight+cheightoffset*5/2)+'"></canvas>').insertAfter('#'+options.getfieldvalue('canvasid'));
                                         ccanvas.css({'position':'relative','top':((canvassize-cheight-cheightoffset*2)/-2).toFixed(2)+'px'});
                                         ccontext = ccanvas[0].getContext('2d');
@@ -262 +271 @@
                                                 //get html object instead of jqurey object to modify height/width to accomodate labels
                                                 ccanvashtml.width = cwidth+cheightoffset*6;
-                                                ccanvashtml.height = cheight+cheightoffset*2;
+                                                ccanvashtml.height = cheight+cheightoffset*5/2;
                                                 ccanvashtml.cwidth = cwidth;
                                                 ccanvashtml.cheight = cheight;