Changeset 971 for trunk/src


Ignore:
Timestamp:
Nov 9, 2016, 7:47:13 PM (4 years ago)
Author:
sommeria
Message:

various

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/proj_field.m

    r967 r971  
    1919%    .Type : type of projection object
    2020%    .ProjMode=mode of projection ;
    21 %    .CoordUnit: 'px', 'cm' units for the coordinates defining the object
     21%    .CoordUnit: 'px', 'cm' units for the coordinates defining the
     22%    objectuvmat
     23
    2224%    .Angle (  angles of rotation (=[0 0 0] by default)
    2325%    .ProjAngle=angle of projection;
     
    15741576                    ProjData.(AXName)=[coord_x_proj(1) coord_x_proj(end)]; %record the new (projected ) x coordinates
    15751577                    [X,YI]=meshgrid(coord_x_proj,coord_y_proj);%grid in the new coordinates
    1576                     XI=ObjectData.Coord(1,1)+(X)*cos(PlaneAngle(3))-YI*sin(PlaneAngle(3));%corresponding coordinates in the original system
    1577                     YI=ObjectData.Coord(1,2)+(X)*sin(PlaneAngle(3))+YI*cos(PlaneAngle(3));
     1578                    XI=ObjectData.Coord(1,1)+(X)*cos(PlaneAngle(2))-YI*sin(PlaneAngle(1));%corresponding coordinates in the original system
     1579                    YI=ObjectData.Coord(1,2)+(X)*sin(PlaneAngle(2))+YI*cos(PlaneAngle(1));
    15781580                    if numel(Coord{1})==2% x coordiante defiend by its bounds, get the whole set
    15791581                        Coord{1}=linspace(Coord{1}(1),Coord{1}(2),CellInfo{icell}.CoordSize(1));
  • trunk/src/script_readlvm.m

    r959 r971  
    11%% get the input file
    2 project='/fsnet/project/coriolis/2015/15MINI_MEDDY/PROBES';
    3 if ~exist(project,'dir')
    4     project='U:\project\coriolis\2015\15MINI_MEDDY\PROBES';%windows
    5 end
     2project='/fsnet/project/coriolis/2016/16CREST';
     3% if ~exist(project,'dir')
     4%     project='U:\project\coriolis\2015\15MINI_MEDDY\PROBES';%windows
     5% end
    66fileinput=uigetfile_uvmat('pick an input file',project);
    77[Path,Name,Ext]=fileparts(fileinput);
  • trunk/src/series/extract_multitif.m

    r939 r971  
    130130    rank=regexprep(rank,['^' RootName '@'],'');
    131131    if ~isequal(str2num(rank),ilist-1)
    132         disp('error in the list of input files')
     132        disp(['error in the list of input file # ' num2str(ilist-1)])
    133133        return
    134134    end
     
    178178t=struct2xml(XmlInput.Camera);
    179179t=set(t,1,'name','ImaDoc');
    180 save(fullfile(Param.InputTable{1,1},'PCO.xml'),t)
     180save(t,fullfile(Param.InputTable{1,1},'PCO.xml'))
    181181
    182182%% remove initial files if transfer OK
Note: See TracChangeset for help on using the changeset viewer.