Changeset 79

Timestamp:

Apr 5, 2010, 3:11:51 AM (14 years ago)

Author:

sommeria

Message:

time_series: subdir for result /time_series
mouse_motio: attempt to improve the circle marking vectors: use Visible off and on.
phys: bug repair for combining two images
set_oject: bug repair for creating new object
--This line those below, will be ignored--time_series

M src/series/time_series.m
M src/mouse_motion.m
M src/transform_field/phys.m
M src/set_object.m

Location:

trunk/src

Files:

• mouse_motion.m (modified) (2 diffs)
• series/time_series.m (modified) (1 diff)
• set_object.m (modified) (1 diff)
• transform_field/phys.m (modified) (3 diffs)

trunk/src/mouse_motion.m

@@ -105 +105 @@
                                     set(0,'Children',hstack);%put back the initial figure stack after plot creation
                                 else
+                                    set(hhh,'Visible','on')
                                     set(hhh,'Position',[AxeData.X(ivec)-AxeData.Mesh/2 AxeData.Y(ivec)-AxeData.Mesh/2 AxeData.Mesh AxeData.Mesh])
                                 end
@@ -135 +136 @@
                     else
                         if ~isempty(hhh)
-                            delete(hhh)
+                            set(hhh,'Visible','off')
                         end
                     end

trunk/src/series/time_series.m

@@ -536 +536 @@
     %name of result file
     [filemean]=...
-               name_generator(filebase_out,num_i1{1}(i_slice),num_j1{1}(i_slice),'.nc','_i1-i2_j1-j2',1,num_i2{end}(ifile),num_j2{end}(ifile),SubDir{1});
+               name_generator(filebase_out,num_i1{1}(i_slice),num_j1{1}(i_slice),'.nc','_i1-i2_j1-j2',1,num_i2{end}(ifile),num_j2{end}(ifile),subdir_result);
     errormsg=struct2nc(filemean,RecordData); %save result file
     if isempty(errormsg)

trunk/src/set_object.m

@@ -778 +778 @@
     PlotHandles=get_plot_handles(hhuvmat);
     IndexObj=IndexObj_1;
-elseif strcmp(ListObject{IndexObj_2},ObjectName)% we are editing the object whose projection is viewed in view_field
+elseif IndexObj_2<=numel(ListObject)&& strcmp(ListObject{IndexObj_2},ObjectName)% we are editing the object whose projection is viewed in view_field
     hview_field=findobj('tag','view_field');
     if ~isempty(hview_field)

trunk/src/transform_field/phys.m

@@ -168 +168 @@
     yima=[0.5 0.5 siz(1)-0.5 siz(1)-0.5];
     [xcorner_new,ycorner_new]=phys_XYZ(Calib,xima,yima,ZIndex);%corresponding physical coordinates
+    dx(icell)=(max(xcorner_new)-min(xcorner_new))/(siz(2)-1);
+    dy(icell)=(max(ycorner_new)-min(ycorner_new))/(siz(1)-1);
     xcorner=[xcorner xcorner_new];
     ycorner=[ycorner ycorner_new];
@@ -176 +178 @@
 Rangy(1)=max(ycorner);
 test_multi=(max(npx)~=min(npx)) | (max(npy)~=min(npy)); 
-npx=max(npx);
-npy=max(npy);
-x=linspace(Rangx(1),Rangx(2),npx);
-y=linspace(Rangy(1),Rangy(2),npy);
+npX=1+round((Rangx(2)-Rangx(1))/min(dx));% nbre of pixels in the new image (use the finest resolution min(dx) in the set of images)
+npY=1+round((Rangy(1)-Rangy(2))/min(dy));
+x=linspace(Rangx(1),Rangx(2),npX);
+y=linspace(Rangy(1),Rangy(2),npY);
 [X,Y]=meshgrid(x,y);%grid in physical coordiantes
 vec_B=[];
@@ -192 +194 @@
            zphys=SliceCoord(3); %to generalize for non-parallel planes
         end
-        [XIMA,YIMA]=px_XYZ(CalibIn{icell},X,Y,zphys);%corresponding image indices for each point in the real space grid
-        XIMA=reshape(round(XIMA),1,npx*npy);%indices reorganized in 'line'
-        YIMA=reshape(round(YIMA),1,npx*npy);
-        flagin=XIMA>=1 & XIMA<=npx & YIMA >=1 & YIMA<=npy;%flagin=1 inside the original image
+        [XIMA,YIMA]=px_XYZ(CalibIn{icell},X,Y,zphys);% image coordinates for each point in the real space grid
+        XIMA=reshape(round(XIMA),1,npX*npY);%indices reorganized in 'line'
+        YIMA=reshape(round(YIMA),1,npX*npY);
+        flagin=XIMA>=1 & XIMA<=npx(icell) & YIMA >=1 & YIMA<=npy(icell);%flagin=1 inside the original image
         testuint8=isa(A{icell},'uint8');
         testuint16=isa(A{icell},'uint16');
         if numel(siz)==2 %(B/W images)
-            vec_A=reshape(A{icell},1,npx*npy);%put the original image in line
+            vec_A=reshape(A{icell},1,npx(icell)*npy(icell));%put the original image in line
             ind_in=find(flagin);
             ind_out=find(~flagin);
-            ICOMB=((XIMA-1)*npy+(npy+1-YIMA));
+            ICOMB=((XIMA-1)*npy(icell)+(npy(icell)+1-YIMA));
             ICOMB=ICOMB(flagin);%index corresponding to XIMA and YIMA in the aligned original image vec_A
             vec_B(ind_in)=vec_A(ICOMB);
             vec_B(ind_out)=zeros(size(ind_out));
-            A_out{icell}=reshape(vec_B,npy,npx);%new image in real coordinates
+            A_out{icell}=reshape(vec_B,npY,npX);%new image in real coordinates
         elseif numel(siz)==3     
             for icolor=1:siz(3)