Changeset 19305

Timestamp:

04/23/15 11:06:28 (10 years ago)

Author:

Eric.Larour

Message:

CHG: minor tweaks and improvements

Location:

issm/branches/trunk-jpl-ad2/src/m/plot

Files:

• export_gl.m (added)
• prepare_gl.m (modified) (1 diff)
• writejsfile.m (modified) (2 diffs)

issm/branches/trunk-jpl-ad2/src/m/plot/prepare_gl.m

@@ -244 +244 @@
 
 %}}}
-%handle rendering of contour {{{
-
-
-fid=fopen([database '/contour_coords.js'],'w');
-
-contour_lat=md.mesh.lat(md.mesh.segments(:,1));
-contour_long=md.mesh.long(md.mesh.segments(:,1));
-contour_surface=md.geometry.surface(md.mesh.segments(:,1));
-
-R=6371000*ones(length(contour_surface),1)+scaling_factor*contour_surface;
-
-contour_x = R .* cosd(contour_lat) .* cosd(contour_long);
-contour_y = R .* cosd(contour_lat) .* sind(contour_long);
-contour_z = R .* sind(contour_lat);
-
-%write contour_x:
-fprintf(fid,'<!-- contour_x{{{-->\n');
-fprintf(fid,'var contour_x=[');
-for i=1:length(contour_x)-1,
-        fprintf(fid,'%g,',contour_x(i));
-end
-fprintf(fid,'%g];\n',contour_x(end));
-fprintf(fid,'<!--}}}-->\n');
-
-%write contour_y:
-fprintf(fid,'<!-- contour_y{{{-->\n');
-fprintf(fid,'var contour_y=[');
-for i=1:length(contour_y)-1,
-        fprintf(fid,'%g,',contour_y(i));
-end
-fprintf(fid,'%g];\n',contour_y(end));
-fprintf(fid,'<!--}}}-->\n');
-
-%write contour_surface:
-fprintf(fid,'<!-- contour_z{{{-->\n');
-fprintf(fid,'var contour_z=[');
-for i=1:length(contour_z)-1,
-        fprintf(fid,'%g,',contour_z(i));
-end
-fprintf(fid,'%g];\n',contour_z(end));
-fprintf(fid,'<!--}}}-->\n');
-
-fclose(fid);
-
-%}}}
 
 %Come back to present directory: 

issm/branches/trunk-jpl-ad2/src/m/plot/writejsfile.m

@@ -8 +8 @@
         nods=length(model.x);
         nel=size(model.index,1);
+        nx=length(model.contourx);
         
         fid=fopen(filename,'w');
 
-        fprintf(fid,'model = []\n');
-
+        fprintf(fid,'model = {};\n');
+        fprintf(fid,'model["title"]="%s";\n',model.title);
+        fprintf(fid,'model["initialZoomFactor"]=%s;\n',model.initialZoomFactor);
+        
         %write index:
         fprintf(fid,'<!-- model["index"]{{{-->\n');
@@ -26 +29 @@
         writejsfield(fid,'model["z"]',model.z,nods);
         writejsfield(fid,'model["surface"]',model.surface,nods);
+        writejsfield(fid,'model["contourx"]',model.contourx,nx);
+        writejsfield(fid,'model["contoury"]',model.contoury,nx);
+        writejsfield(fid,'model["contourz"]',model.contourz,nx);
 
         results=model.results;
-        fprintf(fid,'results=[]\n');
-        fprintf(fid,'result=[]\n');
+        fprintf(fid,'results={};\n');
 
         for i=1:length(results),
+                fprintf(fid,'result={};\n');
                 writejsfield(fid,'result["data"]',results(i).data,nods);
                 fprintf(fid,'<!--{{{-->\n');
                 fprintf(fid,'result["caxis"]=[%g,%g];\n',results(i).caxis(1),results(i).caxis(2));
-                fprintf(fid,'result["label"]="%s"\n',results(i).label);
-                fprintf(fid,'result["shortlabel"]="%s"\n',results(i).shortlabel);
-                fprintf(fid,'result["unit"]="%s"\n',results(i).unit);
+                fprintf(fid,'result["label"]="%s";\n',results(i).label);
+                fprintf(fid,'result["shortlabel"]="%s";\n',results(i).shortlabel);
+                fprintf(fid,'result["unit"]="%s";\n',results(i).unit);
+                if size(results(i).data,2)>1,
+                        fprintf(fid,'result["time_range"]=[%g,%g];\n',results(i).time_range(1),results(i).time_range(2));
+                end
                 fprintf(fid,'results["%i"]=result;\n',i);
                 fprintf(fid,'<!--}}}-->\n');