Changeset 962 for trunk

Timestamp:

Jun 28, 2016, 1:05:08 PM (8 years ago)

Author:

sommeria

Message:

level introduced

File:

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

trunk/src/uvmat.m

@@ -442 +442 @@
 
 %------------------------------------------------------------------------
-% --- Executes on the menu Open/Browse...
+% --- Executes on the menu Open/Browse...fill_GUI
 % search the files, recognize their type according to their name and fill the rootfile input windows
 function MenuBrowse_Callback(hObject, eventdata, handles)
@@ -452 +452 @@
 fileinput=uigetfile_uvmat('pick an input file',oldfile);
 hh=dir(fileinput);
-if numel(hh)>1
+if numel(hh)>1fill_GUI
     msgbox_uvmat('ERROR','invalid input, probably a broken link');
 else
@@ -465 +465 @@
 
 % -----------------------------------------------------------------------
-% --- Open again the file whose name has been recorded in MenuFile_1
+% --- Open again the file whose name has been recorded in MenuFile
 function MenuFile_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
@@ -1695 +1695 @@
 j1=str2num(get(handles.j1,'String'));
 j2=str2num(get(handles.j2,'String'));
+NomType=get(hObject,'String');
+if strcmp(NomType,'level')
+    FileIndex=str2num(get(handles.i1,'String'));
+else
 FileIndex=fullfile_uvmat('','','','',get(handles.NomType,'String'),i1,i2,j1,j2);
+end
 set(handles.FileIndex,'String',FileIndex)
 % refresh the current settings and refresh the field view
@@ -1708 +1713 @@
 j1=str2num(get(handles.j1,'String'));
 j2=str2num(get(handles.j2,'String'));
+NomType=get(hObject,'String');
+if strcmp(NomType,'level')
+    FileIndex=str2num(get(handles.i1,'String'));
+else
 FileIndex=fullfile_uvmat('','','','',get(handles.NomType_1,'String'),i1,i2,j1,j2);
+end
 set(handles.FileIndex_1,'String',FileIndex)
 % inputfilerefresh the current settings and inputfilerefresh the field view
@@ -1858 +1868 @@
     otherwise
         set(handles_RootPath,'String',RootPath);
-        rootname=fullfile(RootPath,SubDir,RootFile);
         set(handles_SubDir,'String',['/' SubDir]);
         set(handles_RootFile,'String',['/' RootFile]); %display the separator
-        indices=fileinput(length(rootname)+1:end);
-        indices(end-length(FileExt)+1:end)=[]; %remove extension
-        set(handles_FileIndex,'String',indices);
+        if strcmp(NomType,'level')
+            rootname=fullfile(RootPath,SubDir,'level');
+            rr=regexp(fileinput,['^' rootname '(?<j>\d+)/' RootFile '(?<i>\d+)' FileExt '$'],'names');
+            if ~isempty(rr)
+                set(handles_FileIndex,'String',rr.i);
+            end
+        else
+            rootname=fullfile(RootPath,SubDir,RootFile);
+            indices=fileinput(length(rootname)+1:end);
+            indices(end-length(FileExt)+1:end)=[]; %remove extension
+            set(handles_FileIndex,'String',indices);
+        end
         set(handles_NomType,'String',NomType);
         set(handles_FileExt,'String',FileExt);
@@ -2045 +2063 @@
         if isfield(XmlDataRead,'TimeUnit')&& ~isempty(XmlDataRead.TimeUnit)
             TimeUnit=XmlDataRead.TimeUnit;
-        end    
+        end
         if isfield(XmlDataRead,'Time')&& ~isempty(XmlDataRead.Time)
             XmlData.Time=XmlDataRead.Time;
-             if XmlDataRead.Time(1,:)==XmlDataRead.Time(2,:)% case starting with index 1
-            sizDti=size(XmlDataRead.Time,1)-1;%size of the time vector explicitly defined in the xml file
-            ind_start=1;
-        else
-            sizDti=size(XmlDataRead.Time,1);% case starting with index 0
-            ind_start=0;
-        end
+            if XmlDataRead.Time(1,:)==XmlDataRead.Time(2,:)% case starting with index 1
+                sizDti=size(XmlDataRead.Time,1)-1;%size of the time vector explicitly defined in the xml file
+                ind_start=1;
+            else
+                sizDti=size(XmlDataRead.Time,1);% case starting with index 0
+                ind_start=0;
+            end
             % complement the input if the whole time series is not defined
-%             if size(i1_series,3)>size(XmlDataRead.Time,1)-ind_start %only the first time interval is defined, extrapolate to the whole series            
-%                 Dti_total=XmlDataRead.Time(end)-XmlDataRead.Time(1);%total time interval covered by the time vector
-%                 missing_indices=sizDti+1+ind_start:size(i1_series,3)+1;% remaining set of frame indices for which time needs to be found
-%                 repeat_nbre=1+floor((missing_indices-sizDti-ind_start)/(sizDti-1));% number of repetitions of Dti
-%                 time_indices=1+mod(missing_indices-sizDti-1,sizDti-1);
-%                 for j=1:size(XmlDataRead.Time,2)
-%                     XmlData.Time(missing_indices,j)=XmlDataRead.Time(time_indices,j)+repeat_nbre'*Dti_total;
-%                 end
-%                 % update the xml file with NbDti
-%                 t=xmltree(XmlFileName);
-%                 uid_NbDti=find(t,'ImaDoc/Camera/BurstTiming/NbDti')
-%                 if isempty(uid_NbDti)
-%                     uid_BurstTiming=find(t,'ImaDoc/Camera/BurstTiming')
-%                     [t,uid_NbDti]=add(t,uid_BurstTiming,'element','NbDti');
-%                 end
-%                 [t,uid_NbDti]=add(t,uid_NbDti,'chardata',num2str(repeat_nbre(end)-1));
-%                 save(t,XmlFileName)
-%             end
+            %             if size(i1_series,3)>size(XmlDataRead.Time,1)-ind_start %only the first time interval is defined, extrapolate to the whole series
+            %                 Dti_total=XmlDataRead.Time(end)-XmlDataRead.Time(1);%total time interval covered by the time vector
+            %                 missing_indices=sizDti+1+ind_start:size(i1_series,3)+1;% remaining set of frame indices for which time needs to be found
+            %                 repeat_nbre=1+floor((missing_indices-sizDti-ind_start)/(sizDti-1));% number of repetitions of Dti
+            %                 time_indices=1+mod(missing_indices-sizDti-1,sizDti-1);
+            %                 for j=1:size(XmlDataRead.Time,2)
+            %                     XmlData.Time(missing_indices,j)=XmlDataRead.Time(time_indices,j)+repeat_nbre'*Dti_total;
+            %                 end
+            %                 % update the xml file with NbDti
+            %                 t=xmltree(XmlFileName);
+            %                 uid_NbDti=find(t,'ImaDoc/Camera/BurstTiming/NbDti')
+            %                 if isempty(uid_NbDti)
+            %                     uid_BurstTiming=find(t,'ImaDoc/Camera/BurstTiming')
+            %                     [t,uid_NbDti]=add(t,uid_BurstTiming,'element','NbDti');
+            %                 end
+            %                 [t,uid_NbDti]=add(t,uid_NbDti,'chardata',num2str(repeat_nbre(end)-1));
+            %                 save(t,XmlFileName)
+            %             end
         end
         set(handles.view_xml,'BackgroundColor',[1 1 1])% paint back to white
@@ -2354 +2372 @@
     
 NomType=get(handles.NomType,'String');
-indices=get(handles.FileIndex,'String');
+
 if strcmp(NomType,'level')
     indices=get(handles.i1,'String');
 else
+    indices=get(handles.FileIndex,'String');
     [tild,tild,tild,i1,i2,j1,j2]=fileparts_uvmat(indices);% the indices for the second series taken from FileIndex
     switch index_rank