Changeset 1112 for trunk/src/uvmat.m

Timestamp:

Jan 26, 2022, 7:37:21 PM (2 years ago)

Author:

sommeria

Message:

set_slice separated from geometrey_calib

File:

• trunk/src/uvmat.m (modified) (14 diffs)

trunk/src/uvmat.m

@@ -1208 +1208 @@
 
 UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface
-% check=0;
-if isfield(UvData,'XmlData')&&isfield(UvData.XmlData{1},'GeometryCalib')&& isfield(UvData.XmlData{1}.GeometryCalib,'SliceCoord')
-    GeometryCalib=UvData.XmlData{1}.GeometryCalib;
-else
-    msgbox_uvmat('ERROR','3D geometric calibration needed before defining slices')
-    return
-end
-SliceCoord=GeometryCalib.SliceCoord;
-InterfaceCoord=min(SliceCoord(:,3));
-if isfield(GeometryCalib,'InterfaceCoord')
-    InterfaceCoord=GeometryCalib.InterfaceCoord(1,3);
-end
-NbSlice=size(SliceCoord,1);
+Slice=[];
+if isfield(UvData,'XmlData')
+    if isfield(UvData.XmlData{1},'GeometryCalib')&& isfield(UvData.XmlData{1}.GeometryCalib,'SliceCoord')
+        Slice=UvData.XmlData{1}.GeometryCalib;%old convention < 2022
+    elseif isfield(UvData.XmlData{1},'Slice')
+        Slice=UvData.XmlData{1}.Slice;% new convention ( 2022)
+    end
+end
+% default input
+if ~(isfield(Slice,'SliceCoord') && size(Slice.SliceCoord,2)==3)
+    Slice.SliceCoord=[0 0 0];
+end
+InterfaceCoord=min(Slice.SliceCoord(:,3));
+if isfield(Slice,'InterfaceCoord')
+    InterfaceCoord=Slice.InterfaceCoord(1,3);
+end
+NbSlice=size(Slice.SliceCoord,1);
 CheckVolumeScan=0;
-if isfield(GeometryCalib,'CheckVolumeScan')
-    CheckVolumeScan=GeometryCalib.CheckVolumeScan;
+if isfield(Slice,'CheckVolumeScan')
+    CheckVolumeScan=Slice.CheckVolumeScan;
 end
 RefractionIndex=1.33;
 CheckRefraction=0;% default value of the check box refraction
-if isfield(GeometryCalib,'RefractionIndex')
-    RefractionIndex=GeometryCalib.RefractionIndex;
+if isfield(Slice,'RefractionIndex')
+    RefractionIndex=Slice.RefractionIndex;
     CheckRefraction=1;
 end
 SliceAngle=[0 0 0];
-if isfield(GeometryCalib,'SliceAngle')
-    SliceAngle=GeometryCalib.SliceAngle;
+if isfield(Slice,'SliceAngle')
+    SliceAngle=Slice.SliceAngle;
 end
 
@@ -1244 +1248 @@
 Bottom=ScreenSize(4)-Height-40; %put fig at top right
 hfig=findobj(allchild(0),'Tag','set_slice');
-if ~isempty(hfig),delete(hfig), end; %delete existing version of the GUI
-hfig=figure('name','set_slices','tag','set_slice','MenuBar','none','NumberTitle','off','Units','pixels','Position',[Left,Bottom,Width,Height],'UserData',GeometryCalib);
+if ~isempty(hfig),delete(hfig), end %delete existing version of the GUI
+hfig=figure('name','set_slices','tag','set_slice','MenuBar','none','NumberTitle','off','Units','pixels','Position',[Left,Bottom,Width,Height],'UserData',Slice);
 BackgroundColor=get(hfig,'Color');
 hh=0.14; % box height (relative)
@@ -1262 +1266 @@
     'String','Z','FontUnits','points','FontSize',12,'FontWeight','bold','ForegroundColor','blue','HorizontalAlignment','right');%title
 uicontrol('Style','edit','Units','normalized', 'Position', [2*ii+ww 0.95-2*ii-hh ww hh],'tag','num_Z_1','BackgroundColor',[1 1 1],...
-    'String',num2str(SliceCoord(1,3)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_Z_1'': z position of first slice');%edit box
+    'String',num2str(Slice.SliceCoord(1,3)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_Z_1'': z position of first slice');%edit box
 uicontrol('Style','edit','Units','normalized', 'Position', [3*ii+2*ww 0.95-2*ii-hh ww hh],'tag','num_Z_2','BackgroundColor',[1 1 1],...
-    'String',num2str(SliceCoord(end,3)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_Z_2'': z position of last slice');%edit box
+    'String',num2str(Slice.SliceCoord(end,3)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_Z_2'': z position of last slice');%edit box
 uicontrol('Style','edit','Units','normalized', 'Position', [4*ii+3*ww 0.95-2*ii-hh ww hh],'tag','num_H','BackgroundColor',[1 1 1],...
     'String',num2str(InterfaceCoord),'Visible','off','FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_H'': z position of the water surface (=Z_1 in air)');%edit box
@@ -1291 +1295 @@
 
 uicontrol('Style','edit','Units','normalized', 'Position', [3*ii+ww 0.95-5*ii-4.2*hh ww hh],'tag','num_SliceCoord_1','BackgroundColor',[1 1 1],...
-    'String',num2str(SliceCoord(1)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceCoord_1'':x position of the tild origin');%edit box
+    'String',num2str(Slice.SliceCoord(1)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceCoord_1'':x position of the tild origin');%edit box
 uicontrol('Style','edit','Units','normalized', 'Position', [3*ii+ww 0.95-6*ii-5.2*hh ww hh],'tag','num_SliceCoord_2','BackgroundColor',[1 1 1],...
-    'String',num2str(SliceCoord(2)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceCoord_2'':y position of the tild origin');%edit box
+    'String',num2str(Slice.SliceCoord(2)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceCoord_2'':y position of the tild origin');%edit box
 
 uicontrol('Style','text','Units','normalized', 'Position', [ii 0.95-5*ii-4*hh 1.3*ww hh/2],'BackgroundColor',BackgroundColor,'Tag','Angle_title_1',...
@@ -1349 +1353 @@
 [RootPath,SubDir,RootFile,tild,tild,tild,tild,FileExt]=fileparts_uvmat(FileName);
 XmlFile=find_imadoc(RootPath,SubDir,RootFile,FileExt);%find name of the relevant xml file
-[s,errormsg]=imadoc2struct(XmlFile,'GeometryCalib');%read the xml file
-if~isempty(errormsg)
-    msgbox_uvmat('ERROR',errormsg)
-    return
-end
-GeometryCalib=s.GeometryCalib;% get thegeometric calibration data
+% [s,errormsg]=imadoc2struct(XmlFile,'Slice');%read the xml file
+% if~isempty(errormsg)
+%     msgbox_uvmat('ERROR',errormsg)
+%     return
+% end
+% Slice=s.Slice;% get thegeometric calibration data
 
 %% read the content of the GUI set_slice
@@ -1361 +1365 @@
 Z_plane=str2num(get(hZ,'String'));% set of Z positions explicitly entered as a Matlab vector
 SliceData=read_GUI(hset_slice);
-GeometryCalib.NbSlice=SliceData.NbSlice;
-GeometryCalib.CheckVolumeScan=SliceData.CheckVolumeScan;
+Slice.NbSlice=SliceData.NbSlice;
+Slice.CheckVolumeScan=SliceData.CheckVolumeScan;
 if numel(Z_plane)<=2
     Z_plane=linspace(SliceData.Z(1),SliceData.Z(2),SliceData.NbSlice);
@@ -1368 +1372 @@
     set(hZ,'String',num2str(Z_plane))% restitute the display qfter reqding by read_GUI
 end
-GeometryCalib.SliceCoord=Z_plane'*[0 0 1];
-GeometryCalib.SliceCoord(:,1)=SliceData.SliceCoord(1);
-GeometryCalib.SliceCoord(:,2)=SliceData.SliceCoord(2);
-GeometryCalib.SliceAngle=zeros(GeometryCalib.NbSlice,3);
+Slice.SliceCoord=Z_plane'*[0 0 1];
+Slice.SliceCoord(:,1)=SliceData.SliceCoord(1);
+Slice.SliceCoord(:,2)=SliceData.SliceCoord(2);
+Slice.SliceAngle=zeros(Slice.NbSlice,3);
 Angle_1=linspace(SliceData.SliceAngle_1(1),SliceData.SliceAngle_1(2),SliceData.NbSlice);
 Angle_2=linspace(SliceData.SliceAngle_2(1),SliceData.SliceAngle_2(2),SliceData.NbSlice);
-GeometryCalib.SliceAngle(:,1)=Angle_1';%rotation angle around x axis 
-GeometryCalib.SliceAngle(:,2)=Angle_2';%rotation angle around y axis 
-GeometryCalib.SliceAngle(:,3)=0;
+Slice.SliceAngle(:,1)=Angle_1';%rotation angle around x axis 
+Slice.SliceAngle(:,2)=Angle_2';%rotation angle around y axis 
+Slice.SliceAngle(:,3)=0;
 if SliceData.CheckRefraction
-    GeometryCalib.InterfaceCoord=[0 0 SliceData.H];
-    GeometryCalib.RefractionIndex=SliceData.RefractionIndex;
-elseif isfield(GeometryCalib,'RefractionIndex')
-    GeometryCalib=rmfield(GeometryCalib,'RefractionIndex');
-    GeometryCalib=rmfield(GeometryCalib,'InterfaceCoord');
+    Slice.InterfaceCoord=[0 0 SliceData.H];
+    Slice.RefractionIndex=SliceData.RefractionIndex;
+elseif isfield(Slice,'RefractionIndex')
+    Slice=rmfield(Slice,'RefractionIndex');
+    Slice=rmfield(Slice,'InterfaceCoord');
 end
 
@@ -1430 +1434 @@
                 check_update=0;
             end
-            errormsg=update_imadoc(GeometryCalib,XmlName,'GeometryCalib');% introduce the calibration data in the xml file
+            errormsg=update_imadoc(Slice,XmlName,'Slice');% introduce the calibration data in the xml file
             if ~strcmp(errormsg,'')
                 msgbox_uvmat('ERROR',errormsg);
@@ -1446 +1450 @@
     
     %% store the result in the xml file used for calibration
-    errormsg=update_imadoc(GeometryCalib,XmlFile,'GeometryCalib');% introduce the calibration data in the xml file
+    errormsg=update_imadoc(Slice,XmlFile,'Slice');% introduce the calibration data in the xml file
     if strcmp(errormsg,'')
         msgbox_uvmat('CONFIRMATION',['slice positions saved in ' XmlFile]);
@@ -1925 +1929 @@
                             pos(:,3)=pos(:,3)+Calib.SliceCoord(3);
                         end
-                        [X,Y]=px_XYZ(Calib,pos(:,1),pos(:,2),pos(:,3));
+                        [X,Y]=px_XYZ(Calib,Slice,pos(:,1),pos(:,2),pos(:,3));
                     end
                     flagobj=~inpolygon(Xi,Yi,X',Y');%=0 inside the polygon, 1 outside
@@ -2479 +2483 @@
         drawnow
         if isfield(XmlDataRead, 'GeometryCalib') && ~isempty(XmlDataRead.GeometryCalib)
-            XmlData.GeometryCalib=XmlDataRead.GeometryCalib;
-            if isfield(XmlData.GeometryCalib,'CheckVolumeScan') && isequal(XmlData.GeometryCalib.CheckVolumeScan,1)
+            XmlData.GeometryCalib=XmlDataRead.GeometryCalib;      
+        end
+        XmlData.Slice=XmlData.GeometryCalib;%default
+        if isfield(XmlDataRead, 'Slice') && ~isempty(XmlDataRead.Slice)
+            XmlData.Slice=XmlDataRead.Slice;
+            % check whether the GUI geometry_calib is opened
+%             hgeometry_calib=findobj('tag','geometry_calib');
+%             if ~isempty(hgeometry_calib) % check whether the display of the GUI geometry_calib is consistent with the current calib param
+%                 GUserData=get(hgeometry_calib,'UserData');
+%                 if ~(isfield(GUserData,'XmlInputFile') && strcmp(GUserData.XmlInputFile,XmlFileName))
+%                     answer=msgbox_uvmat('INPUT_Y-N','refresh the display of the GUI geometry_calib with the new input data?');
+%                     if strcmp(answer,'Yes')
+%                         geometry_calib(XmlFileName);%diplay the new calibration points and parameters in geometry_calib
+%                     end
+%                 end
+%             end
+        end
+        if isfield(XmlData.Slice,'CheckVolumeScan') && isequal(XmlData.Slice.CheckVolumeScan,1)
                 set (handles.slices,'String','volume')
             end
-            % check whether the GUI geometry_calib is opened
-            hgeometry_calib=findobj('tag','geometry_calib');
-            if ~isempty(hgeometry_calib) % check whether the display of the GUI geometry_calib is consistent with the current calib param
-                GUserData=get(hgeometry_calib,'UserData');
-                if ~(isfield(GUserData,'XmlInputFile') && strcmp(GUserData.XmlInputFile,XmlFileName))
-                    answer=msgbox_uvmat('INPUT_Y-N','refresh the display of the GUI geometry_calib with the new input data?');
-                    if strcmp(answer,'Yes')
-                        geometry_calib(XmlFileName);%diplay the new calibration points and parameters in geometry_calib
-                    end
-                end
-            end
-        end
         if isfield(XmlDataRead, 'LIFCalib')
             XmlData.LIFCalib=XmlDataRead.LIFCalib;
@@ -2571 +2579 @@
             set(handles.TransformName,'Value',3); % phys transform by default if fixedLimits is off
         end
-        if isfield(GeometryCalib,'SliceCoord')
-           siz=size(GeometryCalib.SliceCoord);
+        if isfield(XmlData.Slice,'SliceCoord')
+           siz=size(XmlData.Slice.SliceCoord);
            if siz(1)>1
                NbSlice=siz(1);
@@ -2578 +2586 @@
                set(handles.slices,'Value',1)
            end
-           if isfield(GeometryCalib,'CheckVolumeScan') && isequal(GeometryCalib.CheckVolumeScan,1)
+           if isfield(XmlData.Slice,'CheckVolumeScan') && isequal(XmlData.Slice.CheckVolumeScan,1)
                set(handles.num_NbSlice,'Visible','off')
            else
@@ -5183 +5191 @@
                     Y=ObjectData.Coord(:,2);
                     if testphys
-                        [X,Y]=px_XYZ(Calib,X,Y,0);% to generalise with 3D cases
+                        [X,Y]=px_XYZ(Calib,[],X,Y,0);% to generalise with 3D cases
                     end
                     flagobj=~inpolygon(Xi,Yi,X',Y');%=0 inside the polygon, 1 outside