Changeset 1197 for trunk/src/series.m

Timestamp:

Mar 11, 2026, 5:31:25 PM (3 days ago)

Author:

sommeria

Message:

bugs repaired

File:

• trunk/src/series.m (modified) (4 diffs)

trunk/src/series.m

@@ -3067 +3067 @@
                     TimeTable{LineIndex,5}=get_time(Param.IndexRange.MaxIndex_i(LineIndex),MaxIndex_j,PairString,InputTable,SeriesData.FileInfo{LineIndex},GetFieldData.Time.TimeName);  % Max time
                 case 'variable'
-                    set(handles.TimeName,'String',['var:' GetFieldData.Time.TimeName])
-                    set(handles.NomType,'String','*')
-                    set(handles.RootFile,'String',[get(handles.RootFile,'String') get(handles.FileIndex,'String')])% A VERIFIER !!!!!!
-                    set(handles.FileIndex,'String','')
+                    TimeName=['var:' GetFieldData.Time.TimeName];
+                   % set(handles.TimeName,'String',['var:' GetFieldData.Time.TimeName])
+%                     set(handles.NomType,'String','*')
+%                     set(handles.RootFile,'String',[get(handles.RootFile,'String') get(handles.FileIndex,'String')])% A VERIFIER !!!!!!
+%                     set(handles.FileIndex,'String','')
                     ParamIn.TimeVarName=GetFieldData.Time.TimeName;
                 case 'matrix_index'
@@ -3361 +3362 @@
 %------------------------------------------------------------------------
 function CheckMask_Callback(hObject, eventdata, handles)
-
+% SeriesData=get(handles.series,'UserData');
 
 if get(handles.CheckMask,'Value')
+    
     set(handles.DeleteMask,'Visible','on')
     Param=read_GUI_series(handles); % displayed parameters
@@ -3379 +3381 @@
     %checkmask=zeros(NbView,1);
     for iview=1:NbView
-        checkmask=0;
+        checkmask=false;
         FirstFileName=fullfile_uvmat(Param.InputTable{iview,1},Param.InputTable{iview,2},Param.InputTable{iview,3},...
             Param.InputTable{iview,5},Param.InputTable{iview,4},i1,i2,j1,j2);
         
-       % [FileInfo,VideoObject]=get_file_info(FirstFileName);
+        [FileInfo,VideoObject]=get_file_info(FirstFileName);
         
         
-%         Data=nc2struct(FirstFileName);
-        if isfield(Data,'Civ2_Mask')
-            if exist(Data.Civ2_Mask,'file')
-            MaskTable{iview,1}=Data.Civ2_Mask;
-            checkmask=1; 
+       %  Data=nc2struct(FirstFileName);
+        if isfield(FileInfo,'MaskFile') && isfield(FileInfo,'MaskExt')
+           if  isfield(FileInfo,'MaskNbSlice')&& exist([FileInfo.MaskFile '_1' FileInfo.MaskExt],'file')
+            MaskTable{iview,1}=[FileInfo.MaskFile '_1' FileInfo.MaskExt];
+            MaskTable{iview,2}=num2str(FileInfo.MaskNbSlice);
+            checkmask=true; 
+           elseif exist([FileInfo.MaskFile FileInfo.MaskExt],'file')
+                 MaskTable{iview,1}=[FileInfo.MaskFile FileInfo.MaskExt];
+                 MaskTable{iview,2}='';
+                  checkmask=true; 
             end
         end
@@ -3410 +3417 @@
     end
     set(handles.MaskTable,'Data',MaskTable)
-    set(handles.CheckMask,'Value',0)
-end
+end
+
 %       
 % if ~isempty(NewMask)