Changeset 380 for trunk/src/uvmat.m

Timestamp:

Jan 29, 2012, 2:31:56 PM (12 years ago)

Author:

sommeria

Message:

reading of civ data, new format, improved: bugs for reading u and v repairedd

File:

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

trunk/src/uvmat.m

@@ -2103 +2103 @@
     set(handles.VelType_1,'Visible','on')
     set(handles.FixVelType,'Visible','on')
-    menu=set_veltype_display(ParamOut.CivStage);
+    menu=set_veltype_display(ParamOut.CivStage,FileType);
     index_menu=strcmp(ParamOut.VelType,menu);%look for VelType in  the menu
     index_val=find(index_menu,1);
@@ -2193 +2193 @@
     end
 end
-
-% menu_transform=get(handles.transform_fct,'String');
 choice_value=get(handles.transform_fct,'Value');
 transform_list=get(handles.transform_fct,'UserData');
@@ -2807 +2805 @@
         set(handles.VelType_1,'Visible','off')
     end
-%     set_veltype_display([handles.VelType_1 handles.interp1_1 handles.filter1_1 ...
-%             handles.civ2_1 handles.interp2_1 handles.filter2_1],0)
     if isfield(UvData,'XmlData_1')
         UvData=rmfield(UvData,'XmlData_1');
@@ -3056 +3052 @@
 %------------------------------------------------------------------------
 % --- set the visibility of relevant velocity type menus: 
-function menu=set_veltype_display(Civ)
+function menu=set_veltype_display(Civ,FileType)
 %------------------------------------------------------------------------
 if isequal(Civ,0)
@@ -3069 +3065 @@
     imax=6;
 end
+if ~exist('FileType','var')
+    FileType='civx';
+end
+switch FileType
+    case 'civx'
 menu={'civ1';'interp1';'filter1';'civ2';'interp2';'filter2'};
+    case 'civdata'
+    menu={'civ1';'civ-filter1';'filter1';'civ2';'civ-filter2';'filter2'};   
+end
 menu=menu(1:imax);