Changeset 36 for trunk/src

Timestamp:

Mar 5, 2010, 11:23:19 PM (15 years ago)

Author:

sommeria

Message:

-get_field: functions called by ACTION in the GUI get_field put in the subdirectory get_field (like for series)
-help put in the subdir uvmat_doc, help call in uvmat, civ, geometry calib modified accordingly

Location:

trunk/src

Files:

• civ.m (modified) (10 diffs)
• geometry_calib.m (modified) (9 diffs)
• get_field (added)
• get_field/FFT.m (added)
• get_field/PLOT.m (added)
• get_field/filter_band.m (added)
• read_geometry_calib.m (modified) (1 diff)
• series.m (modified) (2 diffs)
• translate_points.m (modified) (3 diffs)
• uvmat.m (modified) (1 diff)

trunk/src/civ.m

@@ -1315 +1315 @@
     find_pair_indices(handles,mode)
 %------------------------------------------------------------------------
-first_i=str2num(get(handles.first_i,'String'));
-last_i=str2num(get(handles.last_i,'String'));
-incr=str2num(get(handles.incr_i,'String'));
-num1=[first_i:incr:last_i];
+first_i=str2num(get(handles.first_i,'String'));%first index i 
+last_i=str2num(get(handles.last_i,'String'));%last index i 
+incr=str2num(get(handles.incr_i,'String'));% increment
+num1=[first_i:incr:last_i];% list of i indices (reference values for each pair)
 if isequal(get(handles.first_j,'Visible'),'on')
-    first_j=str2num(get(handles.first_j,'String'));
-    last_j=str2num(get(handles.last_j,'String'));
-    incr_j=str2num(get(handles.incr_j,'String'));
+    first_j=str2num(get(handles.first_j,'String'));%first index j
+    last_j=str2num(get(handles.last_j,'String'));%last index j 
+    incr_j=str2num(get(handles.incr_j,'String'));% increment
 else
     first_j=1;
@@ -1328 +1328 @@
     incr_j=1;
 end
-num_j=[first_j:incr_j:last_j];
+num_j=[first_j:incr_j:last_j];% list of j indices (reference values for each pair)
 list_civ1=get(handles.list_pair_civ1,'String');
 index_civ1=get(handles.list_pair_civ1,'Value');
-str_civ1=list_civ1{index_civ1};
+str_civ1=list_civ1{index_civ1};%string defining the image pairs for civ1
 if isempty(str_civ1)||isequal(str_civ1,'')
     msgbox_uvmat('ERROR','no image pair selected for civ1')
@@ -1342 +1342 @@
     index_civ2=index_civ1;
 end
-str_civ2=list_civ2{index_civ2};
-if isequal(first_i,[])|isequal(first_j,[]), errordlg('first field number not defined'),...
-    set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if isequal(last_i,[])| isequal(last_j,[]),errordlg('last field number not defined'),...
-    set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if isequal(incr,[])| isequal(incr_j,[]),errordlg('increment in field number not defined'),...
-    set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if last_i < first_i | last_j < first_j , errordlg('last field number must be larger than the first one'),...
-    set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if isequal (mode,'series(Di)')% |isequal(mode,'st_series(Di)')    
+str_civ2=list_civ2{index_civ2};%string defining the image pairs for civ2
+if isempty(first_i)||isempty(first_j), msgbox_uvmat('ERROR','first field number not defined'),...
+    return,end;
+if isequal(last_i,[])| isequal(last_j,[]),msgbox_uvmat('ERROR','last field number not defined'),...
+    return,end;
+if isequal(incr,[])| isequal(incr_j,[]),msgbox_uvmat('ERROR','increment in field number not defined'),...
+    return,end;
+if last_i < first_i | last_j < first_j , msgbox_uvmat('ERROR','last field number must be larger than the first one'),...
+    return,end;
+if isequal (mode,'series(Di)') 
      %recognize the pair civ1 from the display
         indsel=find((double(str_civ1)<48)|(double(str_civ1)>57));% character indices of non numerical characters
@@ -1408 +1408 @@
         num2_civ2=num2_civ2(indsel);
     end
-elseif isequal (mode,'series(Dj)')%|isequal (mode,'st_series(Dj)')
+elseif isequal (mode,'series(Dj)')
     lastfield_j=str2num(get(handles.nb_field2,'String'));
     num1_civ1=num1;% set of first image numbers
@@ -1435 +1435 @@
         num_b_civ2=num_b_civ2(indsel);
     end
-elseif isequal(mode,'pair j1-j2')% | isequal(mode,'st_pair j1-j2') %case of bursts (png_old or png_2D)
+elseif isequal(mode,'pair j1-j2') %case of bursts (png_old or png_2D)
     num1_civ1=num1;
     num1_civ2=num1;
@@ -1455 +1455 @@
     num_b_civ2=num_j;
 end
+'TESTfind'
+num1_civ1
+num2_civ1
+num_a_civ1
+num_b_civ1
 
 %------------------------------------------------------------------------
@@ -1659 +1664 @@
 [filecell,num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=...
        set_civ_filenames(handles,compare,box_test);
+   'TESTnbre_RUN'
+nbfield=size(num1_civ1,2)
+nbslice=size(num1_civ1,1)
+
 if isempty(filecell)
    set(handles.RUN, 'Enable','On')
@@ -2176 +2185 @@
        set_civ_filenames(handles,compare,box_test);
 display('files OK, processing...')  
-nbfield=size(num1_civ1,2);
-nbslice=size(num1_civ1,1);
+'TESTnbre'
+nbfield=size(num1_civ1,2)
+nbslice=size(num1_civ1,1)
 
 %GET PARAMETERS:
@@ -3504 +3514 @@
                 textout=char(textcmx);
 %               dlmwrite(filename_cmx,textout,'');
-        
-        filename_ima
-        filename_ima_1
      fid=fopen([filename_cmx],'w');
 fprintf(fid, ['##############   CMX file' '\n']);
@@ -4956 +4963 @@
 path_to_uvmat=which ('uvmat');% check the path of uvmat
 pathelp=fileparts(path_to_uvmat);
-helpfile=fullfile(pathelp,'UVMAT_DOC','uvmat_doc.html');
-if isempty(dir(helpfile)), errordlg('Please put the help file uvmat_doc.html in the directory UVMAT/UVMAT_DOC')
-else
-web([helpfile '#civ'])    
+helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html');
+if isempty(dir(helpfile)), msgbox_uvmat('ERROR','Please put the help file uvmat_doc.html in the sub-directory /uvmat_doc of the UVMAT package')
+else
+    addpath (fullfile(pathelp,'uvmat_doc'))
+    web([helpfile '#civ'])    
 end
 

trunk/src/geometry_calib.m

@@ -146 +146 @@
 
 %case of calibration (ImaDoc) input file
-hcalib=get(handles.calib_type,'parent');
-CalibData=get(hcalib,'UserData');
+% hcalib=get(handles.calib_type,'parent');
+CalibData=get(handles.figure1,'UserData');
 CalibData.XmlInput=fileinput;
 if isfield(s,'Heading')
@@ -153 +153 @@
 end
 
-set(hcalib,'UserData',CalibData);%store the heading in the interface 'UserData'
+set(handles.figure1,'UserData',CalibData);%store the heading in the interface 'UserData'
 if isfield(s,'GeometryCalib')
     Calib=s.GeometryCalib;
@@ -412 +412 @@
 end
 if testinput
-    outcome=dataview(XmlInput,SubCampaignTest,GeometryCalib)
+    outcome=dataview(XmlInput,SubCampaignTest,GeometryCalib);
 end
 %     %A COMPLETER
@@ -1014 +1014 @@
 path_to_uvmat=which ('uvmat');% check the path of uvmat
 pathelp=fileparts(path_to_uvmat);
-    helpfile=fullfile(pathelp,'UVMAT_DOC','uvmat_doc.html');
-if isempty(dir(helpfile)), warndlg_uvmat('The help file uvmat_doc.html needs to be put in the directory UVMAT/UVMAT_DOC','ERROR')
+    helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html');
+if isempty(dir(helpfile)), msgbox_uvmat('ERROR','Please put the help file uvmat_doc.html in the sub-directory /uvmat_doc of the UVMAT package')
 else
+   addpath (fullfile(pathelp,'uvmat_doc'))
    web([helpfile '#geometry_calib'])
 end
@@ -1023 +1024 @@
 function MenuCreateGrid_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
-CalibData=get(hcalib,'UserData');
+%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
+CalibData=get(handles.figure1,'UserData');
 Tinput=[];%default
 if isfield(CalibData,'grid')
     Tinput=CalibData.grid;
 end
-T=create_grid(Tinput)%display the GUI create_grid 
+T=create_grid(Tinput);%display the GUI create_grid 
 CalibData.grid=T;
-set(hcalib,'UserData',CalibData)
+set(handles.figure1,'UserData',CalibData)
 
 %grid in phys space
 Coord_cell=get(handles.ListCoord,'String');
-data=read_geometry_calib(Coord_cell)
+data=read_geometry_calib(Coord_cell);
 nbpoints=size(data.Coord,1); %nbre of calibration points
-data.Coord(1:size(T,1),1:3)=T;
+data.Coord(1:size(T,1),1:3)=T;%update the existing list of phys coordinates from the GUI create_grid
 for i=1:nbpoints
    for j=1:5
@@ -1061 +1062 @@
 function MenuTranslatePoints_Callback(hObject, eventdata, handles)
 %-----------------------------------------------------------------------
-hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
-CalibData=get(hcalib,'UserData')
+%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
+CalibData=get(handles.figure1,'UserData');
 Tinput=[];%default
 if isfield(CalibData,'translate')
@@ -1069 +1070 @@
 T=translate_points(Tinput);%display translate_points GUI and get shift parameters 
 CalibData.translate=T;
-set(hcalib,'UserData',CalibData)
+set(handles.figure1,'UserData',CalibData)
 %translation
 Coord_cell=get(handles.ListCoord,'String');
@@ -1089 +1090 @@
 % --------------------------------------------------------------------
 function MenuRotatePoints_Callback(hObject, eventdata, handles)
-hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
-CalibData=get(hcalib,'UserData')
+%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
+CalibData=get(handles.figure1,'UserData');
 Tinput=[];%default
 if isfield(CalibData,'rotate')
@@ -1097 +1098 @@
 T=rotate_points(Tinput);%display translate_points GUI and get shift parameters 
 CalibData.rotate=T;
-set(hcalib,'UserData',CalibData)
+set(handles.figure1,'UserData',CalibData)
 %-----------------------------------------------------
 %rotation

trunk/src/read_geometry_calib.m

@@ -18 +18 @@
 nb_defining_points=length(Coord_cell);
 iline=0;
+data.Coord=[];%default
 for i=1:nb_defining_points
     coord_str=Coord_cell{i};%character string of line number i

trunk/src/series.m

@@ -2161 +2161 @@
      get_field(filename)
 
-
-
 % --------------------------------------------------------------------
 function MenuHelp_Callback(hObject, eventdata, handles)
@@ -2168 +2166 @@
 path_to_uvmat=which ('uvmat');% check the path of uvmat
 pathelp=fileparts(path_to_uvmat);
-helpfile=fullfile(pathelp,'UVMAT_DOC','uvmat_doc.html');
-if isempty(dir(helpfile)), errordlg('Please put the help file uvmat_doc.html in the  directory UVMAT/UVMAT_DOC')
-else
-web([helpfile '#series'])    
-end
-
-
-
-
-
-
+helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html');
+if isempty(dir(helpfile)), msgbox_uvmat('ERROR','Please put the help file uvmat_doc.html in the sub-directory /uvmat_doc of the UVMAT package')
+else
+    addpath (fullfile(pathelp,'uvmat_doc'))
+    web([helpfile '#series'])
+end
+
+
+
+
+
+

trunk/src/translate_points.m

@@ -36 +36 @@
 end
 % End initialization code - DO NOT EDIT
+
 
 % --- Executes just before translate_points is made visible.
@@ -129 +130 @@
 function Cancel_Callback(hObject, eventdata, handles)
 handles.output = get(hObject,'String');
-%handles.output = 'Cancel'
 guidata(hObject, handles); % Update handles structure
-% Use UIRESUME instead of delete because the OutputFcn needs
-% to get the updated handles structure.
 uiresume(handles.figure1);
 
@@ -163 +161 @@
 
 
-function edit5_Callback(hObject, eventdata, handles)
-% hObject    handle to edit5 (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: get(hObject,'String') returns contents of edit5 as text
-%        str2double(get(hObject,'String')) returns contents of edit5 as a double
-
-
-
-function edit6_Callback(hObject, eventdata, handles)
-% hObject    handle to edit6 (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: get(hObject,'String') returns contents of edit6 as text
-%        str2double(get(hObject,'String')) returns contents of edit6 as a
-%        double
-
-
-function edit7_Callback(hObject, eventdata, handles)
-% hObject    handle to edit7 (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: get(hObject,'String') returns contents of edit7 as text
-%        str2double(get(hObject,'String')) returns contents of edit7 as a double
-
-
-function edit8_Callback(hObject, eventdata, handles)
-% hObject    handle to edit8 (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: get(hObject,'String') returns contents of edit8 as text
-%        str2double(get(hObject,'String')) returns contents of edit8 as a double
-
-

trunk/src/uvmat.m

@@ -4508 +4508 @@
 path_to_uvmat=which ('uvmat');% check the path of uvmat
 pathelp=fileparts(path_to_uvmat);
-helpfile=fullfile(pathelp,'UVMAT_DOC','uvmat_doc.html');
-if isempty(dir(helpfile)), errordlg('Please put the help file uvmat_doc.html in the directory UVMAT/UVMAT_DOC')
-else
+helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html');
+if isempty(dir(helpfile)), msgbox_uvmat('ERROR','Please put the help file uvmat_doc.html in the sub-directory /uvmat_doc of the UVMAT package')
+else
+    addpath (fullfile(pathelp,'uvmat_doc'))
     web(helpfile);
 end