Changeset 379 for trunk/src/proj_field.m

Timestamp:

Jan 27, 2012, 1:59:18 AM (12 years ago)

Author:

sommeria

Message:

several bugs corrected
set_object.fig rationalized so that read_set_object is replaced by the rgeneral fct read_GUI.

File:

• trunk/src/proj_field.m (modified) (11 diffs)

trunk/src/proj_field.m

@@ -17 +17 @@
 %INPUT
 % ObjectData: structure characterizing the projection object
-%    .Style : style of projection object
-%    .ProjMode=type of projection ;
-%    .CoordType: 'px' or 'phys' type of coordinates defining the object position
+%    .Type : type of projection object
+%    .ProjMode=mode of projection ;
+%    .CoordUnit: 'px', 'cm' units for the coordinates defining the object
 %    .Phi  angle of rotation (=0 by default)
 %    .ProjAngle=angle of projection;
@@ -88 +88 @@
 end
 
-%% in the absence of object Style or projection mode, or object coordinaes, the input field is just tranfered without change
-if ~isfield(ObjectData,'Style')||~isfield(ObjectData,'ProjMode')
+%% in the absence of object Type or projection mode, or object coordinaes, the input field is just tranfered without change
+if ~isfield(ObjectData,'Type')||~isfield(ObjectData,'ProjMode')
     ProjData=FieldData;
     return
 end
 if ~isfield(ObjectData,'Coord')
-    if strcmp(ObjectData.Style,'plane')
+    if strcmp(ObjectData.Type,'plane')
         ObjectData.Coord=[0 0 0];%default
     else
@@ -124 +124 @@
 
 %% apply projection depending on the object style
-switch ObjectData.Style
+switch ObjectData.Type
     case 'points'
     [ProjData,errormsg]=proj_points(FieldData,ObjectData);
@@ -480 +480 @@
 %select the indices in the range of action
     testin=[];%default
-    if isequal(ObjectData.Style,'rectangle')
+    if isequal(ObjectData.Type,'rectangle')
 %            if ~isfield(ObjectData,'RangeX')|~isfield(ObjectData,'RangeY')
 %                 errormsg='rectangle half sides RangeX and RangeY needed'
@@ -494 +494 @@
            testin=distX<widthx & distY<widthy;
        end
-    elseif isequal(ObjectData.Style,'polygon')
+    elseif isequal(ObjectData.Type,'polygon')
         if testX
             testin=inpolygon(coord_x,coord_y,ObjectData.Coord(:,1),ObjectData.Coord(:,2));
@@ -502 +502 @@
            testin=[]; %A REVOIR
        end
-    elseif isequal(ObjectData.Style,'ellipse')
+    elseif isequal(ObjectData.Type,'ellipse')
        X2Max=widthx*widthx;
        Y2Max=(widthy)*(widthy);
@@ -567 +567 @@
 ProjMode='projection';%direct projection on the line by default
 if isfield(ObjectData,'ProjMode'),ProjMode=ObjectData.ProjMode; end; 
-ProjAngle=90; %90 degrees projection by default
-if isfield(FieldData,'ProjAngle'),ProjAngle=ObjectData.ProjAngle; end; 
+% ProjAngle=90; %90 degrees projection by default
+% if isfield(FieldData,'ProjAngle'),ProjAngle=ObjectData.ProjAngle; end; 
 width=0;%default width of the projection band
-if isfield(ObjectData,'Range')&size(ObjectData.Range,2)>=2
+if isfield(ObjectData,'Range')&&size(ObjectData.Range,2)>=2
     width=abs(ObjectData.Range(1,2));
 end
@@ -777 +777 @@
     %case of structured coordinates
     elseif  numel(VarType.coord)>=2 & VarType.coord(1:2) > 0;
-        if ~isequal(ObjectData.Style,'line')% exclude polyline
-            errormsg=['no  projection available on ' ObjectData.Style 'for structured coordinates']; % 
+        if ~isequal(ObjectData.Type,'line')% exclude polyline
+            errormsg=['no  projection available on ' ObjectData.Type 'for structured coordinates']; % 
         else
             test_Amat=1;%image or 2D matrix
@@ -949 +949 @@
 testangle=~isequal(PlaneAngle,[0 0 0]);% && ~test90y && ~test90x;%=1 for slanted plane 
 
-% Phi=0;%default
-% Theta=0;
-% Psi=0;
-% if isfield(ObjectData,'Phi')&& ~isempty(ObjectData.Phi)
-%     Phi=(pi/180)*ObjectData.Phi;%first Euler angle in radian
-% end
-% if isfield(ObjectData,'Theta')&& ~isempty(ObjectData.Theta)
-%     Theta=(pi/180)*ObjectData.Theta;%second Euler angle in radian
-% end
-% if isfield(ObjectData,'Psi')&& ~isempty(ObjectData.Psi)
-%     Psi=(pi/180)*ObjectData.Psi;%third Euler angle in radian
-% end
-
-%components of the unity vector normal to the projection plane
-% NormVec_X=-sin(Phi)*sin(Theta);
-% NormVec_Y=cos(Phi)*sin(Theta);
-% NormVec_Z=cos(Theta);
-
 %mesh sizes DX and DY
 DX=0;
 DY=0; %default 
-if isfield(ObjectData,'DX')&~isempty(ObjectData.DX)
+if isfield(ObjectData,'DX') && ~isempty(ObjectData.DX)
      DX=abs(ObjectData.DX);%mesh of interpolation points 
 end
-if isfield(ObjectData,'DY')&~isempty(ObjectData.DY)
+if isfield(ObjectData,'DY') && ~isempty(ObjectData.DY)
      DY=abs(ObjectData.DY);%mesh of interpolation points 
 end
@@ -2187 +2169 @@
 %% transfer coordinate unit
 if isfield(FieldData,'CoordUnit')
-    if isfield(ObjectData,'CoordUnit')&~isequal(FieldData.CoordUnit,ObjectData.CoordUnit)
-        errormsg=[ObjectData.Style ' in ' ObjectData.CoordUnit ' coordinates, while field in ' FieldData.CoordUnit ];
+    if isfield(ObjectData,'CoordUnit') && ~strcmp(FieldData.CoordUnit,ObjectData.CoordUnit)
+        errormsg=[ObjectData.Type ' in ' ObjectData.CoordUnit ' coordinates, while field in ' FieldData.CoordUnit ];
         return
     else
@@ -2196 +2178 @@
 
 %% store the properties of the projection object
-ListObject={'Style','ProjMode','RangeX','RangeY','RangeZ','Phi','Theta','Psi','Coord'};
+ListObject={'Type','ProjMode','RangeX','RangeY','RangeZ','Phi','Theta','Psi','Coord'};
 for ilist=1:length(ListObject)
     if isfield(ObjectData,ListObject{ilist})