Changeset 408 for trunk/src/proj_field.m

Timestamp:

May 5, 2012, 6:34:46 PM (12 years ago)

Author:

sommeria

Message:

various bugs corrected in series and uvmat.

File:

• trunk/src/proj_field.m (modified) (4 diffs)

trunk/src/proj_field.m

@@ -82 +82 @@
 function [ProjData,errormsg]=proj_field(FieldData,ObjectData)
 errormsg='';%default
-% if ~exist('FieldName','var')
-%     FieldName='';
-% end
+ProjData=[];
+
 %% case of no projection (object is used only as graph display)
 if isfield(ObjectData,'ProjMode') && (isequal(ObjectData.ProjMode,'none')||isequal(ObjectData.ProjMode,'mask_inside')||isequal(ObjectData.ProjMode,'mask_outside'))
-    ProjData=[];
     return
 end
 
+%% check coincidence of coordinate units
+if isfield(FieldData,'CoordUnit') && isfield(ObjectData,'CoordUnit')&&~strcmp(FieldData.CoordUnit,ObjectData.CoordUnit)
+    errormsg='inconsistent coord units for field and projection object';
+    return
+end
+    
 %% in the absence of object Type or projection mode, or object coordinaes, the input field is just tranfered without change
 if ~isfield(ObjectData,'Type')||~isfield(ObjectData,'ProjMode')
@@ -1091 +1095 @@
             if testbound
                 indcut=find(testin);
+                if isempty(indcut)
+                    errormsg='data outside the bounds of the projection object';
+                    return
+                end
                 for ivar=VarIndex
                     VarName=FieldData.ListVarName{ivar};
@@ -1105 +1113 @@
         switch ObjectData.ProjMode
             case 'projection'
-                %the list of dimension
-                %ProjData.ListDimName=[ProjData.ListDimName FieldData.VarDimName(VarIndex(1))];%add the point index to the list of dimensions
-                %ProjData.DimValue=[ProjData.
-                %length(coord_X)];
-                
                 for ivar=VarIndex %transfer variables to the projection plane
                     VarName=FieldData.ListVarName{ivar};
@@ -1147 +1150 @@
                 if ~isequal(ivar_FF,0)
                     VarName_FF=FieldData.ListVarName{ivar_FF};
-                    eval(['indsel=find(FieldData.' VarName_FF '==0);'])
+                    indsel=find(FieldData.(VarName_FF)==0);
                     coord_X=coord_X(indsel);
                     coord_Y=coord_Y(indsel);