Changeset 1177 for trunk/src

Timestamp:

Mar 12, 2025, 8:13:18 PM (2 days ago)

Author:

sommeria

Message:

background image introduced for civ1

Location:

trunk/src

Files:

• plot_field.m (modified) (2 diffs)
• series/civ_input.fig (modified) (previous)
• series/civ_input.m (modified) (5 diffs)
• series/civ_series.m (modified) (2 diffs)

trunk/src/plot_field.m

@@ -409 +409 @@
 
 %% prepare the string for plot command
+plotstr='hhh=plot(';
 if isfield(PlotParam,'Type')
     switch PlotParam.Type
@@ -417 +418 @@
         case 'loglog'
             plotstr='hhh=loglog(';
-        otherwise
-            plotstr='hhh=plot(';
     end
 end

trunk/src/series/civ_input.m

@@ -328 +328 @@
     PairMenu={'series(Di)'};
 elseif MaxIndex_j-MinIndex_j==1
-    PairMenu={'pair j1-j2'};
+    PairMenu={'pair j1-j2';'series(Di)'};
 elseif  MaxIndex_i==MinIndex_i && MaxIndex_j-MinIndex_j>2% simple series in j
     PairMenu={'pair j1-j2';'series(Dj)'};
@@ -1968 +1968 @@
 hparent=get(hObject,'parent');
 hchildren=get(hparent,'children');
-handle_txtbox=findobj(hchildren,'tag','Background');% look for the mask name box in the same panel
-testmask=0;
+handle_txtbox=findobj(hchildren,'tag','Background');% look for the background name box in the same panel
+testbackground=0;
 if get(hObject,'Value')% if the checkbox is activated
     hseries=findobj(allchild(0),'Tag','series');
@@ -1979 +1979 @@
         ind_A=1;% line index of the (first) image series
     end
-    % browse for a mask
+    % browse for a background
     filebackground= uigetfile_uvmat('pick a background image file:',InputTable{ind_A,1},'image');
     if ~isempty(filebackground)
@@ -1992 +1992 @@
         end
         set(hObject,'UserData',filebackground);%store for future use
-        testmask=1;
-    end
-end
-if testmask
+        testbackground=1;
+    end
+end
+if testbackground
     set(handles.Background,'Visible','on')
     set(handles.Background,'String',filebackground)
@@ -2009 +2009 @@
 set(handles.ConfigSource,'String','NEW')
 set(handles.ConfigSource,'BackgroundColor',[1 0 1])
-
-
-
-function Background_Callback(hObject, eventdata, handles)
-% hObject    handle to Background (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 Background as text
-%        str2double(get(hObject,'String')) returns contents of Background as a double

trunk/src/series/civ_series.m

@@ -258 +258 @@
 transform_fct=[];%default, no transform
 if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
-        addpath(Param.FieldTransform.TransformPath)
+       % addpath(Param.FieldTransform.TransformPath)
+        currentdir=pwd;
+    cd(Param.FieldTransform.TransformPath)
     transform_fct=str2func(Param.FieldTransform.TransformName);
-    rmpath(Param.FieldTransform.TransformPath)
-end
-
+    cd (currentdir)
+    %rmpath(Param.FieldTransform.TransformPath)
+end
 
 %%%%% MAIN LOOP %%%%%%
@@ -772 +774 @@
         end
         
+        % case of background image to subtract
+        if par_civ2.CheckBackground &&~isempty(par_civ2.Background)
+            [RootPath_background,SubDir_background,RootFile_background,~,~,~,~,Ext_background]=fileparts_uvmat(Param.ActionInput.Civ1.Background);
+            j1=1;
+            if ~isempty(j1_series_Civ1)
+                j1=j1_series_Civ1(ifield);
+            end
+            if ~isempty(i2_series_Civ1)% case of volume,backgrounds act on different j levels
+                backgroundname=fullfile_uvmat(RootPath_background,SubDir_background,RootFile_background,Ext_background,'_1',j1);
+            elseif isfield(par_civ2,'NbSlice')
+                i1_background=mod(i1-1,par_civ2.NbSlice)+1;
+                backgroundname=fullfile_uvmat(RootPath_background,SubDir_background,RootFile_background,Ext_background,'_1',i1_background);
+                if strcmp(Param.ActionInput.PairIndices.ListPairMode,'series(Di)')% case of volume, background index refers to j index
+                    par_civ2.NbSlice_j=par_civ2.NbSlice;
+                end
+            else
+                backgroundname=Param.ActionInput.Civ1.Background;
+            end
+            if strcmp(backgroundoldname,backgroundname)% background exist, not already read in civ2
+                par_civ2.Background=background; %use background already opened
+            else
+                if ~isempty(regexp(backgroundname,'(^http://)|(^https://)', 'once'))|| exist(backgroundname,'file')
+                    try
+                        par_civ2.Background=imread(backgroundname);%update the background, 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
+                else
+                    par_civ2.Background=[];
+                end
+                background=par_civ2.Background;
+                backgroundoldname=backgroundname;
+            end
+            par_civ2.ImageA=par_civ2.ImageA-par_civ2.Background;
+            par_civ2.ImageB=par_civ2.ImageB-par_civ2.Background;
+        end
         
         if strcmp(Param.ActionInput.ListCompareMode,'displacement')