Changeset 73 for trunk/src/set_grid.m

Timestamp:

Mar 30, 2010, 11:50:35 PM (14 years ago)

Author:

sommeria

Message:

ima2vol: provides volume images in 16 bit (presently needed for the software 3D3C)
set_grid: small bug repairs
uvmat: small bug repairs.
civ: bug repair following previous changes (RUN and BATCH functions merged)
plot_field: cleaning of parameter transmission. Introduction of a parameter handle of a text box (not yet used)

File:

• trunk/src/set_grid.m (modified) (2 diffs)

trunk/src/set_grid.m

@@ -482 +482 @@
      tsaiA=[];
 end
-[grid_imaA(:,1),grid_imaA(:,2)]=px_XYZ(tsaiA,grid_real(:,1),grid_real(:,2),0);
+size(grid_real)
+tsaiA
+if isempty(tsaiA)
+    grid_imaA(:,1)=grid_real(:,1);
+    grid_imaA(:,2)=grid_real(:,2);
+else
+    [grid_imaA(:,1),grid_imaA(:,2)]=px_XYZ(tsaiA,grid_real(:,1),grid_real(:,2),0);
+end
     A=imread(imageA);
    siz=size(A);
@@ -537 +544 @@
 grid_real2(:,2)=grid_real_y;
 grid_real2(:,3)=zeros(nx_patch_new,1);
-[grid_pix_A(:,1),grid_pix_A(:,2)]=px_XYZ(tsaiA,grid_real2(:,1),grid_real2(:,2));
+if isempty(tsaiA)
+    grid_pix_A(:,1)=grid_real2(:,1);
+   grid_pix_A(:,2)= grid_real2(:,2);
+else
+    [grid_pix_A(:,1),grid_pix_A(:,2)]=px_XYZ(tsaiA,grid_real2(:,1),grid_real2(:,2));
+end
 if testB
     [grid_pix_B(:,1),grid_pix_B(:,2)]=px_XYZ(tsaiB,grid_real2(:,1),grid_real2(:,2));