Changeset 13870

Timestamp:

11/04/12 15:03:26 (12 years ago)

Author:

Eric.Larour

Message:

CHG: slight mods to these two routines

Location:

issm/trunk-jpl/src/m/plot

Files:

• curvedarrow.m (modified) (4 diffs)
• plot_riftrelvel.m (modified) (2 diffs)

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

@@ -10 +10 @@
 %            'ratio': default .5 (ratio headarrow/length)
 %            'widthratio': default is 1/10 of length
+%            'width': if you want to specify an absolute width
 
         %recover options
         options=pairoptions(varargin{:});
         ratio=getfieldvalue(options,'ratio',.1);
-        widthratio=getfieldvalue(options,'widthratio',.1);
+        arrowlength=getfieldvalue(options,'arrowlength',1);
         color=getfieldvalue(options,'color','k');
 
@@ -23 +24 @@
         %compute some values out of (x1,y1) and (x2,y2)
         length=distance*angle;
-        width=length*widthratio;
+        
+        if exist(options,'widthratio'),
+                widthratio=getfieldvalue(options,'widthratio');
+                width=length*widthratio;
+        else if exist(options,'width'),
+                width=getfieldvalue(options,'width');
+        else 
+                widthratio=.1;
+                width=length*widthratio;
+        end
 
         %buidl the arrow itself: 
@@ -41 +51 @@
         E=D+2/3*(D-C);
         F=C+2/3*(C-D);
+
         n=(F-E)/norm(F-E,2);
         m=[-n(2) n(1)];
@@ -46 +57 @@
                 m=-m;
         end
-        d=(distance*angle)*ratio;
+        
+        if exist(options,'arrowlength'),
+                d=arrowlength;
+        else
+                d=abs((distance*angle)*ratio);
+        end
         
         %G is d distance from middle of E and F: 

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

@@ -79 +79 @@
                 %if penetration is negative, plot in black, positive, plot in red;: ie: if rift is closing, black, if rift is opening, red.
                 if(penetration>0),
-                        p2=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'*','MarkerSize',markersize); set(p2,'Color',[140 140 140]/255);
+                        p2=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'.','MarkerSize',markersize); set(p2,'Color',[140 140 140]/255);
                         isp2=1;
                 else
-                        p1=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'k*','MarkerSize',markersize);
+                        p1=plot(x(penaltypairs(j,1)) ,y(penaltypairs(j,1)),'k.','MarkerSize',markersize);
                         isp1=1;
                 end
@@ -88 +88 @@
 
         %point out the tips
-        h2=plot(x(md.rifts.riftstruct(i).tips(1)),y(md.rifts.riftstruct(i).tips(1)),'g*','MarkerSize',markersize);
-        plot(x(md.rifts.riftstruct(i).tips(2)),y(md.rifts.riftstruct(i).tips(2)),'g*','MarkerSize',markersize);
+        h2=plot(x(md.rifts.riftstruct(i).tips(1)),y(md.rifts.riftstruct(i).tips(1)),'g.','MarkerSize',markersize);
+        plot(x(md.rifts.riftstruct(i).tips(2)),y(md.rifts.riftstruct(i).tips(2)),'g.','MarkerSize',markersize);
         segments=md.rifts.riftstruct(i).segments(:,1:2);
 end