DataStructures : fix bug in GtSample.GtSample, GtSample.mergeSummaryField and...

DataStructures : fix bug in GtSample.GtSample, GtSample.mergeSummaryField and add method GtPhase.getGrainsWithFieldValueEqualsTo.

Signed-off-by: Laura Nervo <laura.nervo@esrf.fr>

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@710 4c865b51-4357-4376-afb4-474e03ccb993

zUtil_DataStructures/GtPhase.m

@@ -351,6 +351,11 @@ classdef GtPhase < handle
             allvalues = getAllValuesFromGrainsField(obj, field, true);
             grainIDs = find(allvalues < value);
         end
+        
+        function grainIDs = getGrainsWithFieldValueEqualsTo(obj, field, value)
+            allvalues = getAllValuesFromGrainsField(obj, field, true);
+            grainIDs = find(allvalues == value); 
+        end
 
         function grainIDs = getSummaryWithFieldValueLessThan(obj, field, value, uniform)
             allvalues = getAllValuesFromSummaryField(obj, field, uniform);

zUtil_DataStructures/GtSample.m

@@ -10,7 +10,7 @@ classdef GtSample < handle
     end
 
     methods (Access = public)
-        function obj = GtSample(phases_num, volume_file, absvol_file)
+        function obj = GtSample(phases_num, volume_file, absvol_file, file_table)
         % GTSAMPLE/GTSAMPLE Constructor
 
             if (~exist('phases_num', 'var'))
@@ -26,8 +26,8 @@ classdef GtSample < handle
             for ii = 1: phases_num
                 obj.phases{ii} = GtPhase();
             end
-            if (exist('fileTable', 'var'))
-                obj.fileTable = fileTable;
+            if (exist('file_table', 'var'))
+                obj.fileTable = file_table;
             end    
         end
 
@@ -200,11 +200,15 @@ classdef GtSample < handle
 
         function mergeSummaryField(obj, other, phaseNum, grainNum, field, defaultValue)
         % GTSAMPLE/MERGESUMMARYFIELD
+        if strcmp(field,'difspotID') || strcmp(field,'idspot') || strcmp(field,'idconflict')
+            obj.phases{phaseNum}.summary{grainNum}.(field) = other.phases{phaseNum}.summary{grainNum}.(field);
+        else
             if (other.phases{phaseNum}.summary{grainNum}.(field) ~= defaultValue)
                 obj.phases{phaseNum}.summary{grainNum}.(field) = ...
                                             other.phases{phaseNum}.summary{grainNum}.(field);
             end
         end
+        end
 
         function mergeConflictsField(obj, other, phaseNum, grainNum, field, defaultValue)
         % GTSAMPLE/MERGESUMMARYFIELD