Changeset 6957 for issm/trunk

Timestamp:

01/05/11 15:37:49 (14 years ago)

Author:

Mathieu Morlighem

Message:

overlay even if out of bounds

File:

• issm/trunk/src/m/model/radarpower.m (modified) (1 diff)

issm/trunk/src/m/model/radarpower.m

@@ -31 +31 @@
                 jpgim=[issmdir() '/projects/ModelData/MOG/mog150_greenland_map.jpg'];
                 geom=load([issmdir() '/projects/ModelData/MOG/mog150_greenland_map.jpgw'],'ascii');
-                sizex=floor((x1-x0)/geom(1)); % x posting
-                sizey=floor((y1-y0)/geom(4)); % y posting
-                topleftx=floor((x0-geom(5))/geom(1)); % x min
-                toplefty=floor((geom(6)-y1)/geom(4)); % y max
+
+                %geom:   xposting nbcols nbrows yposting xmin ymax
+                xmin=max(geom(5),x0);
+                xmax=min(geom(5)+geom(1)*geom(2),x1);
+                ymin=max(geom(6)-geom(4)*geom(3),y0);
+                ymax=min(geom(6),y1);
+
+                firstcol=max(1,floor((xmin-geom(5))/geom(1))); %x min
+                firstrow=max(1,floor((geom(6)-ymax)/geom(4))); %y max
+                numcols=floor((xmax-xmin)/geom(1)); % x posting
+                numrows=floor((ymax-ymin)/geom(4)); % y posting
 
                 %Read and crop file
                 disp('Warning: expecting coordinates in polar stereographic (Std Latitude: 70ºN Meridian: 45º)');
                 im=imread(jpgim);
-                im=im(toplefty:toplefty+sizey,topleftx:topleftx+sizex);
+                im=im(firstrow:firstrow+numrows-1,firstcol:firstcol+numcols-1);
                 md.sarpwr=double(flipud(im));
-                md.sarxm=(x0:(x1-x0)/(size(md.sarpwr,2)-1):x1);
-                md.sarym=(y0:(y1-y0)/(size(md.sarpwr,1)-1):y1);
+                md.sarxm=(xmin:(xmax-xmin)/(size(md.sarpwr,2)-1):xmax);
+                md.sarym=(ymin:(ymax-ymin)/(size(md.sarpwr,1)-1):ymax);
 
         elseif strcmpi(md.hemisphere,'s'),