Changeset 19935

Timestamp:

01/07/16 10:10:31 (9 years ago)

Author:

Eric.Larour

Message:

CHG: minor.

Location:

issm/trunk-jpl/src/m/plot

Files:

• plot_manager.js (modified) (1 diff)
• radarpower.m (modified) (7 diffs)
• slider.js (modified) (1 diff)

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

@@ -10 +10 @@
         checkplotoptions(md,options);
         //get data to be displayed
-        data=options.getfieldvalue('data');
+        var data=options.getfieldvalue('data');
         
         //standard plot: initialize open Gl for each canvas, if needed: 

issm/trunk-jpl/src/m/plot/radarpower.m

@@ -36 +36 @@
 %figure out if we should go look for Greenland or Antarctica geotiff, or if user provided one.
 if ~exist(options,'overlay_image'),
-        if md.mesh.epsg==3413,
+        if md.mesh.epsg==3413,   %Greenland 
+                %old code {{{ 
                 %if ~exist(['/u/astrid-r1b/ModelData/MOG/mog150_greenland_map.jpg']),
                 %       error(['radarpower error message: file ' '/u/astrid-r1b/ModelData/MOG/mog150_greenland_map.jpg not found.']);
@@ -68 +69 @@
                 %md.radaroverlay.pwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
                 %md.radaroverlay.x=(xmin:(xmax-xmin)/(size(md.radaroverlay.pwr,2)-1):xmax);
-                %md.radaroverlay.y=(ymin:(ymax-ymin)/(size(md.radaroverlay.pwr,1)-1):ymax);
+                %md.radaroverlay.y=(ymin:(ymax-ymin)/(size(md.radaroverlay.pwr,1)-1):ymax); % }}}
                 if ~exist(options,'geotiff_name'),
                         if highres,
@@ -107 +108 @@
                         system('rm -rf ./temp.tif');
                 end
-        elseif md.mesh.epsg==3031,
+        elseif md.mesh.epsg==3031, %Antarctica 
                 if ~exist(options,'geotiff_name'),
                         if highres,
@@ -135 +136 @@
                 md.radaroverlay.y=(y0:(y1-y0)/(size(md.radaroverlay.pwr,1)-1):y1);
 
-                %Erase image
-                system('rm -rf ./temp.tif');
                 %Erase image or keep it?
                 if ~getfieldvalue(options,'keep_image',0),
@@ -174 +173 @@
 
 %Was a triangulation requested for the area of the image that is not covered by the mesh?
-if getfieldvalue(options,'outertriangulation','yes'),
+if strcmpi(getfieldvalue(options,'outertriangulation','no'),'yes'),
 
         %create expfile that is a box controlled by xlim and ylim, with a hole defined by the mesh outer segments.
@@ -190 +189 @@
         box(2).y=[box(2).y; box(2).y(1)];
 
-        box(2).x=flipud(box(2).x);
-        box(2).y=flipud(box(2).y);
+        if strcmpi(getfieldvalue(options,'outertriangulationflip','no'),'yes'),
+                box(2).x=flipud(box(2).x);
+                box(2).y=flipud(box(2).y);
+        end
 
         %write contour to file
@@ -198 +199 @@
         %mesh: 
         maxarea=max(GetAreas(md.mesh.elements,md.mesh.x,md.mesh.y));
-        outermd=triangle(model(),'./outertriangulation.exp',maxarea);
+        outermd=triangle(model(),'./outertriangulation.exp',sqrt(maxarea));
         
         %save the triangulation: 

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

@@ -16 +16 @@
         precision=options.getfieldvalue('precision',3);
         step=options.getfieldvalue('step',1);
+        slidersdiv=options.getfieldvalue('slidersdiv','#sliders');
 
-        $('<div id="slider_'+slidername+'"></div>').appendTo('#sliders');
-        $('<div id="info_'+slidername+'">'+startmessage[0]+initialvalue.toString()+startmessage[1]+'</div>').appendTo('#sliders');
+        $('<div id="slider_'+slidername+'"></div>').appendTo(slidersdiv);
+        $('<div id="info_'+slidername+'">'+startmessage[0]+initialvalue.toString()+startmessage[1]+'</div>').appendTo(slidersdiv);
         var info=$('#info_'+slidername);
         $('#slider_'+slidername).slider({