Changeset 520 for trunk/src

Timestamp:

Aug 18, 2012, 12:51:28 AM (12 years ago)

Author:

sommeria

Message:

new bugs corrected

Location:

trunk/src

Files:

• read_field.m (modified) (2 diffs)
• sub_field.m (modified) (1 diff)
• uvmat.m (modified) (2 diffs)

trunk/src/read_field.m

@@ -45 +45 @@
 %             ParamOut.FieldName='velocity';%Civx data found, set .FieldName='velocity' by default
 %                         ParamOut.ColorVar='ima_cor';
+                        if isfield(ParamIn,'ColorVar')
                         InputField=[{ParamIn.FieldName} {ParamIn.ColorVar}];
+                        else
+                           InputField= {ParamIn.FieldName};
+                        end
                         [Field,ParamOut.VelType,errormsg]=read_civdata(FileName,InputField,ParamIn.VelType);
                         if ~isempty(errormsg),errormsg=['read_civdata:' errormsg];return,end
@@ -51 +55 @@
          case 'civx'
             ParamOut.FieldName='velocity';%Civx data found, set .FieldName='velocity' by default
-                        ParamOut.ColorVar='ima_cor';
-                        InputField=[{ParamOut.FieldName} {ParamOut.ColorVar}];
+                       % ParamOut.ColorVar='ima_cor';
+                       if isfield(ParamIn,'ColorVar')
+                        InputField=[{ParamIn.FieldName} {ParamIn.ColorVar}];
+                        else
+                           InputField= {ParamIn.FieldName};
+                        end
                         [Field,ParamOut.VelType]=read_civxdata(FileName,InputField,ParamIn.VelType);
                         if ~isempty(errormsg),errormsg=['read_civxdata:' errormsg];return,end

trunk/src/sub_field.m

@@ -178 +178 @@
 SubData.VarDimName(find(ind_remove))=[];
 SubData.VarAttribute(find(ind_remove))=[];
+
+function OutputCell=regexprep_r(InputCell,dimname,dimname_new)
+for icell=1:numel(InputCell)
+    OutputCell{icell}=regexprep(InputCell{icell},['^' dimname '$'],dimname_new);
+end
         
     

trunk/src/uvmat.m

@@ -2122 +2122 @@
         case {'civx','civdata','netcdf'};
             list_fields=get(handles.Fields_1,'String');% list menu fields
+            if ischar(list_fields),list_fields={list_fields};end
             FieldName_1= list_fields{get(handles.Fields_1,'Value')}; % selected field
             if ~strcmp(FieldName,'get_field...')
@@ -4865 +4866 @@
 end
 param.list_fields=get(handles.Fields,'String');% list menu fields
-param.list_fields(1)=[]; %suppress  'image' option 
-param.index_fields=get(handles.Fields,'Value');% selected string index
-if param.index_fields>1
-    param.index_fields=param.index_fields-1;
-end
+FieldName=param.list_fields{get(handles.Fields,'Value')};
+ind_image=find(strcmp('image',param.list_fields));
+if ~isempty(ind_image) && numel(param.list_fields)>1
+param.list_fields(ind_image)=[]; %suppress  'image' option 
+end
+param.index_fields=find(strcmp(FieldName,param.list_fields));% selected string index
+% if param.index_fields>1
+%     param.index_fields=param.index_fields-1;
+% end
 param.list_fields_1=get(handles.Fields_1,'String');% list menu fields
-param.list_fields_1(1)=[]; %suppress  'image' option
-param.index_fields_1=get(handles.Fields_1,'Value')-1;% selected string index
-if param.index_fields_1>1
-    param.index_fields_1=param.index_fields_1-1;
-end
+if ischar(param.list_fields_1),param.list_fields_1={param.list_fields_1};end
+FieldName_1=param.list_fields_1{get(handles.Fields_1,'Value')};
+ind_image=find(strcmp('image',param.list_fields_1));
+if ~isempty(ind_image) && numel(param.list_fields_1)>1
+param.list_fields_1(ind_image)=[]; %suppress  'image' option 
+end
+param.index_fields_1=find(strcmp(FieldName_1,param.list_fields_1));% selected string index
+%param.index_fields=find(strcmp(FieldName,param.list_fields));% selected string index
+% param.index_fields_1=get(handles.Fields_1,'Value')-1;% selected string index
+% if param.index_fields_1>1
+%     param.index_fields_1=param.index_fields_1-1;
+% end
 param.menu_coord_str=get(handles.transform_fct,'String');
 param.menu_coord_val=get(handles.transform_fct,'Value');