Changeset 1150 for trunk/src/geometry_calib.m

Timestamp:

Jun 24, 2024, 6:38:26 PM (6 days ago)

Author:

sommeria

Message:

browse_data improved

File:

• trunk/src/geometry_calib.m (modified) (4 diffs)

trunk/src/geometry_calib.m

@@ -346 +346 @@
                         display([XmlName ' updated with calibration parameters' dispmessage])
                     else
-                        display([XmlName ' created with calibration parameters' dispmessage])
+                        display([XmlName ' created with calibration parameters: no timing defined' dispmessage])
                     end
                 end
@@ -396 +396 @@
 %------------------------------------------------------------------------
 % --- Executes on button press in Replicate
-    function Replicate_Callback(hObject, eventdata, handles)
-        % %------------------------------------------------------------------------
-        set(handles.CheckEnableMouse,'Value',0)% desactivate mouse (to avoid spurious creation of new points)
-        
-        if get(handles.Replicate,'Value') %open the GUI browse_data
-            % look for the GUI uvmat and check for an image as input
-            huvmat=findobj(allchild(0),'Name','uvmat');
-            hhuvmat=guidata(huvmat);%handles of elements in the GUI uvmat
-            RootPath=get(hhuvmat.RootPath,'String');
-            SubDir=get(hhuvmat.SubDir,'String');
-            browse_data(fullfile(RootPath,SubDir))
-        else
-            hbrowse=findobj(allchild(0),'Tag','browse_data');
-            if ~isempty(hbrowse)
-                delete(hbrowse)
-            end
-        end
+function Replicate_Callback(hObject, eventdata, handles)
+% %------------------------------------------------------------------------
+set(handles.CheckEnableMouse,'Value',0)% desactivate mouse (to avoid spurious creation of new points)
+
+if get(handles.Replicate,'Value') %open the GUI browse_data
+    % look for the GUI uvmat and check for an image as input
+    huvmat=findobj(allchild(0),'Name','uvmat');
+    hhuvmat=guidata(huvmat);%handles of elements in the GUI uvmat
+    RootPath=get(hhuvmat.RootPath,'String');
+    SubDir=get(hhuvmat.SubDir,'String');
+    browse_data(fullfile(RootPath,SubDir))
+else
+    hbrowse=findobj(allchild(0),'Tag','browse_data');
+    if ~isempty(hbrowse)
+        delete(hbrowse)
+    end
+end
 %------------------------------------------------------------------------
 % --- activate calibration and store parameters in ouputfile .
@@ -1294 +1294 @@
     Heading=s.Heading;
 end
-
+if isfield (s,'GeometryCalib')
 GeometryCalib=s.GeometryCalib;
 fx=1;fy=1;Cx=0;Cy=0;kc=0; %default
@@ -1341 +1341 @@
     set(handles.CheckEnableMouse,'BackgroundColor',[0.7 0.7 0.7])
 end
-
+end
 %------------------------------------------------------------------------
 %---display calibration intrinsic parameters