Changeset 1173 for trunk/src

Timestamp:

Feb 25, 2025, 5:52:46 PM (2 weeks ago)

Author:

sommeria

Message:

bug geometry calibration corrected

Location:

trunk/src

Files:

• geometry_calib.m (modified) (8 diffs)
• mouse_down.m (modified) (2 diffs)

trunk/src/geometry_calib.m

@@ -726 +726 @@
 
 %------------------------------------------------------------------------
-function GeometryCalib=calib_3D_extrinsic(Coord,est_dist, Intrinsic)
+function [GeometryCalib,errormsg]=calib_3D_extrinsic(Coord,est_dist, Intrinsic)
 %------------------------------------------------------------------
+errormsg='';
 path_uvmat=which('geometry_calib');% check the path detected for source file uvmat
 path_UVMAT=fileparts(path_uvmat); %path to UVMAT
@@ -740 +741 @@
 ny=str2double(get(hhuvmat.num_Npy,'String'));
 x_1(2,:)=ny-x_1(2,:);%reverse the y image coordinates
-n_ima=1;
+%n_ima=1;
 GeometryCalib.CalibrationType='3D_extrinsic';
 fx=Intrinsic.fx;
@@ -747 +748 @@
 Cy=Intrinsic.Cy;
 kc=Intrinsic.kc;
-errormsg='';
 if isempty(fx)
     errormsg='focal length fx needs to be introduced';
@@ -759 +759 @@
 if ~isempty(errormsg)
     GeometryCalib=[];
-    msgbox_uvmat('ERROR',errormsg)
-    return
+     msgbox_uvmat('ERROR',errormsg)
+     return
 end
 GeometryCalib.fx_fy(1)=fx;
@@ -896 +896 @@
 %------------------------------------------------------------------------
 choice=get(handles.CheckEnableMouse,'Value');
-if choice
+if choice% if button selected
+    set(handles.CheckEnableMouse,'BackgroundColor',[1 1 0])
     huvmat=findobj(allchild(0),'tag','uvmat');
     if ishandle(huvmat)
@@ -907 +908 @@
         set(hhuvmat.MenuRuler,'checked','off')%desactivate ruler
     end
+    if ~isequal(get(hhuvmat.TransformName,'Value'),1) %active if transform function is activated to return to the raw image
+        set(hhuvmat.TransformName,'Value',1)
+        uvmat('TransformName_Callback',hObject,eventdata,hhuvmat); %file input with xml reading  in uvmat
+        set(hhuvmat.CheckFixLimits,'Value',0)% put FixedLimits option to 'off' (to sse the whole field)
+         PLOT_Callback(hObject, eventdata, handles)
+    end
+else
+      set(handles.CheckEnableMouse,'BackgroundColor',[0.7 0.7 0.7])
 end
 
@@ -1298 +1307 @@
     Heading=s.Heading;
 end
+checkcoord=false;
 if isfield (s,'GeometryCalib')
-GeometryCalib=s.GeometryCalib;
-fx=1;fy=1;Cx=0;Cy=0;kc=0; %default
-CoordCell={};
-Tabchar={};%default
-val_cal=1;%default
-if ~isempty(GeometryCalib)
-    % choose the calibration option
-    if isfield(GeometryCalib,'CalibrationType')
-        calib_list=get(handles.calib_type,'String');
-        for ilist=1:numel(calib_list)
-            if strcmp(calib_list{ilist},GeometryCalib.CalibrationType)
-                val_cal=ilist;
-                break
+    GeometryCalib=s.GeometryCalib;
+    %fx=1;fy=1;Cx=0;Cy=0;kc=0; %default
+    %CoordCell={};
+    %Tabchar={};%default
+    val_cal=1;%default
+    if ~isempty(GeometryCalib)
+        % choose the calibration option
+        if isfield(GeometryCalib,'CalibrationType')
+            calib_list=get(handles.calib_type,'String');
+            for ilist=1:numel(calib_list)
+                if strcmp(calib_list{ilist},GeometryCalib.CalibrationType)
+                    val_cal=ilist;
+                    break
+                end
             end
         end
-    end
-    display_intrinsic(GeometryCalib,handles)%intrinsic param
-    %extrinsic param
-    if isfield(GeometryCalib,'Tx_Ty_Tz')
-        Tx_Ty_Tz=GeometryCalib.Tx_Ty_Tz;
-        set(handles.Tx,'String',num2str(GeometryCalib.Tx_Ty_Tz(1),4))
-        set(handles.Ty,'String',num2str(GeometryCalib.Tx_Ty_Tz(2),4))
-        set(handles.Tz,'String',num2str(GeometryCalib.Tx_Ty_Tz(3),4))
-    end
-    if isfield(GeometryCalib,'omc')
-        set(handles.Phi,'String',num2str(GeometryCalib.omc(1),4))
-        set(handles.Theta,'String',num2str(GeometryCalib.omc(2),4))
-        set(handles.Psi,'String',num2str(GeometryCalib.omc(3),4))
-    end
-    if isfield(GeometryCalib,'SourceCalib')&& isfield(GeometryCalib.SourceCalib,'PointCoord')
-        calib=GeometryCalib.SourceCalib.PointCoord;
-        Coord=[calib zeros(size(calib,1),1)];
-        set(handles.ListCoord,'Data',Coord)
-    end
-    PLOT_Callback(handles.geometry_calib, [], handles)
-    set(handles.APPLY,'BackgroundColor',[1 0 1])
-end
-set(handles.calib_type,'Value',val_cal)
-
-if isempty(CoordCell)% allow mouse action by default in the absence of input points
+        display_intrinsic(GeometryCalib,handles)%intrinsic param
+        %extrinsic param
+        if isfield(GeometryCalib,'Tx_Ty_Tz')
+            %Tx_Ty_Tz=GeometryCalib.Tx_Ty_Tz;
+            set(handles.Tx,'String',num2str(GeometryCalib.Tx_Ty_Tz(1),4))
+            set(handles.Ty,'String',num2str(GeometryCalib.Tx_Ty_Tz(2),4))
+            set(handles.Tz,'String',num2str(GeometryCalib.Tx_Ty_Tz(3),4))
+        end
+        if isfield(GeometryCalib,'omc')
+            set(handles.Phi,'String',num2str(GeometryCalib.omc(1),4))
+            set(handles.Theta,'String',num2str(GeometryCalib.omc(2),4))
+            set(handles.Psi,'String',num2str(GeometryCalib.omc(3),4))
+        end
+        if isfield(GeometryCalib,'SourceCalib')&& isfield(GeometryCalib.SourceCalib,'PointCoord')
+            calib=GeometryCalib.SourceCalib.PointCoord;
+            Coord=[calib zeros(size(calib,1),1)];
+            set(handles.ListCoord,'Data',Coord)
+            checkcoord=true;
+        end
+        PLOT_Callback(handles.geometry_calib, [], handles)
+        set(handles.APPLY,'BackgroundColor',[1 0 1])
+    end
+    set(handles.calib_type,'Value',val_cal)
+end    
+if checkcoord % does not allow mouse action by default in the presence of input points
+    set(handles.CheckEnableMouse,'Value',0)
+    set(handles.CheckEnableMouse,'BackgroundColor',[0.7 0.7 0.7])
+else   % allow mouse action by default in the absence of input points
     set(handles.CheckEnableMouse,'Value',1)
     set(handles.CheckEnableMouse,'BackgroundColor',[1 1 0])
-else % does not allow mouse action by default in the presence of input points
-    set(handles.CheckEnableMouse,'Value',0)
-    set(handles.CheckEnableMouse,'BackgroundColor',[0.7 0.7 0.7])
-end
-end
+end
+
 %------------------------------------------------------------------------
 %---display calibration intrinsic parameters
@@ -1456 +1467 @@
 Coord=get(handles.ListCoord,'Data');
 iline=eventdata.Indices(1);% selected line number
-if size(Coord,1)<iline+numel(Input)
+if numel(Input)>1 && size(Coord,1)<iline+numel(Input)
     Coord=[Coord ; zeros(iline+numel(Input)-size(Coord,1),6)];% append zeros to fit the new column
 end

trunk/src/mouse_down.m

@@ -485 +485 @@
     h_CheckEnableMouse=hh_geometry_calib.CheckEnableMouse;
     if isequal(get(h_CheckEnableMouse,'Value'),1) && ~isempty(haxes)
-        if ~isequal(get(hhuvmat.TransformName,'Value'),1); %active only with no transform (px coordinates)
+        if ~isequal(get(hhuvmat.TransformName,'Value'),1) %active only with no transform (px coordinates)
             set(hhuvmat.TransformName,'Value',1)
             uvmat('TransformName_Callback',hObject,eventdata,hhuvmat); %file input with xml reading  in uvmat
@@ -493 +493 @@
         h_ListCoord=hh_geometry_calib.ListCoord; %findobj(h_geometry_calib,'Tag','ListCoord');
         Coord=get(h_ListCoord,'Data');
-        Coord=Coord(:,1:6);
+        if size(Coord,2)>6
+        Coord(:,7:end)=[];
+        end
         %data=read_geometry_calib(Coord);%transform char cell to numbers
         xlim=get(haxes,'XLim');