Changeset 19910

Timestamp:

12/17/15 22:14:16 (9 years ago)

Author:

dlcheng

Message:

CHG (javascript): Consolidating radaroverlay handling.

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_manager.js (modified) (1 diff)
• plot_overlay.js (modified) (2 diffs)
• plot_radaroverlay.js (deleted)

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

@@ -216 +216 @@
                 return;
         }
-        
-        //Figure out if this is a semi-transparent plot.
-        if (options.getfieldvalue('radaroverlay','on')=='on'){
-                if (md.radaroverlay) {
-                        nodes["radaroverlay"] = Node(gl,options);
-                        plot_radaroverlay(md,data,options,canvas,gl,nodes["radaroverlay"]);
-                }
-        }
 
         if (typeof data !== 'string'){

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

@@ -25 +25 @@
         var isplanet = meshresults[5];
         //}}}
-
+                
         //Compute coordinates and data range:
         var modelxlim = [ArrayMin(x),ArrayMax(x)];
@@ -60 +60 @@
         var yrange = modelylim[1] - modelylim[0];
         
+        //Handle outer radaroverlay
+        if (md.radaroverlay) {
+                var newelements = [];
+                for (var i = 0; i < md.radaroverlay.outerindex.length; i++) {
+                        newelements.push([md.radaroverlay.outerindex[i][0] + x.length, md.radaroverlay.outerindex[i][1] + y.length, md.radaroverlay.outerindex[i][2] + z.length]);
+                }
+                x = [].concat(x, md.radaroverlay.outerx);
+                y = [].concat(y, md.radaroverlay.outery);
+                z = [].concat(z, md.radaroverlay.outerheight);
+                elements = [].concat(elements, newelements);
+        }
+        
         //generate mesh:
         for(var i = 0; i < x.length; i++){