From bac910336e95bd8cd02af855bcf2187fdef9fb46 Mon Sep 17 00:00:00 2001
From: Laura Nervo <lnervo@esrf.fr>
Date: Mon, 3 Dec 2012 10:34:55 +0000
Subject: [PATCH] gtINDEXMatchGrains : bug fix with 'conflicts' output argument
Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>
git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@941 4c865b51-4357-4376-afb4-474e03ccb993
---
zUtil_Indexter/gtINDEXMatchGrains.m | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/zUtil_Indexter/gtINDEXMatchGrains.m b/zUtil_Indexter/gtINDEXMatchGrains.m
index f5c32172..4857df74 100644
--- a/zUtil_Indexter/gtINDEXMatchGrains.m
+++ b/zUtil_Indexter/gtINDEXMatchGrains.m
@@ -141,7 +141,7 @@ if ~exist('grain2','var') || isempty(grain2)
end
-if ~exist('tol','var')
+if ~exist('tol','var') || isempty(tol)
tol.distf = 0.5; % 0.5
tol.Rdist = 0.02; % 0.05
tol.bbxs = 2; % 3
@@ -471,6 +471,12 @@ else
end
if nargout == 6
+ if size(conflicts{1},2)>1
+ for ii=1:size(conflicts,1)
+ tmp{ii} = [conflicts{ii,:}];
+ end
+ tmp2= cell2mat(tmp);
+ else
tmp = cell2mat(conflicts);
pippo_cc = cell(0,2);
for ii=1:size(tmp,1)
@@ -480,6 +486,7 @@ else
end
tmp = cell2mat(pippo_cc');
toBeChecked = unique(tmp, 'rows');
+ end
end
end
--
GitLab