Changeset 12307

Timestamp:

05/31/12 13:22:23 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added plot_scatter as an option to plotmodel and fixed showregion

File:

• issm/trunk-jpl/src/m/model/plot/applyoptions.m (modified) (5 diffs)

issm/trunk-jpl/src/m/model/plot/applyoptions.m

@@ -292 +292 @@
                 textpositioni=textposition{i};
                 textrotationi=textrotation{i};
-                h=text(textpositioni(1),textpositioni(2),textstringi,'FontSize',textsizei,'FontWeight',textweighti,'Color',textcolori,'Rotation',textrotationi);
+                h=text(textpositioni(1),textpositioni(2),10,textstringi,'FontSize',textsizei,'FontWeight',textweighti,'Color',textcolori,'Rotation',textrotationi);
                 set(h,'Clipping','on'); %prevent text from appearing outside of the box
         end
@@ -349 +349 @@
 if exist(options,'axispos'),
         Axis=getfieldvalue(options,'axispos');
+        hold on
         set(gca,'pos',Axis);
 end
@@ -414 +415 @@
         %box off
         if strcmpi(md.mesh.hemisphere,'n') | strcmpi(md.mesh.hemisphere,'north'),
-                A=expread([ issmdir() '/projects/Exp/GreenlandBoxFront.exp']);
+                A=expread([ jplsvn() '/projects/Exp/GreenlandBoxFront.exp']);
                 [A.x A.y]=ll2xy(A.x,A.y,+1,45,70);
+                A.x = A.x(1:30:end);
+                A.y = A.y(1:30:end);
         elseif strcmpi(md.mesh.hemisphere,'s') | strcmpi(md.mesh.hemisphere,'south'),
-                A=expread([ issmdir() '/projects/Exp/Antarctica.exp']);
+                A=expread([ jplsvn() '/projects/Exp/Antarctica.exp']);
         else
                 error('applyoptions error message: hemisphere not defined');
         end
-        Ax=[min(A.x) max(A.x)];
-        Ay=[min(A.y) max(A.y)];
+        offset=3*10^4;
+        Ax=[min(A.x)-offset max(A.x)+offset];
+        Ay=[min(A.y)-offset max(A.y)+offset];
         %if we are zooming on a basin, don't take the mesh for the boundaries!
         if exist(options,'basin'),
                 [mdx mdy]=basinzoom(options);
         else
-                offset=3*10^4;
                 mdx=[min(md.mesh.x)-offset max(md.mesh.x)+offset];
                 mdy=[min(md.mesh.y)-offset max(md.mesh.y)+offset];
@@ -433 +436 @@
         line(A.x,A.y,ones(size(A.x)),'color','b');
         patch([Ax(1)  Ax(2)  Ax(2)  Ax(1) Ax(1)],[Ay(1)  Ay(1)  Ay(2)  Ay(2) Ay(1)],[1 1 1],'EdgeColor',[0 0 0],'LineWidth',1,'FaceLighting','none')
-        patch( [mdx(1) mdx(2) mdx(2) mdx(1)],[mdy(1) mdy(1) mdy(2) mdy(2)],ones(4,1),'EdgeColor',[0 0 0],'FaceColor','r','FaceAlpha',0.5)
+        patch([mdx(1) mdx(2) mdx(2) mdx(1)],[mdy(1) mdy(1) mdy(2) mdy(2)],ones(4,1),'EdgeColor',[0 0 0],'FaceColor','r','FaceAlpha',0.5)
         colorbar('off');
         %back to main gca
@@ -441 +444 @@
 %flag edges of a partition
 if exist(options,'partitionedges')
-[xsegments ysegments]=flagedges(md.mesh.elements,md.mesh.x,md.mesh.y,md.qmu.partition);
-xsegments=xsegments*getfieldvalue(options,'unit',1);
-ysegments=ysegments*getfieldvalue(options,'unit',1);
-color=getfieldvalue(options,'partitionedgescolor','r-');
-linewidth=getfieldvalue(options,'linewidth',1);
-hold on;
-for i=1:length(xsegments),
-        plot(xsegments(i,:),ysegments(i,:),color,'LineWidth',linewidth);
-end
+        [xsegments ysegments]=flagedges(md.mesh.elements,md.mesh.x,md.mesh.y,md.qmu.partition);
+        xsegments=xsegments*getfieldvalue(options,'unit',1);
+        ysegments=ysegments*getfieldvalue(options,'unit',1);
+        color=getfieldvalue(options,'partitionedgescolor','r-');
+        linewidth=getfieldvalue(options,'linewidth',1);
+        hold on;
+        for i=1:length(xsegments),
+                plot(xsegments(i,:),ysegments(i,:),color,'LineWidth',linewidth);
+        end
+end
+
+%Scatter
+if exist(options,'scatter')
+        data=getfieldvalue(options,'scatter');
+        hold on
+        plot_scatter(data(:,1),data(:,2),getfieldvalue(options,'scattersize',3),data(:,3));
 end