Changeset 404 for trunk/src/read_field.m

Timestamp:

Apr 30, 2012, 6:46:45 PM (11 years ago)

Author:

sommeria

Message:

various bugs corrected. nc2struct_toolbox suppressed (correspond to obsolete versions of Matlab)

File:

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

trunk/src/read_field.m

@@ -50 +50 @@
             GUIName=ParamIn.GUIName;
         end
-        test_civx=0;
+        CivStage=0;
         if ~strcmp(ParamIn.FieldName,'get_field...')% if get_field is not requested, look for Civx data
             FieldList=calc_field;%list of possible fields for Civx data
@@ -63 +63 @@
                     InputField=[{ParamOut.FieldName} {ParamOut.ColorVar}];
                     [Field,ParamOut.VelType,errormsg]=read_civdata(ObjectName,InputField,ParamIn.VelType,Data.CivStage);
-                    test_civx=Field.CivStage;
+                    CivStage=Field.CivStage;
                     %case of old civx conventions
                 elseif ~isempty(Data.absolut_time_T0)&& ~isequal(Data.civ,0)
@@ -70 +70 @@
                     InputField=[{ParamOut.FieldName} {ParamOut.ColorVar}];
                     [Field,ParamOut.VelType]=read_civxdata(ObjectName,InputField,ParamIn.VelType);
-                    test_civx=Field.CivStage;
+                    CivStage=Field.CivStage;
                     ParamOut.CivStage=Field.CivStage;
                     % not cvix file, fields will be chosen through the GUI get_field
@@ -90 +90 @@
                     return
                 end
-                test_civx=Field.CivStage;
+                CivStage=Field.CivStage;
                 ParamOut.CivStage=Field.CivStage;
             end
         end
-        if ~test_civx% read the field names on the interface get_field.
+        ParamOut.FieldList=[{'image'};FieldList;{'get_field...'}];
+        if CivStage==0% read the field names on the interface get_field.
             hget_field=findobj(allchild(0),'Name',GUIName);%find the get_field... GUI
             if isempty(hget_field)% open the GUI get_field if it is not found
@@ -140 +141 @@
                 ParamOut.TimeValue=Field.TimeValue;
             end
-        end
-        if test_civx
-            ParamOut.FieldList=[{'image'};FieldList;{'get_field...'}];
-        else
             ParamOut.FieldList={'get_field...'};
         end
-        
+%         if CivStage~=0
+%             ParamOut.FieldList=[{'image'};FieldList;{'get_field...'}];
+%         else
+% %             ParamOut.FieldList={'get_field...'};
+%         end    
     case 'video'
         try