Changeset 2303

Timestamp:

09/23/09 16:16:42 (15 years ago)

Author:

Mathieu Morlighem

Message:

simplified overlay

Location:

issm/trunk/src/m/classes

Files:

• @model/model.m (modified) (1 diff)
• @model/setdefaultparameters.m (modified) (1 diff)
• public/buildoverlay.m (deleted)
• public/plot/plot_overlay.m (modified) (3 diffs)
• public/plot/plotdoc.m (modified) (1 diff)

issm/trunk/src/m/classes/@model/model.m

@@ -236 +236 @@
         %mesh2grid
         md.mesh2grid_parameters={};
-        md.mesh2grid_interpolation={};
-        md.mesh2grid_filter={};
-        md.mesh2grid_cornereast=0;
-        md.mesh2grid_cornernorth=0;
-        md.mesh2grid_xposting=0;
-        md.mesh2grid_yposting=0;
-        md.mesh2grid_nlines=0;
-        md.mesh2grid_ncolumns=0;
-        md.mesh2grid_windowsize=0;
-        md.mesh2grid_results=NaN;
+        md.mesh2grid_data=NaN;
+        md.mesh2grid_xm=NaN;
+        md.mesh2grid_ym=NaN;
+
+        %dummy
         md.dummy=NaN;
 

issm/trunk/src/m/classes/@model/setdefaultparameters.m

@@ -237 +237 @@
 md.alloc_cleanup=1;
 
-%mesh2grid parameter
-md.mesh2grid_parameters={'vel'};
-
-%interpolation type
-md.mesh2grid_interpolation={'node'};
-
-%filter
-md.mesh2grid_filter={'average'};
-
-%coordinate of the corner east (actually WEST...)
-md.mesh2grid_cornereast=0;
-
-%coordinate of the corner north
-md.mesh2grid_cornernorth=0;
-
-%x posting
-md.mesh2grid_xposting=1000;
-
-%y posting
-md.mesh2grid_yposting=1000;
-
-%number of lines
-md.mesh2grid_nlines=1000;
-
-%number of columns
-md.mesh2grid_ncolumns=1000;
-
-%window size
-md.mesh2grid_windowsize=1;
-
 %the string of solverstring is used directly by PETSc to solve finite element
 %systems KU=F. By default, we use MUMPS solver

issm/trunk/src/m/classes/public/plot/plot_overlay.m

@@ -54 +54 @@
         end
 
-        %use mesh2grid solution to get an gridded data to display using imagesc
-        [x_m y_m data_mesh2grid]=InterpFromMeshToGrid(elements,x,y,data,min(xlim),max(ylim),...
-                (max(xlim)-min(xlim))/length(md.sarxm),(max(ylim)-min(ylim))/length(md.sarym),length(md.sarym),length(md.sarxm),NaN);
+        %use InterpFromMeshToGrid to get an gridded data to display using imagesc
+        cornereast =min(xlim);
+        cornernorth=max(ylim);
+        xspacing=(max(xlim)-min(xlim))/(length(md.sarxm));
+        yspacing=(max(ylim)-min(ylim))/(length(md.sarym));
+        nlines=length(md.sarym);
+        ncols =length(md.sarxm);
+        [x_m y_m data_grid]=InterpFromMeshToGrid(elements,x,y,data,cornereast,cornernorth,xspacing,yspacing,nlines,ncols,0);
 else
         %process mesh and data
         [x y z elements is2d]=processmesh(md,options_structure);
         [data isongrid isquiver]=processdata(md,data,options_structure);
-
-        %get previous result
-        data_mesh2grid=mesh2grid_results(find(ismember(data,mesh2grid_parameters)));
 end
 
 %Ok, we have two images, double format: 
 radar=md.sarpwr;
-
-%nullify NaN in results
-data_mesh2grid(find(isnan(data_mesh2grid)))=0;
 
 %Build hsv color image from radar and results
@@ -81 +80 @@
 %hue
 %cut results under 1.5, and log
-data_mesh2grid(find(data_mesh2grid<1.5))=1.5;
-h=bytscl(log(data_mesh2grid))/(255+1); %1 offset on colormap
+data_grid(find(data_grid<1.5))=1.5;
+h=bytscl(log(data_grid))/(255+1); %1 offset on colormap
 
 %saturation
-s=(0.5+data_mesh2grid/125)/transparency;s(find(s>1))=1;s(find(s<0))=0;
-s(find(data_mesh2grid==1.5))=0;
+s=(0.5+data_grid/125)/transparency;s(find(s>1))=1;s(find(s<0))=0;
+s(find(data_grid==1.5))=0;
 
 %Include border
@@ -92 +91 @@
 
 %Transform hsv to rgb
-image_hsv=zeros(size(data_mesh2grid,1),size(data_mesh2grid,2),3);
+image_hsv=zeros(size(data_grid,1),size(data_grid,2),3);
 image_hsv(:,:,1)=h;
 image_hsv(:,:,2)=s;

issm/trunk/src/m/classes/public/plot/plotdoc.m

@@ -79 +79 @@
 disp('       ''ylabel'': same as standard matlab option');
 disp('       ''overlay'': yes or no. This will overlay a radar amplitude image behind');
-disp('       ''windowsize'': default is 1. size of filter window when using overlay.');
 disp('       ''highres'': resolution of overlayed radar amplitude image (default is 0, high resolution is 1).');
 disp('       ''alpha'': transparency coefficient (the higher, the more transparent). Default is 1.5');