Added possibility of choosing between omega and hkl colormap

Signed-off-by: Lorenzo Valzania <valzania@rnice7-0308.esrf.fr>

4_grains/gtCalculateGrain.m

@@ -284,7 +284,7 @@ for n = 1:numel(detgeo)
 
     % Visual Feedback
     if (app.showfigure)
-        sfDisplayFigure(parameters, app, grain, det_ind);
+        sfDisplayFigure(parameters, app, grain, n);
     end
 end
 
@@ -296,8 +296,8 @@ end
 % sub-functions
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 function sfDisplayFigure(parameters, app, grain, det_ind)
-
     detgeo = parameters.detgeo(det_ind);
+    labgeo = parameters.labgeo;
 
     detusize = detgeo.detsizeu;
     detvsize = detgeo.detsizev;
@@ -309,12 +309,12 @@ function sfDisplayFigure(parameters, app, grain, det_ind)
     hf = figure();
     ax = axes('Parent', hf);
     imshow(app.overlay, app.clims, 'Parent', ax);
-    hold(ax, 'On');
+    hold(ax, 'on');
 
     if (app.axis)
         % Detector geometry
-        beamdir = detgeo.beamdir';
-        rotdir  = detgeo.rotdir';
+        beamdir = labgeo.beamdir';
+        rotdir  = labgeo.rotdir';
         detdiru = detgeo.detdiru';
         detdirv = detgeo.detdirv';
         Qdet    = gtFedDetectorProjectionTensor(detdiru, detdirv, 1, 1);
@@ -350,31 +350,60 @@ function sfDisplayFigure(parameters, app, grain, det_ind)
         quiver(uvorig(1), uvorig(2), rotuv(1), rotuv(2), 1000, '-.k', 'Linewidth', 3)
     end
 
-    cmap = jet(1001);
-    omtoRGB = @(om) cmap(round((om)/(360)*1000+1), :);
-
     if (app.color)
-        freezeColors(gca)
-        colormap(cmap)
-        colorbar
-        caxis([0 360])
+        ondet = grain.allblobs.detector(1).ondet;
+        om = grain.allblobs.omega(ondet);
+        uvw = grain.allblobs.detector(1).uvw(ondet);
+        cm = inputwdefault(['Choose the type of colormap: omega coloring '...
+            '(o) or hkl coloring (h): [o]'], 'o');
+
+        if (strcmp(cm, 'h'))
+            disp('Using hkl colormap ...')
+            thetatype = grain.allblobs.thetatype(ondet);
+            theta = grain.allblobs.theta(ondet);
+            thetatype = thetatype(theta <= detgeo.detanglemax/2 ...
+                                & theta >= detgeo.detanglemin/2);
+            uthetatypes = unique(thetatype);
+            cmap_hkl = jet(numel(uthetatypes));
+            freezeColors(gca)
+            colormap(cmap_hkl);
+            c = colorbar;
+            xlabel(c, 'theta (deg)')
+            caxis([min(theta) max(theta)])
+
+            for it = 1:numel(uthetatypes)
+                indx = (thetatype == uthetatypes(it));
+                h = scatter3(uvw(indx, 1), uvw(indx, 2), uvw(indx, 3), ...
+                    app.markersize, cmap_hkl(it, :), 'fill', 'o');
+            end
+            impixelinfo
+
+        else
+            disp('Using omega colormap ...')
+            cmap_omega = jet(1001);
+            omtoRGB = @(om) cmap_omega(round((om)/(360)*1000+1), :);
+            freezeColors(gca)
+            colormap(cmap_omega)
+            colorbar
+            caxis([0 360])
+            impixelinfo
+            for iom = 1:numel(om)
+                h = scatter3(uvw(iom, 1), uvw(iom, 2), uvw(iom, 3), ...
+                    app.markersize, omtoRGB(om(iom)), 'fill', 'o');
+            end
+        end
+
     else
         colormap(gray);
-    end
 
-    uvw = grain.allblobs.detector(1).uvw;
-    if (app.color)
-        om = grain.allblobs.omega;
-        h = scatter3(uvw(:, 1), uvw(:, 2), uvw(:, 3), app.markersize, 'fill', 'o', 'CData', omtoRGB(om));
-    else
-        h = scatter3(uvw(:, 1), uvw(:, 2), uvw(:, 3), app.markersize, 'fill', 'o');
     end
+
     set(h, 'MarkerEdgeColor', [0 0 0])
     view(0, 90)
     xlim([0 detusize])
     ylim([0 detvsize])
 
-    hold(ax, 'Off');
+    hold(ax, 'off');
 
     ax_title = sprintf('Fsim for grain %d in phase %d', grain.id(1), grain.phaseid);
     title(ax, ax_title, 'FontWeight', 'bold');