Changeset 964 for trunk/src

Timestamp:

Jun 29, 2016, 8:36:44 PM (8 years ago)

Author:

sommeria

Message:

level + 3D projection

Location:

trunk/src

Files:

• find_file_series.m (modified) (4 diffs)
• proj_field.m (modified) (3 diffs)
• rodrigues.m (deleted)
• set_object.m (modified) (1 diff)

trunk/src/find_file_series.m

@@ -56 +56 @@
 if isfield(FileInfo,'FileIndexing') && strcmp(FileInfo.FileIndexing,'on')
     [RootPath,SubDir,RootFile,i1_input,i2_input,j1_input,j2_input,FileExt,NomType]=fileparts_uvmat(fullfileinput);
+    if ~isempty(regexp(SubDir,'^level\d+$')) && exist([RootPath '.xml'],'file')
+        NomType='level';
+    end
     i1_series=zeros(1,1,1);
     i2_series=zeros(1,1,1);
@@ -176 +179 @@
             cd (FilePath)% move to the local dir to save time in the operation dir.
             dirpair=dir(star_string);% look for relevant files in the file directory
-            cd(wd)
+            cd(wd)% back to the working directory
             nbpair=numel(dirpair);
             i1_series=zeros(1,nbpair);
@@ -190 +193 @@
             end
             % look for the list of subfolders level#
-            cd (fullfile(RootPath,SubDir))% move to the local dir to save time in the operation dir.
-            dirpair=dir('level*');% look for relevant files in the file directory
+            cd (RootPath)% move to the local dir to save time in the operation dir.
+            dirpair=dir('level*');% look for relevant subfolders named with leve#
             cd(wd)
+            [RootPath,SubDir]=fileparts(RootPath);
             nbpair=numel(dirpair);
             jfile=0;
@@ -202 +206 @@
                 end
             end
-            [i1_series,j1_series]=meshgrid(i1_series,j1_series);
-            i1_series=reshape(i1_series,1,[]);
-            j1_series=reshape(j1_series,1,[]);
+            [j1_series,i1_series]=meshgrid(j1_series,i1_series);
+%             i1_series=reshape(i1_series,1,[]);
+%             j1_series=reshape(j1_series,1,[]);
         else
             detect_string=['^' RootFile sep1 i1_str i2_str sep2 j1_str j2_str FileExt '$'];%string used in regexp to detect file indices

trunk/src/proj_field.m

@@ -964 +964 @@
 % end   
 if isfield(ObjectData,'Angle')&& isequal(size(ObjectData.Angle),[1 3])&& ~isequal(ObjectData.Angle,[0 0 0])
-    test90y=isequal(ObjectData.Angle,[0 90 0]);
+    test90y=0;%isequal(ObjectData.Angle,[0 90 0]);
     PlaneAngle=(pi/180)*ObjectData.Angle;
-    om=norm(PlaneAngle);%norm of rotation angle in radians
-    OmAxis=PlaneAngle/om; %unit vector marking the rotation axis
-    cos_om=cos(om);
-    sin_om=sin(om);
-    coeff=OmAxis(3)*(1-cos_om);
-    %components of the unity vector norm_plane normal to the projection plane
-    norm_plane(1)=OmAxis(1)*coeff+OmAxis(2)*sin_om;
-    norm_plane(2)=OmAxis(2)*coeff-OmAxis(1)*sin_om;
-    norm_plane(3)=OmAxis(3)*coeff+cos_om;
-end
-testangle=~isequal(PlaneAngle,[0 0 0])||~isequal(ObjectData.Coord(1:2),[0 0 ]) ;% && ~test90y && ~test90x;%=1 for slanted plane
+%     om=norm(PlaneAngle);%norm of rotation angle in radians
+%     OmAxis=PlaneAngle/om; %unit vector marking the rotation axis
+%     cos_om=cos(om);
+%     sin_om=sin(om);
+%     coeff=OmAxis(3)*(1-cos_om);
+%     %components of the unity vector norm_plane normal to the projection plane
+%     norm_plane(1)=OmAxis(1)*coeff+OmAxis(2)*sin_om;
+%     norm_plane(2)=OmAxis(2)*coeff-OmAxis(1)*sin_om;
+%     norm_plane(3)=OmAxis(3)*coeff+cos_om;
+    
+M2=[cos(PlaneAngle(2)) sin(PlaneAngle(2)) 0;-sin(PlaneAngle(2)) cos(PlaneAngle(2)) 0;0 0 1];
+M1=[1 0 0;0 cos(PlaneAngle(1)) sin(PlaneAngle(1));0 -sin(PlaneAngle(1)) cos(PlaneAngle(1))];
+M=M1*M2;
+norm_plane=M*[0 0 1]';
+    
+end
+testangle=~isequal(PlaneAngle,[0 0])||~isequal(ObjectData.Coord(1:2),[0 0 ]) ;% && ~test90y && ~test90x;%=1 for slanted plane
 
 %% mesh sizes DX and DY
@@ -1224 +1230 @@
             Psi=PlaneAngle(1);
             Theta=PlaneAngle(2);
-            Phi=PlaneAngle(3);
+           % Phi=PlaneAngle(3);
             if testangle && ~test90y && ~test90x;%=1 for slanted plane
                 coord_X=(coord_x *cos(Phi) + coord_y* sin(Phi));
@@ -1365 +1371 @@
                 Psi=PlaneAngle(1);
                 Theta=PlaneAngle(2);
-                Phi=PlaneAngle(3);
+               % Phi=PlaneAngle(3);
                 if testangle && ~test90y && ~test90x;%=1 for slanted plane
                     new_XI=XI*cos(Phi) - YI*sin(Phi)+ObjectData.Coord(1);

trunk/src/set_object.m

@@ -721 +721 @@
 PlaneAngle(1)=str2double(get(handles.num_Angle_1,'String'));%first  angle in degrees
 PlaneAngle(2)=str2double(get(handles.num_Angle_2,'String'));%second  angle in degrees
-PlaneAngle(3)=str2double(get(handles.num_Angle_3,'String'));%second  angle in degrees
+%PlaneAngle(3)=str2double(get(handles.num_Angle_3,'String'));%second  angle in degrees
 PlaneAngle=(pi/180)*PlaneAngle;
-om=norm(PlaneAngle);%norm of rotation angle in radians
-if isequal(om,0)
-    norm_plane=[0 0 1];
-else
-    OmAxis=PlaneAngle/om; %unit vector marking the rotation axis
-    cos_om=cos(om);
-    sin_om=sin(om);
-    coeff=OmAxis(3)*(1-cos_om);
-    %components of the unity vector norm_plane normal to the projection plane
-    norm_plane(1)=OmAxis(1)*coeff+OmAxis(2)*sin_om;
-    norm_plane(2)=OmAxis(2)*coeff-OmAxis(1)*sin_om;
-    norm_plane(3)=OmAxis(3)*coeff+cos_om;
-end
+M2=[cos(PlaneAngle(2)) sin(PlaneAngle(2)) 0;-sin(PlaneAngle(2)) cos(PlaneAngle(2)) 0;0 0 1];
+M1=[1 0 0;0 cos(PlaneAngle(1)) sin(PlaneAngle(1));0 -sin(PlaneAngle(1)) cos(PlaneAngle(1))];
+M=M1*M2;
+norm_plane=M*[0 0 1]';
+
+% om=norm(PlaneAngle);%norm of rotation angle in radians
+% if isequal(om,0)
+%     norm_plane=[0 0 1];
+% else
+%     OmAxis=PlaneAngle/om; %unit vector marking the rotation axis
+%     cos_om=cos(om);
+%     sin_om=sin(om);
+%     coeff=OmAxis(3)*(1-cos_om);
+%     %components of the unity vector norm_plane normal to the projection plane
+%     norm_plane(1)=OmAxis(1)*coeff+OmAxis(2)*sin_om;
+%     norm_plane(2)=OmAxis(2)*coeff-OmAxis(1)*sin_om;
+%     norm_plane(3)=OmAxis(3)*coeff+cos_om;
+% end
 Coord=get(handles.Coord,'Data');
 Coord(3)=Z_value;