Changeset 364 for trunk/src/civ.m

Timestamp:

Jan 10, 2012, 5:06:30 PM (12 years ago)

Author:

sommeria

Message:

civ2, fix2, patch2 introduced under Matlab (no interpolation and rotation done yet)
small corrections in plot_field and read_civdata

File:

• trunk/src/civ.m (modified) (7 diffs)

trunk/src/civ.m

@@ -257 +257 @@
 % set(handles.thresh_text1,'Visible','off')
 set(handles.num_MaxDiff,'Visible','off')
+set(handles.num_Nx,'Visible','on')
+set(handles.num_Ny,'Visible','on')
+set(handles.title_Nx,'Visible','on')
+set(handles.title_Ny,'Visible','on')
 set(handles.title_MaxDiff,'Visible','off')
 set(handles.num_Rho,'Style','edit')
@@ -272 +276 @@
 set(handles.num_MaxDiff,'Visible','on')
 set(handles.title_MaxDiff,'Visible','on')
-
-% end
+set(handles.num_Nx,'Visible','off')
+set(handles.num_Ny,'Visible','off')
+set(handles.title_Nx,'Visible','off')
+set(handles.title_Ny,'Visible','off')
 set(handles.num_Rho,'Style','popupmenu')
 set(handles.num_Rho,'Value',1)
@@ -346 +352 @@
     if strcmp(Data.Conventions,'uvmat/civdata')% case of new civ data,
         set(handles.MenuMatlab,'checked','on') %select civ/Matlab by default
-        set(handles.MenuCivX,'checked','off')
+        MenuMatlab_Callback([],[], handles)
         if ~isempty(Data.CivStage)%test for civ files
             ind_opening=Data.CivStage;
@@ -356 +362 @@
         end
     elseif ~isempty(Data.absolut_time_T0')% case of  civx data,
-        set(handles.MenuMatlab,'checked','off') %select Cix by default
-        set(handles.MenuCivX,'checked','on')
+        set(handles.MenuCivX,'checked','on') %select Cix by default
+        MenuCivX_Callback([],[], handles)
         if ~isempty(Data.fix2)
             ind_opening=5;
@@ -575 +581 @@
     set(handles.(ListOptions{index}),'value',0)
 end
-for index = ind_opening+1
-    set(handles.(ListOptions{index}),'value',1)
-end
+set(handles.(ListOptions{min(ind_opening+1,6)}),'value',1)
+
 update_CivOptions(handles,1)
 
@@ -1144 +1149 @@
 [filecell,i1_civ1,i2_civ1,j1_civ1,j2_civ1,i1_civ2,i2_civ2,j1_civ2,j2_civ2,nom_type_nc,xx,yy,compare]=...
     set_civ_filenames(handles,ref_i,ref_j,box_test);
+
 Rootbat=fileparts(filecell.nc.civ1{1,1});%output netcdf file (without extention)
 set(handles.civ,'UserData',filecell);%store for futur use of status callback
@@ -2248 +2254 @@
                     if checkbox(4)==0 ; %check the existence of civ2 if it is not calculated
                         Data=nc2struct(filename,'ListGlobalAttribute','CivStage','civ2');
-                        if ~isempty(Data.CivStage) && Data.CivStage<4 %test for civ files
+                        if isfield(Data,'Txt')
+                            msgbox_uvmat('ERROR',Data.Txt); 
+                            return
+                        elseif ~isempty(Data.CivStage)% case of new civ files
+                            if Data.CivStage<4 %test for civ files
                             msgbox_uvmat('ERROR',['no civ2 data in ' filename])
                             filecell=[];
                             return
+                            end
                         elseif isempty(Data.civ2)||isequal(Data.civ2,0)
                             msgbox_uvmat('ERROR',['no civ2 data in ' filename])