Changeset 754 for trunk/src

Timestamp:

Apr 27, 2014, 11:18:06 PM (11 years ago)

Author:

sommeria

Message:

 

Location:

trunk/src

Files:

• get_field.m (modified) (5 diffs)
• get_file_series.m (modified) (1 diff)

trunk/src/get_field.m

@@ -988 +988 @@
 Field=get(handles.get_field,'UserData');
 index=get(handles.SwitchVarIndexTime,'Value');
+MenuIndex=get(handles.TimeName,'Value');
+string=get(handles.TimeName,'String');
+TimeName=string{MenuIndex};
 switch index
     case 1
@@ -994 +997 @@
     case 2
         set(handles.num_TimeDimension,'String','')
-        attr_index=strcmpi(TimeUnit,Field.ListGlobalAttribute);
+        attr_index=find(strcmpi([TimeName 'Unit'],Field.ListGlobalAttribute));% look for time unit
         if ~isempty(attr_index)
             AttrName=Field.ListGlobalAttribute{attr_index};
@@ -1000 +1003 @@
         end
     case {3 ,4}
-        MenuIndex=get(handles.TimeName,'Value');
-        string=get(handles.TimeName,'String');
         if index==3  % TimeName is used to chose a variable
-            VarName=string{MenuIndex};
-            VarIndex=name2index(VarName,Field.ListVarName);
+            VarIndex=name2index(TimeName,Field.ListVarName);
             DimName=Field.VarDimName{VarIndex};
             DimIndex=name2index(DimName,Field.ListDimName);
@@ -1014 +1014 @@
             end
             set(handles.TimeUnit,'String',unit)
-            update_field(handles,VarName)
+            update_field(handles,TimeName)
         elseif index==4% TimeName is used to chose a dimension
             DimName=string{MenuIndex};
@@ -1021 +1021 @@
             set(handles.num_TimeDimension,'String',num2str(DimValue))
             set(handles.TimeUnit,'String','index')
-            
         end
 end

trunk/src/get_file_series.m

@@ -23 +23 @@
 %ref_j=[];
 first_j=[];last_j=[];incr_j=1;%default
-if isfield(Param.IndexRange,'first_j')
+if isfield(Param.IndexRange,'first_j')&& isfield(Param.IndexRange,'last_j')
     first_j=Param.IndexRange.first_j;
+    last_j=Param.IndexRange.last_j;
+end
+if isfield(Param.IndexRange,'incr_j')
     incr_j=Param.IndexRange.incr_j;
-    last_j=Param.IndexRange.last_j;
 end