Changeset 892

Timestamp:

Apr 25, 2015, 6:17:19 PM (10 years ago)

Author:

sommeria

Message:

bug in refraction index fixed

Location:

trunk/src

Files:

• phys_ima.m (modified) (2 diffs)
• px_XYZ.m (modified) (1 diff)
• uvmat.m (modified) (6 diffs)

trunk/src/phys_ima.m

@@ +1 @@
+
 % phys_ima: transform several images in phys coordinates on a common pixel grid
 %------------------------------------------------------------------------
@@ -61 +62 @@
            SliceCoord=Calib.SliceCoord(ZIndex,:);
            zphys=SliceCoord(3); %to generalize for non-parallel planes
-           if isfield(Calib,'InterfaceCoord') && isfield(Calib,'RefractionIndex') 
-                H=Calib.InterfaceCoord(3);
-                if H>zphys
-                    zphys=H-(H-zphys)/Calib.RefractionIndex; %corrected z (virtual object)
-                end
-           end
+%            if isfield(Calib,'InterfaceCoord') && isfield(Calib,'RefractionIndex') 
+%                 H=Calib.InterfaceCoord(3);
+%                 if H>zphys
+%                     zphys=H-(H-zphys)/Calib.RefractionIndex; %corrected z (virtual object)
+%                 end
+%            end
         end
         xima=0.5:npx-0.5;%image coordinates of corners

trunk/src/px_XYZ.m

@@ -48 +48 @@
         if H>Zphys
             Zphys=H-(H-Zphys)/Calib.RefractionIndex; %corrected z (virtual object)
-            test_refraction=1;
+          %  test_refraction=1;
         end
     end

trunk/src/uvmat.m

@@ -1083 +1083 @@
 
 UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface 
-check=0;
+% check=0;
 if isfield(UvData,'XmlData')&&isfield(UvData.XmlData{1},'GeometryCalib')&& isfield(UvData.XmlData{1}.GeometryCalib,'SliceCoord')
     GeometryCalib=UvData.XmlData{1}.GeometryCalib;
@@ -1101 +1101 @@
 end     
 RefractionIndex=1.33;
+CheckRefraction=0;% default value of the check box refraction 
 if isfield(GeometryCalib,'RefractionIndex')
     RefractionIndex=GeometryCalib.RefractionIndex;
+    CheckRefraction=1;
 end     
 SliceAngle=[0 0 0];
@@ -1141 +1143 @@
     '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
 %  raw 3 of the GUI
-uicontrol('Style','checkbox','Units','normalized', 'Position', [2*ii+ww 0.95-3*ii-2*hh 2*ww hh],'tag','CheckRefraction','BackgroundColor',BackgroundColor,...
+hcheckrefraction=uicontrol('Style','checkbox','Units','normalized', 'Position', [2*ii+ww 0.95-3*ii-2*hh 2*ww hh],'tag','CheckRefraction','BackgroundColor',BackgroundColor,...
     'Callback',@(hObject,eventdata)set_slice_CheckRefraction_Callback(hObject,eventdata),...
-    'String','refraction','Value',0,'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''CheckRefraction'':=1 to provide refraction correction');
+    'String','refraction','Value',CheckRefraction,'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''CheckRefraction'':=1 to provide refraction correction');
 uicontrol('Style','text','Units','normalized', 'Position', [2*ii+2*ww 0.95-3*ii-1.75*hh ww hh/2],'BackgroundColor',BackgroundColor,'Tag','Refraction_title',...
     'String','index','Visible','off','FontUnits','points','FontSize',12,'FontWeight','bold','ForegroundColor','blue','HorizontalAlignment','right');%title
@@ -1165 +1167 @@
     'String','tild angle y axis','FontUnits','points','FontSize',12,'FontWeight','bold','ForegroundColor','blue','HorizontalAlignment','center');%title
 %  raw 6 of the GUI
-% uicontrol('Style','text','Units','normalized', 'Position', [ii 0.95-5*ii-4.75*hh 2*ww hh/2],'BackgroundColor',BackgroundColor,'Tag','NbSlice_title',...
-%     'String','tilt angle','FontUnits','points','FontSize',12,'FontWeight','bold','ForegroundColor','blue','HorizontalAlignment','right');%title
 uicontrol('Style','edit','Units','normalized', 'Position', [3*ii+2*ww 0.95-5*ii-4.2*hh ww hh],'tag','num_SliceAngle_1_1','BackgroundColor',[1 1 1],...
     'String',num2str(SliceAngle(1)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceAngle_1_1'':first slice angle of inclination around the x axis');%edit box
@@ -1185 +1185 @@
     'String','Cancel','FontWeight','bold','FontUnits','points','FontSize',12,'TooltipString','''Cancel'': quit GUI without action');
 drawnow
+set_slice_CheckRefraction_Callback(hcheckrefraction,[])
 
 %------------------------------------------------------------------------
@@ -1235 +1236 @@
     GeometryCalib.InterfaceCoord=[0 0 SliceData.H];
     GeometryCalib.RefractionIndex=SliceData.RefractionIndex;
+elseif isfield(GeometryCalib,'RefractionIndex')
+    GeometryCalib=rmfield(GeometryCalib,'RefractionIndex');
+    GeometryCalib=rmfield(GeometryCalib,'InterfaceCoord');  
 end