Changeset 236 for trunk/src/read_field.m

Timestamp:

Apr 12, 2011, 12:12:19 AM (12 years ago)

Author:

sommeria

Message:

correct Matlab PIV, remove call to image tool box. Improve menu of uvmat VelType? (replacement of buttons)

File:

• trunk/src/read_field.m (modified) (3 diffs)

trunk/src/read_field.m

@@ -36 +36 @@
 if strcmp(FileType,'netcdf')  %read the first nc field
     ParamOut.FieldName=ParamIn.FieldName;
-    GUIName='get_field'; %default name of the GUI getç_field
+    GUIName='get_field'; %default name of the GUI get_field
     if isfield(ParamIn,'GUIName')
         GUIName=ParamIn.GUIName;
@@ -44 +44 @@
         FieldList=calc_field;%list of possible fields for Civx data
         ParamOut.ColorVar='';%default
-        field_index=strcmp(ParamOut.FieldName,FieldList);%look for ParamOut.FieldName in the list
-        if isempty(find(field_index,1))% ParamOut.FieldName is not in the list, check whether Civx data exist
-            Data=nc2struct(ObjectName,'ListGlobalAttribute','absolut_time_T0','civ');
-            if ~isempty(Data.absolut_time_T0)&& ~isequal(Data.civ,0)
+        field_index=strcmp(ParamIn.FieldName,FieldList);%look for ParamIn.FieldName in the list of possible fields for Civx data
+        if isempty(find(field_index,1))% ParamIn.FieldName is not in the list, check whether Civx data exist
+            Data=nc2struct(ObjectName,'ListGlobalAttribute','Conventions','absolut_time_T0','civ');
+            if isequal(Data.Conventions,'uvmat/civdata')
+                ParamOut.FieldName='velocity';%Civx data found, set .FieldName='velocity' by default
+                ParamOut.ColorVar='ima_cor';
+                InputField=[{ParamOut.FieldName} {ParamOut.ColorVar}];
+                [Field,ParamOut.VelType]=read_civdata(ObjectName,InputField,ParamIn.VelType);
+                test_civx=Field.CivStage;
+            elseif ~isempty(Data.absolut_time_T0)&& ~isequal(Data.civ,0)
                 ParamOut.FieldName='velocity';%Civx data found, set .FieldName='velocity' by default
                 ParamOut.ColorVar='ima_cor';
@@ -67 +73 @@
                 InputField=[InputField {ParamOut.ColorVar}];
             end
-            [Field,ParamOut.VelType]=read_civxdata(ObjectName,InputField,ParamIn.VelType);
+            [Field,ParamOut.VelType,errormsg]=read_civxdata(ObjectName,InputField,ParamIn.VelType);
+            if ~isempty(errormsg)
+                return
+            end
             test_civx=Field.CivStage;
             ParamOut.CivStage=Field.CivStage;