Cleaned getLF, getSR and getQueryCoordAffine

getLF.m

@@ -48,7 +48,7 @@ for lab = 1:numLab
     % Compute super-ray view by view
     for v = 1:numView
         msg = ['Computing light field from super-ray ',num2str(lab),'/',num2str(numLab),...
-            '\nView ',num2str(v),'/',num2str(numView),'\n'];
+            ' (view ',num2str(v),'/',num2str(numView),')\n'];
         progress(msg);
         
         SRXsub    = SRX   {lab}(:,:,1,v);
@@ -115,7 +115,9 @@ for lab = 1:numLab
         end
     end
 end
-fprintf('\n\n');
+
+progress('',0);
+fprintf('\n');
 
 warning(wgriddata.state,'MATLAB:griddata:DuplicateDataPoints');
 warning(wscattered.state,'MATLAB:scatteredInterpolant:DupPtsAvValuesWarnId');

getLF_parfor.m

@@ -128,7 +128,9 @@ for lab = 1:numLab
         Color (:,:,:,v) = Color_;
     end
 end
-fprintf('\n\n');
+
+progress('',0);
+fprintf('\n');
 
 warning(wgriddata.state,'MATLAB:griddata:DuplicateDataPoints');
 warning(wscattered.state,'MATLAB:scatteredInterpolant:DupPtsAvValuesWarnId');

getQueryCoordsAffine.m

@@ -35,9 +35,10 @@ s = cell(1,numLab);
 [SRXq,SRYq,SRDisp] = deal(cell(1,numLab));
 
 %%
-progress('');
-
 fprintf('Super-ray computation...\n');
+
+%%
+progress('',0);
 for lab = 1:numLab
     msg = ['Initializing super-ray ',num2str(lab),'/',num2str(numLab),'\n'];
     progress(msg);
@@ -74,6 +75,9 @@ for lab = 1:numLab
     SRDisp{lab} = ones(size(SRXq{lab})).*D_;
 end
 
+progress('',0);
+fprintf('\n');
+
 p00 = cellfun(@(x) x.p00,s);
 p01 = cellfun(@(x) x.p01,s);
 p10 = cellfun(@(x) x.p10,s);

getSR.m

@@ -48,7 +48,7 @@ gv = arrayfun(@(x) 1:x,ImgSize,'UniformOutput',false);
 LFX = LFX + Offset(1);
 LFY = LFY + Offset(2);
 
-progress('');
+progress('',0);
 
 wgriddata = warning('query','MATLAB:griddata:DuplicateDataPoints');
 wscattered = warning('query','MATLAB:scatteredInterpolant:DupPtsAvValuesWarnId');
@@ -82,7 +82,7 @@ for lab = 1:numLab
     % Compute super-ray view by view
     for v = 1:numView
         msg = ['Computing super-ray ',num2str(lab),'/',num2str(numLab),...
-            ' from light field\nView ',num2str(v),'/',num2str(numView),'\n'];
+            ' from light field (view ',num2str(v),'/',num2str(numView),')\n'];
         progress(msg);
         
         Xq = SRXq{lab}(:,:,:,v);
@@ -129,7 +129,9 @@ for lab = 1:numLab
         SRLab{lab}(:,:,:,v) = Lab;
     end
 end
-fprintf('\n\n');
+
+progress('',0);
+fprintf('\n');
 
 warning(wgriddata.state,'MATLAB:griddata:DuplicateDataPoints');
 warning(wscattered.state,'MATLAB:scatteredInterpolant:DupPtsAvValuesWarnId');

getSR_parfor.m

@@ -48,7 +48,7 @@ gv = arrayfun(@(x) 1:x,ImgSize,'UniformOutput',false);
 LFX = LFX + Offset(1);
 LFY = LFY + Offset(2);
 
-progress('');
+progress('',0);
 
 wgriddata = warning('query','MATLAB:griddata:DuplicateDataPoints');
 wscattered = warning('query','MATLAB:scatteredInterpolant:DupPtsAvValuesWarnId');
@@ -137,7 +137,9 @@ for lab = 1:numLab
     SRLab {lab} = SRLab_lab;
     SRDisp{lab} = SRDisp_lab;
 end
-fprintf('\n\n');
+
+progress('',0);
+fprintf('\n');
 
 warning(wgriddata.state,'MATLAB:griddata:DuplicateDataPoints');
 warning(wscattered.state,'MATLAB:scatteredInterpolant:DupPtsAvValuesWarnId');