Changeset 150 for trunk/src/proj_field.m

Timestamp:

Dec 3, 2010, 12:16:51 PM (13 years ago)

Author:

sommeria

Message:

various corrections for plotting and using view_field and get_field. The current field of uvmat or view_field is now stored in the structure userdata.axes3. Introduction of live correlation to test PIV (civ1)

File:

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

trunk/src/proj_field.m

@@ -81 +81 @@
 
 function [ProjData,errormsg]=proj_field(FieldData,ObjectData,IndexObj)
-
+errormsg=[];%default
 if isfield(ObjectData,'ProjMode') && (isequal(ObjectData.ProjMode,'none')||isequal(ObjectData.ProjMode,'mask_inside')||isequal(ObjectData.ProjMode,'mask_outside'))
     ProjData=[];
@@ -170 +170 @@
         return
 end
-ProjData=proj_heading(FieldData,ObjectData);
+[ProjData,errormsg]=proj_heading(FieldData,ObjectData);
 ProjData.NbDim=0;
 %ProjData.ListDimName= {'nb_points'};
@@ -373 +373 @@
 function  [ProjData,errormsg]=proj_patch(FieldData,ObjectData)%%
 %-------------------------------------------------------------------
-ProjData=proj_heading(FieldData,ObjectData);
+[ProjData,errormsg]=proj_heading(FieldData,ObjectData);
 
 objectfield=fieldnames(ObjectData);
@@ -560 +560 @@
 function  [ProjData,errormsg] = proj_line(FieldData, ObjectData)
 %-----------------------------------------------------------------
-ProjData=proj_heading(FieldData,ObjectData);%transfer global attributes
+[ProjData,errormsg]=proj_heading(FieldData,ObjectData);%transfer global attributes
+if ~isempty(errormsg)
+    return
+end
 ProjData.NbDim=1;
-
 %initialisation of the input parameters and defaultoutput
 ProjMode='projection';%direct projection on the line by default
@@ -991 +993 @@
 
 % initiate Matlab  structure for physical field
-ProjData=proj_heading(FieldData,ObjectData);
+[ProjData,errormsg]=proj_heading(FieldData,ObjectData);
 ProjData.NbDim=2;
 ProjData.ListVarName={};
@@ -1561 +1563 @@
 
 % initiate Matlab  structure for physical field
-ProjData=proj_heading(FieldData,ObjectData);
+[ProjData,errormsg]=proj_heading(FieldData,ObjectData);
 ProjData.NbDim=3;
 %ProjData.ListDimName={};%name of dimension 
@@ -2064 +2066 @@
 % ProjData=FieldData;
 ProjData=[];%default
+errormsg=[];%default
 if ~isfield(FieldData,'ListGlobalAttribute')
     ProjData.ListGlobalAttribute={};