From 85a8970f7700be189b0e63ae6faa42b35dff72ab Mon Sep 17 00:00:00 2001 From: Elian Dib <elian.dib@inria.fr> Date: Tue, 23 Jul 2019 16:15:17 +0200 Subject: [PATCH] Cleaned code --- completeOriginal.m | 3 ++- getLF.m | 12 ++++++------ getQueryCoordsAffine.m | 3 +++ getSR.m | 8 -------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/completeOriginal.m b/completeOriginal.m index 05e5b54..ab2af9f 100644 --- a/completeOriginal.m +++ b/completeOriginal.m @@ -17,4 +17,5 @@ for lab = 1:numLab end Ref = SR.FieldsToSet(Offset,Color,Label); -end + +end \ No newline at end of file diff --git a/getLF.m b/getLF.m index a390f0b..6a557f5 100644 --- a/getLF.m +++ b/getLF.m @@ -61,14 +61,14 @@ for lab = 1:numLab SRLabsub = SRLab {lab}(:,:,1,v); SRDispsub = SRDisp{lab}(:,:,1,v); - SRColsub = utils.fillmissing(SRColsub,seh,1); - SRLabsub = utils.fillmissing(SRLabsub,seh,1); + SRColsub = utils.fillmissing(SRColsub,seh,1); + SRLabsub = utils.fillmissing(SRLabsub,seh,1); SRDispsub = utils.fillmissing(SRDispsub,seh,1); - - SRColsub = utils.fillmissing(SRColsub,sev,1); - SRLabsub = utils.fillmissing(SRLabsub,sev,1); + + SRColsub = utils.fillmissing(SRColsub,sev,1); + SRLabsub = utils.fillmissing(SRLabsub,sev,1); SRDispsub = utils.fillmissing(SRDispsub,sev,1); - + % Compute super-ray boundary srxqmin = ceil (min(SRXsub(:))); srxqmax = floor(max(SRXsub(:))); diff --git a/getQueryCoordsAffine.m b/getQueryCoordsAffine.m index a01bfde..675aa50 100644 --- a/getQueryCoordsAffine.m +++ b/getQueryCoordsAffine.m @@ -33,6 +33,9 @@ Yp = Y-V.*LFDisp; s = cell(1,numLab); [SRXq,SRYq,SRDisp] = deal(cell(1,numLab)); +%% +progress(''); + fprintf('Super-ray computation...\n'); for lab = 1:numLab msg = ['Initializing super-ray ',num2str(lab),'/',num2str(numLab),'\n']; diff --git a/getSR.m b/getSR.m index 9d34dd7..63ab5c5 100644 --- a/getSR.m +++ b/getSR.m @@ -43,12 +43,6 @@ LFDisp(isnan(LFDisp))=0; % Compute projected coordinates of reference samples gv = arrayfun(@(x) 1:x,LFSize,'UniformOutput',false); -ugv = reshape(gv{4},1,1,1,[],1); -vgv = reshape(gv{5},1,1,1,1,[]); -ugv = ugv-centerView(1); -vgv = vgv-centerView(2); - -[LFX,LFY] = ndgrid(gv{:}); [LFX,LFY] = ndgrid(gv{1:2}); LFX = LFX + Offset(1); @@ -104,8 +98,6 @@ for lab = 1:numLab LFXsub = LFX(mgv{:}); LFYsub = LFY(mgv{:}); - % [LFXsub,LFYsub,Xq,Yq] = utils.gridCoords(LFXsub,LFYsub,SRXq,SRYq); - M = isnan(Xq)|isnan(Yq); Xq(M) = 1; -- GitLab