Changeset 520 for trunk/src/uvmat.m

Timestamp:

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

Author:

sommeria

Message:

new bugs corrected

File:

• trunk/src/uvmat.m (modified) (2 diffs)

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');