Changeset 24028

Timestamp:

06/19/19 01:45:36 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: if axis option is provided, use it in elementnumbering so that it does not take AGES, and stop using eval in applyoptions

Location:

issm/trunk-jpl/src/m/plot

Files:

• applyoptions.m (modified) (3 diffs)
• plot_elementnumbering.m (modified) (2 diffs)

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

@@ -51 +51 @@
 set(gca,'FontSize',getfieldvalue(options,'axisfontsize',fontsize));;
 if exist(options,'axis')
-        eval(['axis ' getfieldvalue(options,'axis')]);
+        axis(getfieldvalue(options,'axis'));
 else
         if strcmp(domaintype(md.mesh),'3D'),
@@ -73 +73 @@
 %box
 if exist(options,'box')
-        eval(['box ' getfieldvalue(options,'box')]);
+        box(getfieldvalue(options,'box'));
 end
 
@@ -243 +243 @@
 else
         %do nothing
-
 end
 

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

@@ -25 +25 @@
 
         %numbering
-        text(sum(x(elements(:,1:3)),2)/3,sum(y(elements(:,1:3)),2)/3,sum(z(elements(:,1:3)),2)/3,...
-                num2str(elementnumbers),...
-                'HorizontalAlignment','center','VerticalAlignment','middle');
+        X   = sum(x(elements(:,1:3)),2)/3;
+        Y   = sum(y(elements(:,1:3)),2)/3;
+        Z   = sum(z(elements(:,1:3)),2)/3;
+        NUM = elementnumbers;
+        if exist(options,'axis')
+                AXIS = getfieldvalue(options,'axis');
+                pos = find(X>AXIS(1) & X<AXIS(2) & Y>AXIS(3) & Y<AXIS(4));
+                X = X(pos); Y=Y(pos); Z=Z(pos); NUM=NUM(pos);
+        end
+        text(X,Y,Z,num2str(NUM),'HorizontalAlignment','center','VerticalAlignment','middle');
 else
         %plot mesh 
@@ -47 +54 @@
 
         %numbering
-        text(sum(x(elements(:,1:6)),2)/6,sum(y(elements(:,1:6)),2)/6,sum(z(elements(:,1:6)),2)/6,...
-                num2str(elementnumbers),...
-                'HorizontalAlignment','center','VerticalAlignment','middle');
+        X   = sum(x(elements(:,1:6)),2)/6;
+        Y   = sum(y(elements(:,1:6)),2)/6;
+        Z   = sum(z(elements(:,1:6)),2)/6;
+        NUM = elementnumbers;
+        if exist(options,'axis')
+                AXIS = getfieldvalue(options,'axis');
+                pos = find(X>AXIS(1) & X<AXIS(2) & Y>AXIS(3) & Y<AXIS(4));
+                X = X(pos); Y=Y(pos); Z=Z(pos); NUM=NUM(pos);
+        end
+        text(X,Y,Z,num2str(NUM),'HorizontalAlignment','center','VerticalAlignment','middle');
 end