Changeset 1050 for trunk/src

Timestamp:

Jun 11, 2018, 9:17:44 PM (7 years ago)

Author:

sommeria

Message:

uigetfile repaired

Location:

trunk/src

Files:

• find_file_series.m (modified) (1 diff)
• get_field.m (modified) (4 diffs)
• read_civdata.m (modified) (2 diffs)
• uigetfile_uvmat.m (modified) (1 diff)

trunk/src/find_file_series.m

@@ -245 +245 @@
             %% update the file type if the input file does not exist (pb of 0001)
             if isempty(FileInfo.FileType)
-                [FileInfo,MovieObject]=get_file_info(fullfile(FilePath,ListFiles(ifile_min)));
+                [FileInfo,MovieObject]=get_file_info(fullfile(FilePath,ListFiles{ifile_min}));
             end
         end

trunk/src/get_field.m

@@ -640 +640 @@
 else % no input variable, the variable ScalarName is selected from the menu
     scalar_index=get(handles.scalar,'Value');
-        ScalarName=scalar_menu{scalar_index};
+    ScalarName=scalar_menu{scalar_index};
 end
 
@@ -647 +647 @@
 test_coord=zeros(size(Field.Display.VarDimName)); %=1 when variable #ilist is eligible as structured coordiante
 dim_var=Field.Display.VarDimName{scalar_index};%list of dimensions of the selected variable
-%if ~get(handles.CheckDimensionX,'Value')  
-    %look for coordinate variables among the other variables
-    for ilist=1:numel(Field.Display.VarDimName)
-        dimnames=Field.Display.VarDimName{ilist}; %list of dimensions for variable #ilist
-        if isequal(dimnames,dim_var)
-            test_component(ilist)=1;% the listed variable has the same dimension as the selected scalar-> possibly chosen as unstructured coordinate
-        elseif numel(dimnames)==1 && ~isempty(find(strcmp(dimnames{1},dim_var), 1))%variable ilist is a 1D array which can be coordinate variable
-            test_coord(ilist)=1;
-        end
-    end
+%if ~get(handles.CheckDimensionX,'Value')
+%look for coordinate variables among the other variables
+for ilist=1:numel(Field.Display.VarDimName)
+    dimnames=Field.Display.VarDimName{ilist}; %list of dimensions for variable #ilist
+    if isequal(dimnames,dim_var)
+        test_component(ilist)=1;% the listed variable has the same dimension as the selected scalar-> possibly chosen as unstructured coordinate
+    elseif numel(dimnames)==1 && ~isempty(find(strcmp(dimnames{1},dim_var), 1))%variable ilist is a 1D array which can be coordinate variable
+        test_coord(ilist)=1;
+    end
+end
 %end
 var_component=find(test_component);% list of variable indices elligible as unstructured coordinates
@@ -687 +687 @@
         elseif strcmp(Role,'coord_z')
             coord_val(3)=ilist;
-            Check3D=1;
-        end
-    end
-end
-if numel(find(coord_val))<2
+        end
+    end
+end
+if numel(find(coord_val))<2 % no predefiend components
     if numel(var_coord)>=3
-         coord_val=[3 2 1];
-    elseif numel(var_coord)>=2
-       % coord_val=[numel(var_component)+2 numel(var_component)+1];
-       coord_val=[2 1];
-    else
-        coord_val=[1 2];
-    end
-end
-% if  get(handles.CheckDimensionX,'Value')
-%     set(handles.Coord_x,'Value',2)
-%     set(handles.Coord_x,'String',dim_var')
-% else
-    set(handles.Coord_x,'Value',coord_val(1))
-    set(handles.Coord_x,'String',ListCoord)
-% end
-% if  get(handles.CheckDimensionX,'Value')
-%     set(handles.Coord_y,'Value',1)
-%     set(handles.Coord_y,'String',dim_var')
-% else
-    set(handles.Coord_y,'Value',coord_val(2))
-    set(handles.Coord_y,'String',ListCoord)
-% end
-% if  get(handles.CheckDimensionX,'Value')
-%     set(handles.Coord_z,'Value',1)
-%     set(handles.Coord_z,'String',dim_var')
-% else
-if numel(test_coord)>=3
-    set(handles.Coord_z,'Value',coord_val(2))
+        coord_val(3)=3;
+    end
+    coord_val([1 2])=[1 2];
+end
+set(handles.Coord_x,'Value',coord_val(1))
+set(handles.Coord_x,'String',ListCoord)
+
+set(handles.Coord_y,'Value',coord_val(2))
+set(handles.Coord_y,'String',ListCoord)
+
+if numel(coord_val)>=3
+    set(handles.Coord_z,'Value',coord_val(3))
     set(handles.Coord_z,'String',ListCoord)
     set(handles.Coord_z,'Visible','on')
@@ -746 +729 @@
         set(handles.TimeName,'Value',1)
         set(handles.TimeName,'String',ListTime)
-end  
+end
 if ~ischar(VarName)
-update_field(handles,ScalarName)
+    update_field(handles,ScalarName)
 end
 

trunk/src/read_civdata.m

@@ -96 +96 @@
 
 %% reading data
-Data=nc2struct(FileName,'ListGlobalAttribute','CivStage');
-if isfield(Data,'Txt')
-     errormsg=['error in read_civdata: ' Data.Txt];
+[Data,tild,tild,errormsg]=nc2struct(FileName,'ListGlobalAttribute','CivStage');
+if ~isempty(errormsg)
+     errormsg=['read_civdata: ' errormsg];
     return
 end
@@ -104 +104 @@
 [varlist,role,VelTypeOut]=varcivx_generator(ProjModeRequest,VelType,Data.CivStage);
 if isempty(varlist)
-    errormsg=['error in read_civdata: unknow velocity type ' VelType];
+    errormsg=['read_civdata: unknow velocity type ' VelType];
     return
 else

trunk/src/uigetfile_uvmat.m

@@ -197 +197 @@
 end
 set(hObject,'backgroundColor',[0 1 0])% indicate end button activatio
+fig_struct=get(hObject,'parent');
+if isstruct(fig_struct);%recent Matlab
+uiresume(fig_struct.Number)
+else
+   uiresume(fig_struct) 
+end
 
 %------------------------------------------------------------------------