# Changeset 1059

Ignore:
Timestamp:
Nov 29, 2018, 5:44:44 PM (5 years ago)
Message:

various bugs repaired

Location:
trunk/src
Files:
11 edited

Unmodified
Removed

• ## trunk/src/filter_tps.m

 r1027 %% calculate tps coeff in each subdomain for isub=1:NbSubDomain isub SubRange(1,:,isub)=[CentreX(isub)-0.55*Siz(1) CentreX(isub)+0.55*Siz(1)];%bounds of subdomain #isub in x coordinate SubRange(2,:,isub)=[CentreY(isub)-0.55*Siz(2) CentreY(isub)+0.55*Siz(2)];%bounds of subdomain #isub in y coordinate ind_sel_previous=ind_sel;% record the set of selected vector indices for next iteration ind_sel=find(Coord(:,1)>=SubRange(1,1,isub) & Coord(:,1)<=SubRange(1,2,isub) & Coord(:,2)>=SubRange(2,1,isub) & Coord(:,2)<=SubRange(2,2,isub)); numel(ind_sel) % if no vector in the subdomain  #isub, skip the subdomain if isempty(ind_sel)

• ## trunk/src/phys_XYZ.m

 r1027 testangle=0; test_refraction=0; if exist('Zindex','var')&& isequal(Zindex,round(Zindex))&& Zindex>0 && isfield(Calib,'SliceCoord')&&length(Calib.SliceCoord)>=Zindex if exist('Zindex','var')&& isequal(Zindex,round(Zindex))&& Zindex>0 && isfield(Calib,'SliceCoord')&&size(Calib.SliceCoord,1)>=Zindex if isfield(Calib, 'SliceAngle') && ~isequal(Calib.SliceAngle,[0 0 0]) && ~isequal(Calib.SliceAngle(Zindex,:),[0 0 0]) testangle=1; %         Z0=norm_plane*Calib.SliceCoord(Zindex,:)'/norm_plane(3); end Z0=Calib.SliceCoord(Zindex,3);%horizontal plane z=cte Z0=Calib.SliceCoord(Zindex,3);%horizontal plane z=cte %     end Z0virt=Z0;

• ## trunk/src/series/extract_rdvision.m

 r1051 %      nbfield2=size(time,1); checkpreserve=0;% if =1, will npreserve the original images, else it erases them at the end for iview=1:size(Param.InputTable,1) check_xml=0; for iview_xml=1:size(Param.InputTable,1)% look for the xml files in the different data directories filexml=[fullfile(RootPath,Param.InputTable{iview_xml,2},Param.InputTable{iview,3}) '.xml'];%new convention: xml at the level of the image folder if exist(filexml,'file') check_xml=1; break end end if ~exist(filexml,'file') disp_uvmat('ERROR',[filexml ' missing'],checkrun) return end %     if ~exist(filexml,'file') %         disp_uvmat('ERROR',[filexml ' missing'],checkrun) %         return %     end newxml=fullfile(RootPath,Param.InputTable{iview,3}); newxml=regexprep(newxml,'_Master_Dalsa_4M180\$','');%suppress '_Master_Dalsa_4M180' [success,errormsg] = copyfile(filename_seq,[fullfile(RootPath,logdir,Param.InputTable{iview,3}) '.seq']); %copy the seq file in the upper folder [success,errormsg] = copyfile(filename_sqb,[fullfile(RootPath,logdir,Param.InputTable{iview,3}) '.sqb']); %copy the sqb file in the upper folder if check_xml [success,errormsg] = copyfile(filexml,[fullfile(RootPath,logdir,Param.InputTable{iview,3}) '.xml']); %copy the original xml file in the upper folder end otherwise errormsg='input file extension must be .seq or .sqb';
• ## trunk/src/set_object.m

 r1027 set(handles.num_RangeY_2,'TooltipString',['num_RangeY_2: half width of the ' ObjectStyle]) case {'plane','plane_z'} %        set(handles.num_Angle_3,'Visible','on') set(handles.num_Angle_3,'Visible','on') set(handles.num_RangeX_1,'Visible','on') set(handles.num_RangeX_2,'Visible','on')