Changeset 1010 for trunk

Timestamp:

Sep 22, 2017, 12:33:16 PM (7 years ago)

Author:

sommeria

Message:

multimask introduced

Location:

trunk/src

Files:

• civ.m (modified) (1 diff)
• series.m (modified) (1 diff)
• series/civ_input.fig (modified) (previous)
• series/civ_input.m (modified) (4 diffs)
• series/civ_series.m (modified) (4 diffs)
• series/extract_rdvision_times.m (added)
• series/get_times_rdvision.m (deleted)
• transform_field/signal_spectrum.m (modified) (2 diffs)
• uvmat.m (modified) (2 diffs)

trunk/src/civ.m

@@ -1 @@
-%'civ': function associated with the interface 'civ.fig' for PIV, spline interpolation and stereo PIV (patch)
+%'civ': function associated with the interface 'civ.fig' for PIV, spline interpolation and stereo PIV (patch). OBSOLETE: REPLACED BY civ_series
 %------------------------------------------------------------------------
 %  provides an interface for the software menucivx
 % function varargout = civ(varargin)
 % provides an interface for the software menucivx
+% OBSOLETE: REPLACED BY civ_series
 
 %=======================================================================

trunk/src/series.m

@@ -2045 +2045 @@
         WallTimeOneJob=min(4*JobTime+10,WallTimeTotal*60/2); % estimated max time of an individual job for checkpoint
         disp(['WallTimeOneJob: ' num2str(WallTimeOneJob) ' minutes'])
+        if NbProcess>=8
+            bigiojob_string=['+{type = ' char(39) 'bigiojob' char(39) '}/licence=1'];% char(39) is quote - bigiojob limit UVmat parallel launch on cluster to avoid saturation of disk access to data
+        else
+            bigiojob_string='';
+        end 
         oar_command=['oarsub -n UVmat_' ActionFullName ' '...
             '-t idempotent --checkpoint ' num2str(WallTimeOneJob*60) ' '...
             '-l "/core=' num2str(NbCore)...
-            '+{type = ' char(39) 'bigiojob' char(39) '}/licence=1'... % char(39) is quote - bigiojob limit UVmat parallel launch on cluster
+            bigiojob_string... % char(39) is quote - bigiojob limit UVmat parallel launch on cluster
             ',walltime=' datestr(WallTimeTotal/24,13) '" '...
             '-E ' filename_errors ' '...

trunk/src/series/civ_input.m

@@ -1516 +1516 @@
 hchildren=get(hparent,'children');
 handle_txtbox=findobj(hchildren,'tag','Mask');% look for the mask name box in the same panel
-
+handle_NbSlice=findobj(hchildren,'tag','num_NbSlice');% look for the mask name box in the same panel
 testmask=0;
 if value
@@ -1526 +1526 @@
         ind_A=2;
     end
-    [nbslice, flag_mask]=get_mask(InputTable{ind_A,1},handles);% look for a mask with appropriate name
-    if isequal(flag_mask,1)
-        filemask=[num2str(nbslice) 'mask'];
-        testmask=1;
-    else % browse for a mask
+%     [nbslice, flag_mask]=get_mask(InputTable{ind_A,1},handles);% look for a mask with appropriate name
+%     if isequal(flag_mask,1)
+%         filemask=[num2str(nbslice) 'mask'];
+%         testmask=1;
+%     else % browse for a mask
         filemask= uigetfile_uvmat('pick a mask image file:',InputTable{ind_A,1},'image');
+        [FilePath,FileName,Ext]=fileparts(filemask);    
+        [RootPath,SubDir,RootFile,i1_series,i2,j1,j2,NomType]=find_file_series(FilePath,[FileName,Ext]);
+        if strcmp(NomType,'_1')
+           NbSlice=i1_series(1,2,end);
+           set(handle_NbSlice,'String',num2str(NbSlice))
+        end
         set(hObject,'UserData',filemask);%store for future use
         if ~isempty(filemask)
             testmask=1;
-        end
-    end
+         end
+%     end
 end
 if testmask
@@ -1542 +1548 @@
     set(handles.Mask,'String',filemask)
     set(handles.CheckMask,'Value',1)
+    if strcmp(NomType,'_1')
+        set(handles.num_NbSlice,'Visible','on')
+    end
 else
     set(hObject,'Value',0);
     set(handle_txtbox,'Visible','off')
+    set(handles.num_NbSlice,'Visible','off')
 end
 set(handles.ConfigSource,'String','NEW')
@@ -2375 +2385 @@
     drawnow
 end
+
+
+
+function num_NbSlice_Callback(hObject, eventdata, handles)
+% hObject    handle to num_NbSlice (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of num_NbSlice as text
+%        str2double(get(hObject,'String')) returns contents of num_NbSlice as a double
+
+
+% --- Executes during object creation, after setting all properties.
+function num_NbSlice_CreateFcn(hObject, eventdata, handles)
+% hObject    handle to num_NbSlice (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    empty - handles not created until after all CreateFcns called
+
+% Hint: edit controls usually have a white background on Windows.
+%       See ISPC and COMPUTER.
+if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
+    set(hObject,'BackgroundColor','white');
+end

trunk/src/series/civ_series.m

@@ -276 +276 @@
 
 %%%%% MAIN LOOP %%%%%%
-maskname='';% initiate the mask name
+maskoldname='';% initiate the mask name
 FileType_A='';
 FileType_B='';
@@ -440 +440 @@
         Data.VarAttribute{4}.Role='vector_y';
         Data.VarAttribute{5}.Role='warnflag';
+        % case of mask
         if par_civ1.CheckMask&&~isempty(par_civ1.Mask)
-            if strcmp(maskname,par_civ1.Mask)% mask exist, not already read in civ1
+            if isfield(par_civ1,'NbSlice')
+                [RootPath_mask,SubDir_mask,RootFile_mask,i1_mask,i2_mask,j1_mask,j2_mask,Ext_mask]=fileparts_uvmat(Param.ActionInput.Civ1.Mask);
+                i1_mask=mod(i1-1,par_civ1.NbSlice)+1;
+                maskname=fullfile_uvmat(RootPath_mask,SubDir_mask,RootFile_mask,Ext_mask,'_1',i1_mask);
+            else
+                maskname=Param.ActionInput.Civ1.Mask;
+            end
+            if strcmp(maskoldname,maskname)% mask exist, not already read in civ1
                 par_civ1.Mask=mask; %use mask already opened
             else
                 try
-                    par_civ1.Mask=imread(par_civ1.Mask);%update the mask, an store it for future use
+                    par_civ1.Mask=imread(maskname);%update the mask, an store it for future use
                 catch ME
                     if ~isempty(ME.message)
@@ -454 +462 @@
                 end
                 mask=par_civ1.Mask;
-                maskname=par_civ1.Mask;
+                maskoldname=maskname;
             end
         end
@@ -704 +712 @@
             end
         end
-        if par_civ2.CheckMask&&~isempty(par_civ2.Mask)
-            if strcmp(maskname,par_civ2.Mask)% mask exist, not already read in civ1
+        if par_civ2.CheckMask&&~isempty(par_civ2.Mask)        
+            if isfield(par_civ2,'NbSlice')
+                [RootPath_mask,SubDir_mask,RootFile_mask,i1_mask,i2_mask,j1_mask,j2_mask,Ext_mask]=fileparts_uvmat(Param.ActionInput.Civ2.Mask);
+                i1_mask=mod(i1-1,par_civ2.NbSlice)+1;
+                maskname=fullfile_uvmat(RootPath_mask,SubDir_mask,RootFile_mask,Ext_mask,'_1',i1_mask);
+            else
+                maskname=Param.ActionInput.Civ2.Mask;
+            end
+            if strcmp(maskoldname,maskname)% mask exist, not already read in civ1
                 par_civ2.Mask=mask; %use mask already opened
             else
-                par_civ2.Mask=imread(par_civ2.Mask);%update the mask, and store it for future use
+                try
+                    par_civ2.Mask=imread(maskname);%update the mask, an store it for future use
+                catch ME
+                    if ~isempty(ME.message)
+                        errormsg=['error reading input image: ' ME.message];
+                        disp_uvmat('ERROR',errormsg,checkrun)
+                        return
+                    end
+                end
                 mask=par_civ2.Mask;
-                maskname=par_civ2.Mask;
-            end
-        end
+                maskoldname=maskname;
+            end
+        end
+
         if CheckInputFile % else Dt given by par_civ2
             if strcmp(Param.ActionInput.ListCompareMode,'displacement')

trunk/src/transform_field/signal_spectrum.m

@@ -1 +1 @@
 % 'signal_spectrum': calculate and display power spectrum of the current field 
 %  operate on a 1D signal or the first dimension of a higher dimensional matrix (then average over other dimensions)
-%  this function aplies the Welch method and call the function of the matlab signal processing toolbox
+%  this function aplies the Welch method and calls the function  of the matlab signal processing toolbox
+%  it calculates also the cospectrum with the signal shifted by one
+%  index, to remove noise effects assumed uncorrelated from one iteration to
+%  the next.
 %
 % OUTPUT: 
@@ -91 +94 @@
         yindex=DataOut.TransformInput.IndexRange(2,:);
         y=Data.(YName)(yindex);
+        if size(DataOut.TransformInput.IndexRange,1)>=3
         xindex=DataOut.TransformInput.IndexRange(3,:);
+        else
+            xindex=DataOut.TransformInput.IndexRange(2,:);
+        end
         x=Data.(XName)(xindex);
         haxes=findobj(huvmat,'Tag','PlotAxes');

trunk/src/uvmat.m

@@ -5678 +5678 @@
 %------------------------------------------------------------------------
 check_view=get(handles.CheckViewObject,'Value');
-
+    hset_object=findobj(allchild(0),'tag','set_object');
+    if ~isempty(hset_object)
+        delete(hset_object)% delete existing version of set_object
+    end
 if check_view %activate set_object
     IndexObj=get(handles.ListObject,'Value');
@@ -5713 +5716 @@
     end
 else
-    hset_object=findobj(allchild(0),'tag','set_object');
-    if ~isempty(hset_object)
-        delete(hset_object)% delete existing version of set_object
-    end
+%     hset_object=findobj(allchild(0),'tag','set_object');
+%     if ~isempty(hset_object)
+%         delete(hset_object)% delete existing version of set_object
+%     end
 end