Changeset 1063 for trunk/src

Timestamp:

Apr 17, 2019, 6:22:25 PM (6 years ago)

Author:

sommeria

Message:

geometric calibration corrected

Location:

trunk/src

Files:

• browse_data.fig (modified) (previous)
• browse_data.m (modified) (14 diffs)
• geometry_calib.m (modified) (3 diffs)
• set_object.m (modified) (1 diff)

trunk/src/browse_data.m

@@ -24 +24 @@
 function varargout = browse_data(varargin)
 
-% Last Modified by GUIDE v2.5 08-Sep-2018 19:03:40
+% Last Modified by GUIDE v2.5 17-Apr-2019 18:15:24
 
 % Begin initialization code - DO NOT EDIT
@@ -75 +75 @@
 set(hObject, 'Units', OldUnits);
 if exist('MultiDevices','var') && strcmp(MultiDevices,'on')
-    set(handles.ListDevices,'Max',2)
-else
-    set(handles.ListDevices,'Max',1)
+    set(handles.DataSeries,'Max',2)
+else
+    set(handles.DataSeries,'Max',1)
 end
 if exist('EnableMirror','var') && strcmp(EnableMirror,'on')
@@ -212 +212 @@
 % List the experiments in a campaign, filling the menu ListExperiments
 %------------------------------------------------------------------------
-function errormsg=scan_campaign(handles,Campaign,Experiment,DataSeries)
+function errormsg=scan_campaign(handles,Campaign,Experiment,DataInput)
 %------------------------------------------------------------------------
 errormsg='';
@@ -233 +233 @@
     set(handles.ListExperiments,'Value',index)% initialise the menu selection with the folder defined by the input
     ListExperiments_Callback([],[], handles)
-    ListDevices=get(handles.ListDevices,'String');
-    index=find(strcmp(['+/' DataSeries],ListDevices));
+    DataSeries=get(handles.DataSeries,'String');
+    index=find(strcmp(['+/' DataInput],DataSeries));
     if isempty(index)
-        index=find(strcmp(['~/' DataSeries],ListDevices));
+        index=find(strcmp(['~/' DataInput],DataSeries));
     end
     if ~isempty(index)
-          set(handles.ListDevices,'Value',index)
+          set(handles.DataSeries,'Value',index)
     end
 else
@@ -270 +270 @@
  function list_dataseries(handles,ListExperiments,MirrorPath)
 
-ListDevices={};
+DataSeries={};
 for iexp=1:numel(ListExperiments)
     if strcmp(ListExperiments{iexp}(1),'+')% if the item is a directory
@@ -295 +295 @@
                         ListFiles{ilist}=['+/' ListFiles{ilist}];%mark dir by '+' in the list
                     end
-                    if isempty(find(strcmp(ListFiles{ilist},ListDevices), 1))% if the item is not already in ListDevices
-                        ListDevices=[ListDevices;ListFiles{ilist}]; %append the item to the list
+                    if isempty(find(strcmp(ListFiles{ilist},DataSeries), 1))% if the item is not already in DataSeries
+                        DataSeries=[DataSeries;ListFiles{ilist}]; %append the item to the list
                     end                   
                 end
@@ -303 +303 @@
     end
 end
-set(handles.ListDevices,'Value',1)
-set(handles.ListDevices,'String',sort(ListDevices))
+set(handles.DataSeries,'Value',1)
+set(handles.DataSeries,'String',sort(DataSeries))
 
 %------------------------------------------------------------------------
@@ -311 +311 @@
  function update_experiments(handles,ListExperiments,CampaignPath,MirrorPath)
 
-ListDevices={};
+DataSeries={};
 for iexp=1:numel(ListExperiments)
     if strcmp(ListExperiments{iexp}(1),'+')% if the item is a directory
@@ -350 +350 @@
                         system(['ln -s ' DataSeries ' ' mirror]); % create the link to the source folder                     
                     end
-                    if isempty(find(strcmp(ListFiles{ilist},ListDevices), 1))% if the item is not already in ListDevices
+                    if isempty(find(strcmp(ListFiles{ilist},DataSeries), 1))% if the item is not already in DataSeries
                         if check_dir(ilist)
                             ListFiles{ilist}=['+/' ListFiles{ilist}];%mark dir by '+' in the list
                         end
-                        ListDevices=[ListDevices;ListFiles{ilist}]; %append the item to the list
+                        DataSeries=[DataSeries;ListFiles{ilist}]; %append the item to the list
                     end
                 end
@@ -361 +361 @@
     end
 end
-set(handles.ListDevices,'String',sort(ListDevices))
+set(handles.DataSeries,'String',sort(DataSeries))
 
 %------------------------------------------------------------------------
@@ -464 +464 @@
 end
 Experiment=regexprep(Experiment,'^\+/','');% remove the +/ used to mark dir
-Device=get(handles.ListDevices,'String');
-Value=get(handles.ListDevices,'Value');
+Device=get(handles.DataSeries,'String');
+Value=get(handles.DataSeries,'Value');
 Device=Device(Value);
 Device=regexprep(Device,'^\+/','');% remove the +/ used to mark dir
@@ -553 +553 @@
 function Up_Callback(hObject, eventdata, handles)
 SourceDir=get(handles.SourceDir,'String');
-% Device=ListDevices{get(handles.ListDevices,'Value')};
+% Device=DataSeries{get(handles.DataSeries,'Value')};
 % DataSeries=uigetfile_uvmat('open a data folder',Device,'uigetdir');
 % uiresume(handles.browse_data);
@@ -566 +566 @@
 SourceFolder=regexprep(ListExperiments{list_val(1)},'+','');
 set(handles.SourceDir,'String',fullfile(SourceDir,SourceFolder))
-ListDevices=get(handles.ListDevices,'String');
-ValueDevice=get(handles.ListDevices,'Value');
-set(handles.ListExperiments,'String',ListDevices)
+DataSeries=get(handles.DataSeries,'String');
+ValueDevice=get(handles.DataSeries,'Value');
+set(handles.ListExperiments,'String',DataSeries)
 set(handles.ListExperiments,'Value',ValueDevice)
 ListExperiments_Callback(hObject, [], handles)
-% Device=regexprep(ListDevices{get(handles.ListDevices,'Value')},'+','');
+% Device=regexprep(DataSeries{get(handles.DataSeries,'Value')},'+','');
 % Device=regexprep(Device,'~','');
 % PathDevice=fullfile(SourceDir,SourceFolder,Device);
@@ -578 +578 @@
 % % uiresume(handles.browse_data);
 % browse_data(fullfile(PathDevice,NewDevice))
+
+
+% --- Executes on selection change in DataSeries.
+function DataSeries_Callback(hObject, eventdata, handles)
+% hObject    handle to DataSeries (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: contents = cellstr(get(hObject,'String')) returns DataSeries contents as cell array
+%        contents{get(hObject,'Value')} returns selected item from DataSeries
+
+
+% --- Executes on button press in CheckDevices.
+function CheckDevices_Callback(hObject, eventdata, handles)
+if get(handles.CheckDevices,'Value')
+    set(handles.ListDevices,'Visible','on')
+else
+    set(handles.ListDevices,'Visible','off')
+end

trunk/src/geometry_calib.m

@@ -255 +255 @@
     ['Error max (along x,y)=' num2str(GeometryCalib.ErrorMax) ' pixels'];
     [num2str(numel(ind_removed)) ' points removed']});
+SliceCoord_ref=[0 0 0]; %default reference plane
 if strcmp(answer,'Yes') %store the calibration data
     if strcmp(calib_cell{val}(1:2),'3D')%set the plane position for 3D (projection) calibration
@@ -268 +269 @@
     %%%%% use of the option 'replicate'
     if get(handles.Replicate,'Value')% if the option replicate is activated
+        nbcalib=0;
         %% open the GUI browse_data
         hbrowse=findobj(allchild(0),'Tag','browse_data');
@@ -276 +278 @@
             ListValues=get(BrowseHandles.ListExperiments,'Value');
             ListExperiments=ListExperiments(ListValues);
-            ListDevices=get(BrowseHandles.ListDevices,'String');
-            Val=get(BrowseHandles.ListDevices,'Value');
-            DataFolder=ListDevices{Val};
-            nbcalib=0;
+            DataSeries=get(BrowseHandles.DataSeries,'String');
+            Val=get(BrowseHandles.DataSeries,'Value');
+            DataFolder=DataSeries{Val};
             for ilist=1:numel(ListExperiments)
                 SubDirBase=regexprep(DataFolder,'+/','');
                 ListExperiments{ilist}=regexprep(ListExperiments{ilist},'+/','');
                 XmlName=fullfile(SourceDir,ListExperiments{ilist},[SubDirBase '.xml']);
-                % copy the xml file from the old location if appropriate, then update with the calibration parameters
-                %                 if ~exist(XmlName,'file') && ~isempty(SubDirBase)
-                %                     oldxml=fullfile(OutPut.Campaign,OutPut.Experiment{ilist},SubDirBase,[get(hhuvmat.RootFile,'String') '.xml']);
-                GeometryCalib.SliceCoord=SliceCoord_ref;%default input
-                if exist(XmlName,'file')
-                    %[success,message]=copyfile(oldxml,XmlName);%copy the old xml file to a new one with the new convention
-                    dispmesGeometryCalib=UvData.XmlData{1}.GeometryCalib;
+                errormsg=update_imadoc(GeometryCalib,XmlName,'GeometryCalib');% introduce the calibration data in the xml file
+                if ~strcmp(errormsg,'')
+                    msgbox_uvmat('ERROR',errormsg);
                 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);
-                CheckVolumeScan=0;
-                if isfield(GeometryCalib,'CheckVolumeScan')
-                    CheckVolumeScan=GeometryCalib.CheckVolumeScan;
-                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];
-                if isfield(GeometryCalib,'SliceAngle')
-                    SliceAngle=GeometryCalib.SliceAngle;
-                end
-                dispmessage=' updated with calibration parameters';
-                %                         if ~strcmp(answer,'yes')
-                [XmlDataOld,warntext]=imadoc2struct(XmlName);
-                if isfield(XmlDataOld,'GeometryCalib')
-                    if isfield(XmlDataOld.GeometryCalib,'SliceAngle')
-                        GeometryCalib.SliceAngle=XmlDataOld.GeometryCalib.SliceAngle;
-                    end
-                    if isfield(XmlDataOld.GeometryCalib,'CheckRefraction')
-                        GeometryCalib.SliceAngle=XmlDataOld.GeometryCalib.CheckRefraction;
-                    end
-                    if isfield(XmlDataOld.GeometryCalib,'RefractionIndex')
-                        GeometryCalib.SliceAngle=XmlDataOld.GeometryCalib.RefractionIndex;
-                    end
-                    if isfield(XmlDataOld.GeometryCalib,'InterfaceCoord')
-                        GeometryCalib.SliceAngle=XmlDataOld.GeometryCalib.InterfaceCoord;
-                    end
+                    display([XmlName ' updated with calibration parameters'])
+                    nbcalib=nbcalib+1;
                 end
             end
-
-        else % in case the GUI 'replicate'is not found
-            dispmessage=' created with calibration parameters';
         end
-        errormsg=update_imadoc(GeometryCalib,XmlName,'GeometryCalib');% introduce the calibration data in the xml file
+        msgbox_uvmat('CONFIMATION',[SubDirBase ' calibrated for ' num2str(nbcalib) ' experiments']);  
+    else
+        %% copy the xml file from the old location if appropriate, then update with the calibration parameters
+        if ~exist(outputfile,'file') && ~isempty(SubDirBase)
+            oldxml=[fullfile(RootPath,SubDirBase,get(hhuvmat.RootFile,'String')) '.xml'];
+            if exist(oldxml,'file')
+                [success,message]=copyfile(oldxml,outputfile);%copy the old xml file to a new one with the new convention
+            end
+        end
+        errormsg=update_imadoc(GeometryCalib,outputfile,'GeometryCalib');% introduce the calibration data in the xml file
         if ~strcmp(errormsg,'')
             msgbox_uvmat('ERROR',errormsg);
+        end
+        
+        %% display image with new calibration in the currently opened uvmat interface
+        FieldList=get(hhuvmat.FieldName,'String');
+        val=get(hhuvmat.FieldName,'Value');
+        if strcmp(FieldList{val},'image')
+            set(hhuvmat.CheckFixLimits,'Value',0)% put FixedLimits option to 'off' to plot the whole image
+            UserData=get(handles.geometry_calib,'UserData');
+            UserData.XmlInputFile=outputfile;%save the current xml file name
+            set(handles.geometry_calib,'UserData',UserData)
+            uvmat('InputFileREFRESH_Callback',hObject,eventdata,hhuvmat); %file input with xml reading  in uvmat, show the image in phys coordinates
+            PLOT_Callback(hObject, eventdata, handles)
+            set(handles.CoordLine,'string',num2str(index))
+            Coord=get(handles.ListCoord,'Data');
+            update_calib_marker(Coord(index,:)); %indicate the point with max deviations from phys coord to calibration
+            figure(handles.geometry_calib)% put the GUI geometry_calib in front
         else
-            display([XmlName dispmessage])
-            nbcalib=nbcalib+1;
+            msgbox_uvmat('WARNING','open the image to see the effect of the new calibration')
         end
     end
-    % Use of the option replicate
-end
-msgbox_uvmat('CONFIMATION',[SubDirBase ' calibrated for ' num2str(nbcalib) ' experiments']);
-
-
-%% copy the xml file from the old location if appropriate, then update with the calibration parameters
-if ~exist(outputfile,'file') && ~isempty(SubDirBase)
-    oldxml=[fullfile(RootPath,SubDirBase,get(hhuvmat.RootFile,'String')) '.xml'];
-    if exist(oldxml,'file')
-        [success,message]=copyfile(oldxml,outputfile);%copy the old xml file to a new one with the new convention
-    end
-end
-errormsg=update_imadoc(GeometryCalib,outputfile,'GeometryCalib');% introduce the calibration data in the xml file
-if ~strcmp(errormsg,'')
-    msgbox_uvmat('ERROR',errormsg);
-end
-
-%% display image with new calibration in the currently opened uvmat interface
-FieldList=get(hhuvmat.FieldName,'String');
-val=get(hhuvmat.FieldName,'Value');
-if strcmp(FieldList{val},'image')
-    set(hhuvmat.CheckFixLimits,'Value',0)% put FixedLimits option to 'off' to plot the whole image
-    UserData=get(handles.geometry_calib,'UserData');
-    UserData.XmlInputFile=outputfile;%save the current xml file name
-    set(handles.geometry_calib,'UserData',UserData)
-    uvmat('InputFileREFRESH_Callback',hObject,eventdata,hhuvmat); %file input with xml reading  in uvmat, show the image in phys coordinates
-    PLOT_Callback(hObject, eventdata, handles)
-    set(handles.CoordLine,'string',num2str(index))
-    Coord=get(handles.ListCoord,'Data');
-    update_calib_marker(Coord(index,:)); %indicate the point with max deviations from phys coord to calibration
-    figure(handles.geometry_calib)% put the GUI geometry_calib in front
-else
-    msgbox_uvmat('WARNING','open the image to see the effect of the new calibration')
 end
 
 set(handles.APPLY,'BackgroundColor',[1 0 0]) % set APPLY button to red color
-                    
+
 %------------------------------------------------------------------------
 % --- 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 .

trunk/src/set_object.m

@@ -340 +340 @@
         set(handles.num_RangeX_2,'Visible','on')
         set(handles.num_RangeY_1,'Visible','on')
-        %set(handles.num_RangeY_2,'Visible','on')
+        set(handles.num_RangeY_2,'Visible','on')
         set(handles.num_RangeZ_2,'TooltipString','num_ZMax: range of projection normal to the plane')
         if test3D