From 0321f34c16e13bb1182d7760bd2c6b34008f3178 Mon Sep 17 00:00:00 2001
From: Nicola Vigano <nicola.vigano@esrf.fr>
Date: Mon, 13 Apr 2015 16:58:24 +0200
Subject: [PATCH] 6D: Improved visualization of extended grains
Signed-off-by: Nicola Vigano <nicola.vigano@esrf.fr>
---
zUtil_Deformation/gt6DPlotReconstructionODF.m | 22 ++++++++++++-------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/zUtil_Deformation/gt6DPlotReconstructionODF.m b/zUtil_Deformation/gt6DPlotReconstructionODF.m
index 928bf36f..9c4fa54b 100644
--- a/zUtil_Deformation/gt6DPlotReconstructionODF.m
+++ b/zUtil_Deformation/gt6DPlotReconstructionODF.m
@@ -1,18 +1,20 @@
-function gt6DPlotReconstructionODF(phase_id, grain_id, percent, lims_mult)
+function varargout = gt6DPlotReconstructionODF(phase_id, grain_id, percent, lims_mult)
if (numel(grain_id) > 1)
- str_ids = sprintf('_%04d', grain_id);
- file_cluster_rec_path = fullfile('4_grains', ...
- sprintf('phase_%02d', phase_id), ...
- sprintf('grain_cluster_details%s.mat', str_ids));
- grain_rec = load(file_cluster_rec_path);
+ grain_rec = gtLoadClusterRec(phase_id, grain_id);
resolution_multiplier = 1;
+
+ is_extended = false;
else
- grain_rec = gtLoadGrainRec(phase_id, grain_id);
+ sample = GtSample.loadFromFile();
+ is_extended = sample.phases{phase_id}.getUseExtended(grain_id);
+
+ grain_rec = gtLoadGrainRec(phase_id, grain_id, 'is_extended', is_extended);
+% resolution_multiplier = 1;
resolution_multiplier = 0.2;
end
- grain = gtLoadGrain(phase_id, grain_id(1), 'fields', {'R_vector'});
+ grain = gtLoadGrain(phase_id, grain_id(1), 'fields', {'R_vector'}, 'is_extended', is_extended);
if (~isfield(grain_rec, 'SEG'))
grain_rec.SEG = gtLoadGrain(phase_id, grain_id, ...
@@ -101,4 +103,8 @@ function gt6DPlotReconstructionODF(phase_id, grain_id, percent, lims_mult)
pos = get(f, 'Position');
pos(3:4) = pos(3:4) * 1.5;
set(f, 'position', pos);
+
+ if (nargout >= 1)
+ varargout{1} = odf;
+ end
end
--
GitLab