Changeset 1176 for trunk/src

Timestamp:

Mar 12, 2025, 12:35:15 PM (3 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) (4 diffs)
• series/civ_series.m (modified) (4 diffs)
• uvmat.fig (modified) (previous)
• uvmat.m (modified) (1 diff)

trunk/src/plot_field.m ¶

@@ -183 +183 @@
 else  %plot 2D field
 %     if ~exist('PosColorbar','var'),PosColorbar=[];end;
-    [tild,PlotParamOut,PlotType,errormsg]=plot_plane(Data,CellInfo(index_2D),haxes,PlotParamOut);
+    [~,PlotParamOut,PlotType,errormsg]=plot_plane(Data,CellInfo(index_2D),haxes,PlotParamOut);
     AxeData.NbDim=2;
     if testzoomaxes && isempty(errormsg)
-        [zoomaxes,PlotParamOut,tild,errormsg]=plot_plane(Data,CellInfo(index_2D),zoomaxes,PlotParamOut);
+        [zoomaxes,PlotParamOut,~,errormsg]=plot_plane(Data,CellInfo(index_2D),zoomaxes,PlotParamOut);
         AxeData.ZoomAxes=zoomaxes;
     end
@@ -409 +409 @@
 
 %% prepare the string for plot command
-if isfield(PlotParam,'Type')&& strcmp(PlotParam.Type,'semilogx')
-   plotstr='hhh=semilogx(';
-else
-plotstr='hhh=plot(';
+if isfield(PlotParam,'Type')
+    switch PlotParam.Type
+        case 'semilogx'
+            plotstr='hhh=semilogx(';
+        case 'semilogy'
+            plotstr='hhh=semilogy(';
+        case 'loglog'
+            plotstr='hhh=loglog(';
+        otherwise
+            plotstr='hhh=plot(';
+    end
 end
 xtitle='';

trunk/src/series/civ_input.m ¶

@@ -1286 +1286 @@
     end
     % browse for a mask
-    filemask= uigetfile_uvmat('pick a mask image file:',InputTable{ind_A,1},'image');
-    if ~isempty(filemask)
-        [FilePath,FileName,FileExt]=fileparts(filemask);
+    filebackground= uigetfile_uvmat('pick a mask image file:',InputTable{ind_A,1},'image');
+    if ~isempty(filebackground)
+        [FilePath,FileName,FileExt]=fileparts(filebackground);
         [RootPath,SubDir,RootFile,i1_series,i2,j1,j2,NomType]=find_file_series(FilePath,[FileName FileExt]);
         if strcmp(NomType,'_1')
@@ -1297 +1297 @@
             return
         end
-        set(hObject,'UserData',filemask);%store for future use
+        set(hObject,'UserData',filebackground);%store for future use
         testmask=1;
     end
@@ -1303 +1303 @@
 if testmask
     set(handles.Mask,'Visible','on')
-    set(handles.Mask,'String',filemask)
+    set(handles.Mask,'String',filebackground)
     set(handles.CheckMask,'Value',1)
     if strcmp(NomType,'_1')
@@ -1964 +1964 @@
 
 
+% --- Executes on button press in CheckBackground.
+function CheckBackground_Callback(hObject, eventdata, handles)
+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;
+if get(hObject,'Value')% if the checkbox is activated
+    hseries=findobj(allchild(0),'Tag','series');
+    hhseries=guidata(hseries);
+    InputTable=get(hhseries.InputTable,'Data');
+    if strcmp(InputTable{1,5},'.nc')
+        ind_A=2;%case of nc file as input (for civ3), image in second line
+    else
+        ind_A=1;% line index of the (first) image series
+    end
+    % browse for a mask
+    filebackground= uigetfile_uvmat('pick a background image file:',InputTable{ind_A,1},'image');
+    if ~isempty(filebackground)
+        [FilePath,FileName,FileExt]=fileparts(filebackground);
+        [RootPath,SubDir,RootFile,i1_series,i2,j1,j2,NomType]=find_file_series(FilePath,[FileName FileExt]);
+        if strcmp(NomType,'_1')
+            NbSlice=i1_series(1,2,end);
+            set(handles.num_NbSlice,'String',num2str(NbSlice))
+        elseif ~strcmp(NomType,'*')
+            msgbox_uvmat('ERROR','multilevel background images must be labeled with a single index as _1,_2,...');
+            return
+        end
+        set(hObject,'UserData',filebackground);%store for future use
+        testmask=1;
+    end
+end
+if testmask
+    set(handles.Background,'Visible','on')
+    set(handles.Background,'String',filebackground)
+    set(handles.CheckBackground,'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')
+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 ¶

@@ -256 +256 @@
 
 %% introduce input image transform
+transform_fct=[];%default, no transform
 if isfield(Param,'FieldTransform')&&~isempty(Param.FieldTransform.TransformName)
         addpath(Param.FieldTransform.TransformPath)
@@ -265 +266 @@
 %%%%% MAIN LOOP %%%%%%
 maskoldname='';% initiate the mask name
+backgroundoldname='';
 FileType_A='';
 FileType_B='';
@@ -384 +386 @@
             end
         end
+
+ % case of background image to subtract
+        if par_civ1.CheckBackground &&~isempty(par_civ1.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_civ1,'NbSlice')
+                i1_background=mod(i1-1,par_civ1.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_civ1.NbSlice_j=par_civ1.NbSlice;
+                end
+            else
+                backgroundname=Param.ActionInput.Civ1.Background;
+            end
+            if strcmp(backgroundoldname,backgroundname)% background exist, not already read in civ1
+                par_civ1.Background=background; %use background already opened
+            else
+                if ~isempty(regexp(backgroundname,'(^http://)|(^https://)', 'once'))|| exist(backgroundname,'file')
+                    try
+                        par_civ1.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_civ1.Background=[];
+                end
+                background=par_civ1.Background;
+                backgroundoldname=backgroundname;
+            end
+            par_civ1.ImageA=par_civ1.ImageA-par_civ1.Background;
+            par_civ1.ImageB=par_civ1.ImageB-par_civ1.Background;
+        end
+
+
         %% user defined image transform
         if ~isempty(transform_fct)
@@ -472 +517 @@
             end
         end
-        
+
         % case of input grid
         if par_civ1.CheckGrid &&~isempty(par_civ1.Grid)

trunk/src/uvmat.m ¶

@@ -4385 +4385 @@
                 C=reshape(double(B),1,nxy(1)*nxy(2));% reshape in a vector
                 Histo.histo(:,col)=hist(C, Histo.(FieldName));  %calculate histogram
-                if isequal(get(handles.LogLinHisto,'Value'),2)
-                    PlotParam.Type='semilogx';
-                else
-                    PlotParam.Type='plot';
+                switch get(handles.LogLinHisto,'Value')
+                    case 1
+                        PlotParam.Type='plot';
+                    case 2
+                    PlotParam.Type='semilogy';
+                    case 3
+                       PlotParam.Type='semilogx'; 
+                    case 4
+                    PlotParam.Type='loglog';
                 end
             end