Changeset 883 for trunk/src

Timestamp:

Mar 13, 2015, 8:19:39 PM (10 years ago)

Author:

sommeria

Message:

bugs corrected in series, transform functions with input parameters introduced, civ/deformation corrected (sign)

Location:

trunk/src

Files:

• series.m (modified) (9 diffs)
• series/aver_stat.m (modified) (1 diff)
• series/civ_input.m (modified) (10 diffs)
• series/civ_series.m (modified) (2 diffs)
• series/merge_proj.m (modified) (1 diff)
• series/time_series.m (modified) (1 diff)
• transform_field/diff_vel.m (modified) (1 diff)

trunk/src/series.m

@@ -639 +639 @@
     set(handles.series,'UserData',[])%refresh the stored info
 end
-for iview=1:size(InputTable,1)
+nbview=size(InputTable,1);
+for iview=1:nbview
     RootPath=fullfile(InputTable{iview,1},InputTable{iview,2});
     if ~exist(RootPath,'dir')
         i1_series=[];
-        %RootPath=fileparts(RootPath); %will try the upper folder
         RootFile='';
     else %scan the input folder
@@ -662 +662 @@
     end
 end
+
+%% update MinIndex_i and MaxIndex_i if the input table content has been reduced in line nbre
+MinIndex_i_table=get(handles.MinIndex_i,'Data');%retrieve the min indices in the table MinIndex
+set(handles.MinIndex_i,'Data',MinIndex_i_table(1:nbview,:));
+MinIndex_j_table=get(handles.MinIndex_j,'Data');%retrieve the min indices in the table MinIndex
+set(handles.MinIndex_j,'Data',MinIndex_j_table(1:nbview,:));
+MaxIndex_i_table=get(handles.MaxIndex_i,'Data');%retrieve the min indices in the table MinIndex
+set(handles.MaxIndex_i,'Data',MaxIndex_i_table(1:nbview,:));
+MaxIndex_j_table=get(handles.MaxIndex_j,'Data');%retrieve the min indices in the table MinIndex
+set(handles.MaxIndex_j,'Data',MaxIndex_j_table(1:nbview,:));
+PairString=get(handles.PairString,'Data');%retrieve the min indices in the table MinIndex
+set(handles.PairString,'Data',PairString(1:nbview,:));
+TimeTable=get(handles.TimeTable,'Data');%retrieve the min indices in the table MinIndex
+set(handles.TimeTable,'Data',TimeTable(1:nbview,:));
+
 %% enable field and veltype menus, in accordance with the current action
 ActionName_Callback([],[], handles)
@@ -766 +781 @@
     SeriesData.Time={};
 end
-   SeriesData.i1_series(iview+1:end)=[];
+if isfield(SeriesData,'i1_series')
+    SeriesData.i1_series(iview+1:end)=[];
     SeriesData.i2_series(iview+1:end)=[];
     SeriesData.j1_series(iview+1:end)=[];
@@ -773 +789 @@
     SeriesData.FileInfo(iview+1:end)=[];
     SeriesData.Time(iview+1:end)=[];
- InputTable(iview,:)=[{RootPath},{SubDir},{RootFile},{NomType},{FileExt}];
+end
+InputTable(iview,:)=[{RootPath},{SubDir},{RootFile},{NomType},{FileExt}];
 if iview >1
     set(handles.InputLine,'String',num2str(iview))
@@ -1411 +1428 @@
 Param=read_GUI_series(handles);%displayed parameters
 SeriesData=get(handles.series,'UserData');%hidden parameters
+if isfield(SeriesData,'TransformInput')
+    Param.TransformInput=SeriesData.TransformInput;
+end
 if ~isfield(SeriesData,'i1_series')
     errormsg='The input field series needs to be refreshed: press REFRESH';
@@ -2403 +2423 @@
 end
 set(handles.OutputSubDir,'String',SubDirOut)
+set(handles.OutputSubDir,'BackgroundColor',[1 1 1])% set edit box to white color to indicate refreshment
 set(handles.OutputDirExt,'Visible',OutputDirVisible)
 set(handles.OutputSubDir,'Visible',OutputDirVisible)
@@ -2971 +2992 @@
 set(handles.TransformName,'UserData',TransformPathList);
 
+%% create the function handle of the selected fct
+if ~isempty(TransformName)
+    current_dir=pwd;%current working dir
+    cd(TransformPathList{TransformIndex})
+    transform_handle=str2func(TransformName);
+    cd(current_dir)
+    Field.Action.RUN=0;% indicate that the transform fct is called only to get input param
+    DataOut=feval(transform_handle,Field,[]);% execute the transform fct to get the required conditions
+    if isfield(DataOut,'TransformInput')%  used to add transform parameters at selection of the transform fct
+        SeriesData=get(handles.series,'UserData');
+        SeriesData.TransformInput=DataOut.TransformInput;
+        set(handles.series,'UserData',SeriesData)
+    end
+end
+
 %------------------------------------------------------------------------
 % --- fct activated by the upper bar menu ExportConfig
@@ -3034 +3070 @@
     Param.ActionInput.ConfigSource=filexml;% record the source of config for future info
     SeriesData.ActionInput=Param.ActionInput;
+end
+if isfield(Param,'TransformInput')%  introduce  parameters specific to a transform fct
+    SeriesData.TransformInput=Param.TransformInput;
 end
 if isfield(Param,'ProjObject') %introduce projection object if relevant
@@ -3471 +3510 @@
     set(handles.InputTable,'Data',InputTable);
 end
+set(handles.REFRESH,'BackgroundColor',[1 0 1])% set REFRESH button to magenta color to indicate that input refr
 
 

trunk/src/series/aver_stat.m

@@ -185 +185 @@
     transform_fct=str2func(Param.FieldTransform.TransformName);
     rmpath(Param.FieldTransform.TransformPath)
+    if isfield(Param,'TransformInput')
+            XmlData{1}.TransformInput=Param.TransformInput;
+    end     
 end
 

trunk/src/series/civ_input.m

@@ -688 +688 @@
 nbfield=siztime(1)-1;
 nbfield2=siztime(2)-1;
-indchosen=1;  %%first pair selected by default
+%indchosen=1;  %%first pair selected by default
 %displ_num used to define the indices of the civ_input pairs
 % in mode 'pair j1-j2', j1 and j2 are the file indices, else the indices
@@ -907 +907 @@
 nbpair=200;%default
 select=ones(size(1:nbpair));%flag for displayed pairs =1 for display
-nbpair=200; %default
+%nbpair=200; %default
 
 %% determine the menu display in .ListPairCiv1
@@ -915 +915 @@
             if select(ipair)
                 displ_pair{ipair}=['Di= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2))];
+                displ_pair_dt{ipair}=displ_pair{ipair};
                 if ~checkframe
                     if size(Time,1)>=ref_i+1+ceil(ipair/2) && size(Time,2)>=ref_j+1&& ref_i-floor(ipair/2)>=0 && ref_j>=0
                         dt=Time(ref_i+1+ceil(ipair/2),ref_j+1)-Time(ref_i+1-floor(ipair/2),ref_j+1);%Time interval dtref_j+1
-                        displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(dt*1000)];
+                        displ_pair_dt{ipair}=[displ_pair_dt{ipair} ' :dt= ' num2str(dt*1000)];
                     end
                 else
                     dt=ipair/1000;
-                    displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(ipair)];
+                    displ_pair_dt{ipair}=[displ_pair_dt{ipair} ' :dt= ' num2str(ipair)];
                 end
             else
-                displ_pair{ipair}='...'; %pair not displayed in the menu
+                displ_pair{ipair}='...';
+                displ_pair_dt{ipair}='...'; %pair not displayed in the menu
             end
         end
@@ -932 +934 @@
             if select(ipair)
                 displ_pair{ipair}=['Dj= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2))];
+                displ_pair_dt{ipair}=displ_pair{ipair};
                 if ~checkframe
                     if size(Time,2)>=ref_j+1+ceil(ipair/2) && size(Time,1)>=ref_i+1 && ref_j-floor(ipair/2)>=0 && ref_i>=0
                         dt=Time(ref_i+1,ref_j+1+ceil(ipair/2))-Time(ref_i+1,ref_j+1-floor(ipair/2));%Time interval dtref_j+1
-                        displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(dt*1000)];
+                        displ_pair_dt{ipair}=[displ_pair_dt{ipair} ' :dt= ' num2str(dt*1000)];
                     end
                 else
                     dt=ipair/1000;
-                    displ_pair{ipair}=[displ_pair{ipair} ' :dt= ' num2str(dt*1000)];
+                    displ_pair_dt{ipair}=[displ_pair_dt{ipair} ' :dt= ' num2str(dt*1000)];
                 end
             else
                 displ_pair{ipair}='...'; %pair not displayed in the menu
+                displ_pair_dt{ipair}='...'; %pair not displayed in the menu
             end
         end
@@ -956 +960 @@
                 index_pair=index_pair+1;
                 displ_pair{index_pair}=['j= ' num2stra(numod_a,nom_type_ima) '-' num2stra(numod_b,nom_type_ima)];
+                displ_pair_dt{ipair}=displ_pair{ipair};
                 dt(index_pair)=numod_b-numod_a;%default dt
                 if size(Time,1)>ref_i && size(Time,2)>numod_b  % && ~checkframe
                     dt(index_pair)=Time(ref_i+1,numod_b+1)-Time(ref_i+1,numod_a+1);% Time interval dt
-                    displ_pair{index_pair}=[displ_pair{index_pair} ' :dt= ' num2str(dt(index_pair)*1000)];
+                    displ_pair_dt{index_pair}=[displ_pair_dt{index_pair} ' :dt= ' num2str(dt(index_pair)*1000)];
                 end
             end
@@ -966 +971 @@
         [tild,indsort]=sort(dt);
         displ_pair=displ_pair(indsort);
+        displ_pair_dt=displ_pair_dt(indsort);
     case 'displacement'
         displ_pair={'Di=Dj=0'};
+        displ_pair_dt={'Di=Dj=0'};
 end
 if index==1
-    set(handles.ListPairCiv1,'String',displ_pair');
+    set(handles.ListPairCiv1,'String',displ_pair_dt');
 end
 
@@ -976 +983 @@
 %ichoice=find(select,1);% index of first selected pair
 %if (isempty(ichoice) || ichoice < 1); ichoice=1; end;
+end_pair=regexp(PairCiv1Init,' :dt=');
+if ~isempty(end_pair)
+    PairCiv1Init=PairCiv1Init(1:end_pair-1);
+end
 ichoice=find(strcmp(PairCiv1Init,displ_pair'),1);
 if ~isempty(ichoice)
@@ -988 +999 @@
 %% determine the default selection in the pair menu for Civ2
 if strcmp(get(handles.ListPairCiv2,'Visible'),'on')
+    end_pair=regexp(PairCiv2Init,' :dt=');
+    if ~isempty(end_pair)
+        PairCiv2Init=PairCiv2Init(1:end_pair-1);
+    end
     ichoice=find(strcmp(PairCiv2Init,displ_pair'),1);
     if ~isempty(ichoice)
@@ -994 +1009 @@
         set(handles.ListPairCiv2,'Value',1)
     end
-    
-    %
-    %     initial=get(handles.ListPairCiv2,'Value');
-    %
-    %
-    %     if initial>length(displ_pair')%|~isequal(select(initial),1)
-    %         if ichoice <= length(displ_pair')
-    %             set(handles.ListPairCiv2,'Value',ichoice);% same pair proposed by default for civ2
-    %         else
-    %             set(handles.ListPairCiv2,'Value',1);% same pair proposed by default for civ2
-    %         end
-    %     end
 else
     set(handles.ListPairCiv2,'Value',get(handles.ListPairCiv1,'Value'))% initiate the choice of Civ2 as a reproduction of if civ1
 end
-set(handles.ListPairCiv2,'String',displ_pair');
+set(handles.ListPairCiv2,'String',displ_pair_dt');
 set(gcf,'Pointer','arrow')% Indicate that the process is finished
-
-
-    
-% %------------------------------------------------------------------------   
-% % call 'view_field.fig' to display the  field selected in the list of 'status'
-% function open_view_field(hObject, eventdata)
-% %------------------------------------------------------------------------
-% list=get(hObject,'String');
-% index=get(hObject,'Value');
-% rootroot=get(hObject,'UserData');
-% filename=list{index};
-% ind_dot=strfind(filename,'...');
-% filename=filename(1:ind_dot-1);
-% filename=fullfile(rootroot,filename);
-% delete(get(hObject,'parent'))%delete the display figure to stop the check process
-% if exist(filename,'file')%visualise the vel field if it exists
-%     uvmat(filename)
-%     set(gcbo,'Value',1)
-% end
 
 
@@ -1160 +1144 @@
 set(handles.ConfigSource,'String','NEW')
 set(handles.OK,'BackgroundColor',[1 0 1])
+if get(handles.CheckDeformation,'Value')
+    set(handles.num_CorrSmooth,'Visible','off')
+else
+    set(handles.num_CorrSmooth,'Visible','on')
+end
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

trunk/src/series/civ_series.m

@@ -1036 +1036 @@
                     yi=(1:mesh:size(image1_crop,1))';
                     [XI,YI]=meshgrid(xi-ceil(size(image1_crop,2)/2),yi-ceil(size(image1_crop,1)/2));
-                    XIant=XI-par_civ.DUDX(ivec)*XI-par_civ.DUDY(ivec)*YI+ceil(size(image1_crop,2)/2);
-                    YIant=YI-par_civ.DVDX(ivec)*XI-par_civ.DVDY(ivec)*YI+ceil(size(image1_crop,1)/2);
+                    XIant=XI-par_civ.DUDX(ivec)*XI+par_civ.DUDY(ivec)*YI+ceil(size(image1_crop,2)/2);
+                    YIant=YI+par_civ.DVDX(ivec)*XI-par_civ.DVDY(ivec)*YI+ceil(size(image1_crop,1)/2);
                     image1_crop=interp2(image1_crop,XIant,YIant);
                     image1_crop(isnan(image1_crop))=0;
@@ -1044 +1044 @@
                     image2_crop=interp2(image2_crop,xi,yi,'*spline');
                     image2_crop(isnan(image2_crop))=0;
-                    %par_civ.CorrSmooth=3;%%%%%%%%%%%%%%%%%%%
-                    %%
+                    par_civ.CorrSmooth=2;% use SUBPIX2DGAUSS (take into account more points near the max)
                 end
                 sum_square=sum(sum(image1_crop.*image1_crop));

trunk/src/series/merge_proj.m

@@ -179 +179 @@
         transform_fct=str2func(Param.FieldTransform.TransformName);
         cd (currentdir)
+        if isfield(Param,'TransformInput')
+            for iview=1:NbView
+            XmlData{iview}.TransformInput=Param.TransformInput;
+            end
+        end       
 end
 %%%%%%%%%%%% END STANDARD PART  %%%%%%%%%%%%

trunk/src/series/time_series.m

@@ -220 +220 @@
     transform_fct=str2func(Param.FieldTransform.TransformName);
     rmpath(Param.FieldTransform.TransformPath)
+    if isfield(Param,'TransformInput')
+        XmlData{1}.TransformInput=Param.TransformInput;
+    end
 end
 

trunk/src/transform_field/diff_vel.m

@@ -35 +35 @@
 %=======================================================================
 
-function SubData=diff_vel(Field,XmlData,Field_1)
+function Field=diff_vel(Field,XmlData,Field_1)
 
-SubData=Field;
+%% request input parameters
+if isfield(Field,'Action') && isfield(Field.Action,'RUN') && isequal(Field.Action.RUN,0)
+
+        %default input:
+        def={'1'};% multiplicative factor for the second velocity field 
+
+        if isfield(XmlData,'TransformInput')% if parameters have been memorised
+            if isfield(XmlData.TransformInput,'Factor')
+                def{1}=num2str(XmlData.TransformInput.Factor);
+            end
+        end
+        num_lines= 1;%numel(prompt);
+        % open the dialog fig
+        prompt='enter scale factor for the second field';
+        answer = inputdlg(prompt,'',num_lines,def);
+        Field.TransformInput.Factor=str2num(answer{1});
+    return
+end
+Factor=1;
+if isfield(XmlData,'TransformInput') && isfield(XmlData.TransformInput,'Factor') 
+Factor=XmlData.TransformInput.Factor;
+end
 if exist('Field_1','var')
           F.U=scatteredInterpolant(Field_1.X,Field_1.Y,Field_1.U,'linear');
-         SubData.U=Field.U-F.U(Field.X,Field.Y);%substract the interpolated ref to U
+         Field.U=Field.U-Factor*F.U(Field.X,Field.Y);%substract the interpolated ref to U
           F.V=scatteredInterpolant(Field_1.X,Field_1.Y,Field_1.V,'linear');
-          SubData.V=Field.V-F.V(Field.X,Field.Y);%substract the interpolated ref to V
+          Field.V=Field.V-Factor*F.V(Field.X,Field.Y);%substract the interpolated ref to V
 end