Changeset 245 for trunk/src/series/relabel_i_j.m

Timestamp:

Apr 20, 2011, 12:52:35 PM (14 years ago)

Author:

sommeria

Message:

relabel_i_j , sub_field_series improved

File:

• trunk/src/series/relabel_i_j.m (modified) (13 diffs)

trunk/src/series/relabel_i_j.m

@@ -1 @@
-
-% relabel_i_j: relabel an image series with two indices, and correct errors from the RDvision transfer program
+%'relabel_i_j': relabel an image series with two indices, and correct errors from the RDvision transfer program
 %----------------------------------------------------------------------
 function GUI_input=relabel_i_j(num_i1,num_i2,num_j1,num_j2,Series)
@@ -26 +25 @@
 end
 basename=fullfile(RootPath{1},RootFile{1}); 
-[XmlData,warntext]=imadoc2struct([basename '.xml']);% read the xml file appended to the present function (containing bug corrections)
+[XmlData,warntext]=imadoc2struct([basename '.xml'])% read the xml file appended to the present function (containing bug corrections)
 if ~isempty(warntext)
     msgbox_uvmat('ERROR',warntext)%error message for xml file reading
@@ -32 +31 @@
 nbfield1=size(XmlData.Time,1);
 nbfield2=size(XmlData.Time,2);
-
 set(hseries.first_i,'String',num2str(first_label))% display the first image in the process
 set(hseries.last_i,'String',num2str(nbfield1*nbfield2-1+first_label))% display the last image in the process
@@ -38 +36 @@
 SeriesData=get(hGUI,'UserData');
 if ~strcmp(SeriesData.NomType,'_000001')
-    msgbox_uvmat('WARNING','the input is not a file from RDvision: this function relabel_i_j has no action')%error message for directory creation
+    msgbox_uvmat('WARNING','the input is not a file from RDvision: this function relabel_i_j has no action');%error message for directory creation
     return
 else
-    msgbox_uvmat('CONFIRMATION','this function will relabel the file series from RDvision and correct the xml file')%error message for directory creation
+    answer=msgbox_uvmat('','this function will relabel the file series from RDvision and correct the xml file');%error message for directory creation
+    if ~strcmp(answer,'Yes')
+        return
+    end
 end
 
@@ -48 +49 @@
     return
 end
-answer=msgbox_uvmat('CONFIRMATION',[num2str(nbfield1) ' bursts containing ' num2str(nbfield2) ' images each']);%error message for directory creation
+if nbfield2>=2
+answer=msgbox_uvmat('',[num2str(nbfield1) ' bursts containing ' num2str(nbfield2) ' images each']);%error message for directory creation
+nomtype='_i_j';
+else
+    answer=msgbox_uvmat('',['image series with ' num2str(nbfield1) ' images']);%error message for directory creation
+    nomtype='_i';
+end
+if ~strcmp(answer,'Yes')
+    return
+end
 
 %% copy and adapt the xml file
@@ -54 +64 @@
     try
     copyfile([basename '.xml'],[basename '.xml~']);% backup the xml file
-    catch
-    errormsg=lasterr
-            msgbox_uvmat('ERROR',errormsg);
+    catch ME
+            msgbox_uvmat('ERROR',ME.message);
             return
     end
@@ -81 +90 @@
     
     %%%% correction RDvision %%%%
+    if isfield(XmlData,'NbDtj')
     uid_NbDtj=find(t,'ImaDoc/Camera/BurstTiming/NbDtj');
     uid_value=children(t,uid_NbDtj);
@@ -86 +96 @@
         t=set(t,uid_value(1),'value',num2str(XmlData.NbDtj));
     end
+    end
+    if isfield(XmlData,'NbDtk')
     uid_NbDtk=find(t,'ImaDoc/Camera/BurstTiming/NbDtk');
     uid_value=children(t,uid_NbDtk);
@@ -91 +103 @@
         t=set(t,uid_value(1),'value',num2str(XmlData.NbDtk));
     end
+    end
+    if strcmp(nomtype,'_i') && isfield(XmlData,'NbDti')
+        uid_NbDti=find(t,'ImaDoc/Camera/BurstTiming/NbDti');
+        uid_value=children(t,uid_NbDti);
+        if ~isempty(uid_value)
+            t=set(t,uid_value(1),'value',num2str(XmlData.NbDti));
+        end
+        uid_NbDtj=find(t,'ImaDoc/Camera/BurstTiming/NbDtj');
+        uid_NbDtk=find(t,'ImaDoc/Camera/BurstTiming/NbDtk');
+        t=delete(t,uid_NbDtj);
+        t=delete(t,uid_NbDtk);
+        uid_Dtj=find(t,'ImaDoc/Camera/BurstTiming/Dtj');
+        uid_Dtk=find(t,'ImaDoc/Camera/BurstTiming/Dtk');
+        t=delete(t,uid_Dtj);
+        t=delete(t,uid_Dtk);    
+    end
     %%%
     
@@ -97 +125 @@
 
 %% main loop
+
 for ifile=1:nbfield1*nbfield2
     update_waitbar(hseries.waitbar,WaitbarPos,ifile/(nbfield1*nbfield2))
@@ -102 +131 @@
     num_j=mod(ifile-1+first_label,nbfield2)+1;
     num_i=floor((ifile-1+first_label)/nbfield2)+1;
-    filename_new=name_generator(basename,num_i,num_j,'.png','_i_j');
+    filename_new=name_generator(basename,num_i,num_j,'.png',nomtype);
     try
         movefile(filename,filename_new);
@@ -115 +144 @@
         return
     end
-    %     if test_level
-    %         A=imread(filename);
-    %         C=levels(A);
-    %         imwrite(C,filename_new)
-    %     else
-    %         try
-    %             copyfile(filename,filename_new);
-    %         catch
-    %             errormsg=lasterr
-    %             msgbox_uvmat('ERROR',errormsg);
-    %             return
-    %         end
-    %     end
-end
-
-
-function C=levels(A)
-%whos A;
-B=double(A(:,:,1));
-windowsize=round(min(size(B,1),size(B,2))/20);
-windowsize=floor(windowsize/2)*2+1;
-ix=[1/2-windowsize/2:-1/2+windowsize/2];%
-%del=np/3;
-%fct=exp(-(ix/del).^2);
-fct2=cos(ix/(windowsize-1)/2*pi/2);
-%Mfiltre=(ones(5,5)/5^2);
-%Mfiltre=fct2';
-Mfiltre=fct2'*fct2;
-Mfiltre=Mfiltre/(sum(sum(Mfiltre)));
-
-C=filter2(Mfiltre,B);
-C(:,1:windowsize)=C(:,windowsize)*ones(1,windowsize);
-C(:,end-windowsize+1:end)=C(:,end-windowsize+1)*ones(1,windowsize);
-C(1:windowsize,:)=ones(windowsize,1)*C(windowsize,:);
-C(end-windowsize+1:end,:)=ones(windowsize,1)*C(end-windowsize,:);
-C=tanh(B./(2*C));
-[n,c]=hist(reshape(C,1,[]),100);
-% figure;plot(c,n);
-
-[m,i]=max(n);
-c_max=c(i);
-[dummy,index]=sort(abs(c-c(i)));
-n=n(index);
-c=c(index);
-i_select = find(cumsum(n)<0.95*sum(n));
-if isempty(i_select)
-    i_select = 1:length(c);
-end
-c_select=c(i_select);
-n_select=n(i_select);
-cmin=min(c_select);
-cmax=max(c_select);
-C=(C-cmin)/(cmax-cmin)*256;
-C=uint8(C);
+end
+
 
 %'imadoc2struct': reads the xml file for image documentation 
@@ -256 +233 @@
                 NbDtj=get_value(subt,'/BurstTiming/NbDtj',1);
                 %%%% correction RDvision %%%%
-                NbDtj=NbDtj/numel(Dtj);
-                s.NbDtj=NbDtj;
-                %%%%
-                Dti=get_value(subt,'/BurstTiming/Dti',[]);
+%                 NbDtj=NbDtj/numel(Dtj);
+%                 s.NbDtj=NbDtj;
+%                 %%%%
+                Dti=get_value(subt,'/BurstTiming/Dti',[])
+                NbDti=get_value(subt,'/BurstTiming/NbDti',1)
+                 %%%% correction RDvision %%%%
+                if isempty(Dti)% series 
+                     Dti=Dtj
+                      NbDti=NbDtj
+                     Dtj=[];
+                     s.Dti=Dti;
+                     'TESTrxml'
+                     s.NbDti=NbDti
+                else
+                     NbDtj=NbDtj/numel(Dtj);%bursts
+                    s.NbDtj=NbDtj;
+                end
+                %%%% %%%%
                 Dti=Dti/Frequency;%Dtj converted from frame unit to TimeUnit (e.g. 's')
-                NbDti=get_value(subt,'/BurstTiming/NbDti',1);
+
                 Time_val=get_value(subt,'/BurstTiming/Time',0);%time in TimeUnit
                 if ~isempty(Dti)