Changeset 88 for trunk/src

Timestamp:

May 9, 2010, 10:40:18 AM (15 years ago)

Author:

sommeria

Message:

plot_field: test for multicomponent image (-> errormsg)
creat_grid: possibility of changing the figure name (for detect_grid)
geometry_calib: detect_grid improved (range of search adjusted from grid mesh)

bug repaired in translate points

uvmat: bug repair: dela with the case with several get_field GUI opened

Location:

trunk/src

Files:

• create_grid.m (modified) (2 diffs)
• geometry_calib.m (modified) (4 diffs)
• plot_field.m (modified) (3 diffs)
• uvmat.m (modified) (1 diff)

trunk/src/create_grid.m

@@ -34 +34 @@
 %------------------------------------------------------------------------
 % --- Executes just before create_grid is made visible.
-function create_grid_OpeningFcn(hObject, eventdata, handles,input_grid)
+function create_grid_OpeningFcn(hObject, eventdata, handles,input_grid,name)
 %------------------------------------------------------------------------
 % This function has no output args, see OutputFcn.
@@ -41 +41 @@
 handles.output = 'Cancel';
 
+if exist('name','var') && ischar(name)
+    set(hObject,'name',name)
+end
 % Update handles structure
 guidata(hObject, handles);

trunk/src/geometry_calib.m

@@ -954 +954 @@
     grid_input=CalibData.grid;%retrieve the previously used grid
 end
-[T,CalibData.grid]=create_grid(grid_input);%display the GUI create_grid 
+[T,CalibData.grid]=create_grid(grid_input,'detect grid');%display the GUI create_grid 
 set(handles.geometry_calib,'UserData',CalibData)%store the phys grid for later use
 
@@ -1012 +1012 @@
 %Amax=max(max(Amod))
 %image(Rangx,Rangy,uint8(255*Amod/Amax))
-ind_range=10;% range of search of image ma around each point obtained by linear interpolation from the marked points
+Dx=(Rangx(2)-Rangx(1))/(npxy(2)-1); %x mesh in real space
+Dy=(Rangy(2)-Rangy(1))/(npxy(1)-1); %y mesh in real space
+ind_range_x=ceil(GeometryCalib.R(1,1)*CalibData.grid.Dx/3)% range of search of image ma around each point obtained by linear interpolation from the marked points
+ind_range_y=ceil(GeometryCalib.R(2,2)*CalibData.grid.Dy/3)% range of search of image ma around each point obtained by linear interpolation from the marked points
 nbpoints=size(T,1);
 for ipoint=1:nbpoints
-    Dx=(Rangx(2)-Rangx(1))/(npxy(2)-1); %x mesh in real space
-    Dy=(Rangy(2)-Rangy(1))/(npxy(1)-1); %y mesh in real space
     i0=1+round((T(ipoint,1)-Rangx(1))/Dx);%round(Xpx(ipoint));
     j0=1+round((T(ipoint,2)-Rangy(1))/Dy);%round(Xpx(ipoint));
-    Asub=Amod(j0-ind_range:j0+ind_range,i0-ind_range:i0+ind_range);
+    Asub=Amod(j0-ind_range_y:j0+ind_range_y,i0-ind_range_x:i0+ind_range_x);
     x_profile=sum(Asub,1);
     y_profile=sum(Asub,2);
@@ -1027 +1028 @@
     x_shift=0;
     y_shift=0;
-    if ind_x_max+2<=2*ind_range+1 && ind_x_max-2>=1
+    if ind_x_max+2<=2*ind_range_x+1 && ind_x_max-2>=1
         Atop=x_profile(ind_x_max-2:ind_x_max+2);
         x_shift=sum(Atop.*[-2 -1 0 1 2])/sum(Atop);
     end
-    if ind_y_max+2<=2*ind_range+1 && ind_y_max-2>=1
+    if ind_y_max+2<=2*ind_range_y+1 && ind_y_max-2>=1
         Atop=y_profile(ind_y_max-2:ind_y_max+2);
         y_shift=sum(Atop.*[-2 -1 0 1 2]')/sum(Atop);
     end
-    Delta(ipoint,1)=(x_shift+ind_x_max-ind_range-1)*Dx;%shift from the initial guess
-    Delta(ipoint,2)=(y_shift+ind_y_max-ind_range-1)*Dy;
+    Delta(ipoint,1)=(x_shift+ind_x_max-ind_range_x-1)*Dx;%shift from the initial guess
+    Delta(ipoint,2)=(y_shift+ind_y_max-ind_range_y-1)*Dy;
 end
 Tmod=T(:,(1:2))+Delta;
@@ -1078 +1079 @@
 end
 Tabchar=cell2tab(Coord,'    |    ');
-Tabchar=[Tabchar {'.....'}];
+Tabchar=[Tabchar; {'.....'}];
 %set(handles.ListCoord,'Value',1)
 set(handles.ListCoord,'String',Tabchar)

trunk/src/plot_field.m

@@ -698 +698 @@
     % distinguish B/W and color images
     np=size(A);%size of image
-    siz=size(np);
+    siz=numel(np);
+    if siz>3
+        msgbox_uvmat('ERROR','unrecognized scalar type ')
+            return
+    end
+    if siz==3
+        if np(3)==1
+            siz=2;%B W image
+        elseif np(3)==3
+            siz=3;%color image
+        else
+             msgbox_uvmat('ERROR',['unrecognized scalar type: ' num2str(np(3)) ' color components'])
+            return
+        end
+    end
     %set the color map
-    if siz(2)==2 %for black and white images
+    if siz==2 %for black and white images
         if ~isfield(PlotParam.Scalar,'AutoScal')
             PlotParam.Scalar.AutoScal=0;%default
@@ -781 +795 @@
             end
         end
-    elseif siz(2)==3 %color images
+    else %color images
         axes(haxes)
         B=uint8(A); 
@@ -832 +846 @@
     test_ima=1;
     %display the colorbar code for B/W images if Poscolorbar not empty
-    if siz(2)==2 & exist('PosColorbar','var')& ~isempty(PosColorbar)
+    if siz==2 & exist('PosColorbar','var')& ~isempty(PosColorbar)
         if isempty(hcol)|~ishandle(hcol)
              hcol=colorbar;%create new colorbar

trunk/src/uvmat.m

@@ -2239 +2239 @@
         if isequal(FieldName,'get_field...')% read the field names on the interface get_field.
             %VelType=get(handles.Fields,'UserData');
-            hget_field=findobj(allchild(0),'Name','get_field');%find the get_field... GUI
+            hget_field=findobj(allchild(0),'Name','get_field')%find the get_field... GUI
             if isempty(hget_field)
                 hget_field= get_field(filename);%open the get_field GUI    
+            end
+            if numel(hget_field)>1%case of several get_field GUI
+                hget_field=hget_field(1);
             end
             hhget_field=guidata(hget_field);