Changeset 5088
- Timestamp:
- 08/09/10 13:53:41 (15 years ago)
- Location:
- issm/trunk/src/m
- Files:
-
- 1 deleted
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/m/classes/@pairoptions/getfieldvalue.m
r2392 r5088 23 23 24 24 %Recover option 25 if nargin==3,26 value=varargin{1};27 else28 value='option not found';29 end30 25 for i=1:size(pairoptions.list,1), 31 26 if strcmpi(pairoptions.list{i,1},field) … … 34 29 end 35 30 end 31 32 %The option has not been found, output default if provided 33 if nargin==3, 34 value=varargin{1}; 35 else 36 error(['error message: field ' field ' has not been provided by user (and no default value has been specified)']) 37 end -
issm/trunk/src/m/classes/public/bamg.m
r4997 r5088 61 61 62 62 %Check that file exists 63 domainfile=getfieldvalueerr(options,'domain'); 64 if ~exist(domainfile,'file') 65 error(['bamg error message: file ' domainfile ' not found ']); 66 end 63 domainfile=getfieldvalue(options,'domain'); 64 if ~exist(domainfile,'file') error(['bamg error message: file ' domainfile ' not found ']); end 67 65 68 66 %Build geometry … … 75 73 error('bamg error message: all contours provided in ''domain'' should be closed'); 76 74 end 77 %Checks that all holes are INSIDE the principla domain outline 75 76 %Checks that all holes are INSIDE the principle domain outline 78 77 if i>1, 79 78 flags=ContourToNodes(domain(i).x,domain(i).y,domain(1),0); … … 86 85 nods=domain(i).nods-1; %the domain are closed 1=end; 87 86 bamg_geometry.Vertices=[bamg_geometry.Vertices; [domain(i).x(1:nods) domain(i).y(1:nods) ones(nods,1)]]; 88 bamg_geometry.Edges =[bamg_geometry.Edges;[transpose(count+1:count+nods) transpose([count+2:count+nods count+1]) 1*ones(nods,1)]];87 bamg_geometry.Edges =[bamg_geometry.Edges; [transpose(count+1:count+nods) transpose([count+2:count+nods count+1]) 1*ones(nods,1)]]; 89 88 90 89 %update counter … … 96 95 97 96 %Check that file exists 98 riftfile=getfieldvalue err(options,'rifts');97 riftfile=getfieldvalue(options,'rifts'); 99 98 if ~exist(riftfile,'file') 100 99 error(['bamg error message: file ' riftfile ' not found ']); … … 207 206 208 207 %Check that file exists 209 trackfile=getfieldvalue err(options,'tracks');208 trackfile=getfieldvalue(options,'tracks'); 210 209 if ~exist(trackfile,'file') 211 210 error(['bamg error message: file ' trackfile ' not found ']); … … 226 225 227 226 if exist(options,'hVertices'), 228 bamg_geometry.hVertices=getfieldvalue err(options,'hVertices');227 bamg_geometry.hVertices=getfieldvalue(options,'hVertices'); 229 228 if length(bamg_geometry.hVertices)~=nods, 230 229 error(['hVertices option should be of size [' num2str(nods) ',1]']); … … 257 256 258 257 if exist(options,'hVertices'), 259 bamg_mesh.hVertices=getfieldvalue err(options,'hVertices');258 bamg_mesh.hVertices=getfieldvalue(options,'hVertices'); 260 259 if length(bamg_mesh.hVertices)~=md.numberofgrids, 261 260 error(['hVertices option should be of size [' num2str(md.numberofgrids) ',1]']); -
issm/trunk/src/m/classes/public/mesh/meshbamg.m
r5024 r5088 29 29 %recover some fields 30 30 disp('MeshBamg Options:') 31 domainoutline=getfieldvalue err(options,'domainoutline');31 domainoutline=getfieldvalue(options,'domainoutline'); 32 32 disp(sprintf(' %-15s: ''%s''','DomainOutline',domainoutline)); 33 33 groundeddomain=getfieldvalue(options,'groundeddomain','N/A'); 34 34 disp(sprintf(' %-15s: ''%s''','GroundedDomain',groundeddomain)); 35 velocities=getfieldvalue err(options,'velocities');35 velocities=getfieldvalue(options,'velocities'); 36 36 disp(sprintf(' %-15s: ''%s''','Velocities',velocities)); 37 37 thickness=getfieldvalue(options,'thickness','none'); -
issm/trunk/src/m/classes/public/mesh/meshyams.m
r5024 r5088 28 28 %recover some fields 29 29 disp('MeshYams Options:') 30 domainoutline=getfieldvalue err(options,'domainoutline');30 domainoutline=getfieldvalue(options,'domainoutline'); 31 31 disp(sprintf(' %-15s: ''%s''','DomainOutline',domainoutline)); 32 32 riftoutline=getfieldvalue(options,'riftoutline','N/A'); … … 34 34 groundeddomain=getfieldvalue(options,'groundeddomain','N/A'); 35 35 disp(sprintf(' %-15s: ''%s''','GroundedDomain',groundeddomain)); 36 velocities=getfieldvalue err(options,'velocities');36 velocities=getfieldvalue(options,'velocities'); 37 37 disp(sprintf(' %-15s: ''%s''','Velocities',velocities)); 38 38 resolution=getfieldvalue(options,'resolution',5000); -
issm/trunk/src/m/classes/public/modeldefault/modeldefault_process.m
r2399 r5088 13 13 14 14 %domainoutline 15 optionstruct.domainoutline=getfieldvalue err(options,'domainoutline');15 optionstruct.domainoutline=getfieldvalue(options,'domainoutline'); 16 16 17 17 %resolution -
issm/trunk/src/m/classes/public/plot/checkplotoptions.m
r3293 r5088 204 204 if exist(options,'log'), 205 205 if exist(options,'caxis') 206 options=changefieldvalue(options,'caxis',log(getfieldvalue err(options,'caxis'))/log(getfieldvalueerr(options,'log')));207 end 208 options=changefieldvalue(options,'cutoff',log(getfieldvalue(options,'cutoff',1.5))/log(getfieldvalue err(options,'log')));209 end 206 options=changefieldvalue(options,'caxis',log(getfieldvalue(options,'caxis'))/log(getfieldvalue(options,'log'))); 207 end 208 options=changefieldvalue(options,'cutoff',log(getfieldvalue(options,'cutoff',1.5))/log(getfieldvalue(options,'log'))); 209 end -
issm/trunk/src/m/classes/public/plot/plot_transient_field.m
r4330 r5088 13 13 14 14 %Figure out the iterations to plot and check if it is possible 15 steps=getfieldvalue err(options,'steps');15 steps=getfieldvalue(options,'steps'); 16 16 maxiteration=size(md.results.transient,2); 17 17 if max(steps)>maxiteration | min(steps)<1, -
issm/trunk/src/m/classes/public/plot/processdata.m
r4411 r5088 13 13 14 14 %check format 15 if (iscell(data) | isempty(data) | length(data)==0 ),15 if (iscell(data) | isempty(data) | length(data)==0 | (length(data)==1 & isnan(data))), 16 16 error('plotmodel error message: data provided is empty'); 17 17 end -
issm/trunk/src/m/classes/public/process_solve_options.m
r5036 r5088 8 8 9 9 %analysis_type: check on this option, error out otherwise 10 analysis_type=getfieldvalue err(options,'analysis_type');10 analysis_type=getfieldvalue(options,'analysis_type'); 11 11 12 12 %sub_analysis_type: check on it, not mandatory -
issm/trunk/src/m/utils/Exp/expmaster.m
r3248 r5088 63 63 %initialize the variables with files provided by 'include' option 64 64 if exist(options,'include'), 65 files=getfieldvalue err(options,'include');65 files=getfieldvalue(options,'include'); 66 66 if ischar(files), files={files}; end 67 67 for i=1:length(files), … … 151 151 for i=1:numprofiles 152 152 if length(A(i).x)==1, 153 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...154 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker','o');153 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 154 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker','o'); 155 155 else 156 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'));156 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth')); 157 157 end 158 158 prevplot2=prevplot2+1; -
issm/trunk/src/m/utils/Exp/manipulation/addcontour.m
r3019 r5088 25 25 %plot everything 26 26 undoplots(prevplot); 27 plot(x,y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...28 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));29 plot(x(end),y(end),'MarkerEdgeColor',getfieldvalue err(options,'selectioncolor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));27 plot(x,y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 28 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 29 plot(x(end),y(end),'MarkerEdgeColor',getfieldvalue(options,'selectioncolor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 30 30 31 31 else -
issm/trunk/src/m/utils/Exp/manipulation/addendprofile.m
r3019 r5088 48 48 %plot the selected profile 49 49 hold on 50 plot(x,y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...51 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));52 plot(x(end),y(end),'MarkerEdgeColor',getfieldvalue err(options,'selectioncolor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));50 plot(x,y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 51 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 52 plot(x(end),y(end),'MarkerEdgeColor',getfieldvalue(options,'selectioncolor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 53 53 54 54 loop=1; … … 65 65 %plot everything 66 66 undoplots(prevplot); 67 plot(x,y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...68 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));69 plot(x(end),y(end),'MarkerEdgeColor',getfieldvalue err(options,'selectioncolor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize')+2,'Marker',getfieldvalueerr(options,'Marker'));67 plot(x,y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 68 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 69 plot(x(end),y(end),'MarkerEdgeColor',getfieldvalue(options,'selectioncolor'),'MarkerSize',getfieldvalue(options,'MarkerSize')+2,'Marker',getfieldvalue(options,'Marker')); 70 70 71 71 else -
issm/trunk/src/m/utils/Exp/manipulation/addinsideprofile.m
r3018 r5088 21 21 %plot squares 22 22 for i=1:numprofiles 23 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...24 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));23 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 24 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 25 25 end 26 26 … … 46 46 %highlight selected segment 47 47 plot([A(profsel).x(indsel) A(profsel).x(indsel+1)],[A(profsel).y(indsel) A(profsel).y(indsel+1)],... 48 'color',getfieldvalue err(options,'selectioncolor'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...49 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));48 'color',getfieldvalue(options,'selectioncolor'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 49 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 50 50 51 51 %next click … … 64 64 undoplots(prevplot); 65 65 for i=1:numprofiles 66 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...67 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));66 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 67 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 68 68 end 69 69 -
issm/trunk/src/m/utils/Exp/manipulation/addprofile.m
r3019 r5088 25 25 %plot everything 26 26 undoplots(prevplot); 27 plot(x,y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...28 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));29 plot(x(end),y(end),'MarkerEdgeColor',getfieldvalue err(options,'selectioncolor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));27 plot(x,y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 28 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 29 plot(x(end),y(end),'MarkerEdgeColor',getfieldvalue(options,'selectioncolor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 30 30 31 31 else -
issm/trunk/src/m/utils/Exp/manipulation/closeprofile.m
r3018 r5088 44 44 %back to regular color 45 45 plot(A(profsel).x,A(profsel).y,... 46 'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'));46 'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth')); 47 47 elseif closed(profsel), 48 48 %profile already closed, do nothing … … 53 53 %in selectioncolor 54 54 plot(A(profsel).x,A(profsel).y,... 55 'color',getfieldvalue err(options,'selectioncolor'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'));55 'color',getfieldvalue(options,'selectioncolor'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth')); 56 56 end 57 57 else -
issm/trunk/src/m/utils/Exp/manipulation/cutarea.m
r3018 r5088 16 16 %plot squares 17 17 for i=1:numprofiles 18 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...19 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));18 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 19 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 20 20 end 21 21 … … 57 57 points(end+1)=indsel; 58 58 plot(A(profsel).x,A(profsel).y,... 59 'color',getfieldvalue err(options,'selectioncolor'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'));59 'color',getfieldvalue(options,'selectioncolor'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth')); 60 60 text(A(selection).x(indsel),A(selection).y(indsel),num2str(1),'FontSize',14,'background',[0.7 0.7 0.9]); 61 61 end … … 137 137 undoplots(prevplot); 138 138 for i=1:numprofiles 139 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...140 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));139 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 140 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 141 141 end 142 142 points=[]; -
issm/trunk/src/m/utils/Exp/manipulation/cutprofile.m
r3018 r5088 21 21 %plot squares 22 22 for i=1:numprofiles 23 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...24 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));23 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 24 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 25 25 end 26 26 … … 68 68 undoplots(prevplot); 69 69 for i=1:numprofiles 70 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...71 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));70 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 71 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 72 72 end 73 73 end -
issm/trunk/src/m/utils/Exp/manipulation/mergeprofiles.m
r3018 r5088 35 35 %plot the tips only 36 36 plot(tips(:,1),tips(:,2),... 37 'LineStyle','none','MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));37 'LineStyle','none','MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 38 38 firsttip=1; 39 39 … … 71 71 %plot selected tip 72 72 plot(tips(tip1,1),tips(tip1,2),... 73 'LineStyle','none','MarkerEdgeColor',getfieldvalue err(options,'selectioncolor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));73 'LineStyle','none','MarkerEdgeColor',getfieldvalue(options,'selectioncolor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 74 74 plot(A(numprofile1).x,A(numprofile1).y,... 75 'color',getfieldvalue err(options,'selectioncolor'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'));75 'color',getfieldvalue(options,'selectioncolor'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth')); 76 76 77 77 %second selection … … 136 136 undoplots(prevplot); 137 137 for i=1:numprofiles 138 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'));138 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth')); 139 139 end 140 140 if ~isempty(tips) 141 141 plot(tips(:,1),tips(:,2),... 142 'LineStyle','none','MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));142 'LineStyle','none','MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 143 143 end 144 144 -
issm/trunk/src/m/utils/Exp/manipulation/modifyposition.m
r3018 r5088 19 19 %plot squares 20 20 for i=1:numprofiles 21 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...22 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));21 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 22 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 23 23 end 24 24 … … 36 36 %plot the point in blue 37 37 plot(A(profsel).x(indsel),A(profsel).y(indsel),... 38 'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...39 'MarkerEdgeColor',getfieldvalue err(options,'selectioncolor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));38 'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 39 'MarkerEdgeColor',getfieldvalue(options,'selectioncolor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 40 40 41 41 %select new location … … 63 63 undoplots(prevplot); 64 64 for i=1:numprofiles 65 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...66 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));65 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 66 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 67 67 end 68 68 else -
issm/trunk/src/m/utils/Exp/manipulation/removepoints.m
r3248 r5088 19 19 %plot squares 20 20 for i=1:numprofiles 21 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...22 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));21 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 22 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 23 23 24 24 end … … 70 70 undoplots(prevplot); 71 71 for i=1:numprofiles 72 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...73 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));72 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 73 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 74 74 if length(A(i).x)==1 75 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...76 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker','o');75 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 76 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker','o'); 77 77 end 78 78 end -
issm/trunk/src/m/utils/Exp/manipulation/removeprofile.m
r3018 r5088 34 34 %back to regular color 35 35 plot(A(profsel).x,A(profsel).y,... 36 'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'));36 'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth')); 37 37 else 38 38 %add the profile to the list to be removed … … 40 40 %in selectioncolor 41 41 plot(A(profsel).x,A(profsel).y,... 42 'color',getfieldvalue err(options,'selectioncolor'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'));42 'color',getfieldvalue(options,'selectioncolor'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth')); 43 43 end 44 44 else -
issm/trunk/src/m/utils/Exp/manipulation/removeseveralpoints.m
r3018 r5088 22 22 %plot squares 23 23 for i=1:numprofiles 24 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...25 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));24 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 25 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 26 26 end 27 27 … … 59 59 points(end+1)=indsel; 60 60 plot(A(profsel).x,A(profsel).y,... 61 'color',getfieldvalue err(options,'selectioncolor'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'));61 'color',getfieldvalue(options,'selectioncolor'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth')); 62 62 text(A(selection).x(indsel),A(selection).y(indsel),num2str(1),'FontSize',14,'background',[0.7 0.7 0.9]); 63 63 end … … 115 115 undoplots(prevplot); 116 116 for i=1:numprofiles 117 plot(A(i).x,A(i).y,'color',getfieldvalue err(options,'color'),'LineStyle',getfieldvalueerr(options,'LineStyle'),'LineWidth',getfieldvalueerr(options,'LineWidth'),...118 'MarkerEdgeColor',getfieldvalue err(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalueerr(options,'MarkerSize'),'Marker',getfieldvalueerr(options,'Marker'));117 plot(A(i).x,A(i).y,'color',getfieldvalue(options,'color'),'LineStyle',getfieldvalue(options,'LineStyle'),'LineWidth',getfieldvalue(options,'LineWidth'),... 118 'MarkerEdgeColor',getfieldvalue(options,'MarkerEdgeColor'),'MarkerSize',getfieldvalue(options,'MarkerSize'),'Marker',getfieldvalue(options,'Marker')); 119 119 end 120 120 points=[];
Note:
See TracChangeset
for help on using the changeset viewer.