Ḿinor changes

ORTools4MTEX · May 20, 2021 · 60e5165 · 60e5165
1 parent 08a8f8c
commit 60e5165
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/library/arrow3d.m b/library/arrow3d.m
@@ -96,5 +96,5 @@
 Y1(5,:)=Y1(5,:)*0 + y(3);
 Z1(5,:)=Z1(5,:)*0 + z(3);
 h=surf(X1,Y1,Z1,'facecolor',colr,'edgecolor','none');
-camlight
-lighting phong
+% camlight
+% lighting phong
diff --git a/src/detectParentTwins.m b/src/detectParentTwins.m
@@ -6,12 +6,12 @@ function detectParentTwins(job,pGrainId,varargin)
 %
 % Input
 %  job          - @parentGrainreconstructor
-%  pGrainId     - parent grain Id
+%  pGrainId     - parent grain Id 
+%  direction    - @vector3d
 %
 % Option
 %  grains       - plot grain data instead of EBSD data
 
-
 %% Check if any twins are around
 pGrain = job.parentGrains(job.parentGrains.id2ind(pGrainId));   
 twIds = checkNeighbors(pGrain,job.parentGrains);
@@ -22,7 +22,7 @@ function detectParentTwins(job,pGrainId,varargin)
 
 %% Prepare IPF color key
 ipfKeyParent = ipfHSVKey(job.csParent);
-ipfKeyParent.inversePoleFigureDirection = getClass(varargin,'vector3d',vector3d.Z);
+ipfKeyParent.inversePoleFigureDirection = getClass(varargin,'vector3d',vector3d.X);
 
 %% Define the parent grainand find twin related neighbor grains
 twGrains = job.parentGrains(job.parentGrains.id2ind(twIds));

diff --git a/src/grainClick.m b/src/grainClick.m
@@ -7,6 +7,7 @@ function grainClick(job,varargin)
 % Input
 %  job          - @parentGrainreconstructor
 %  parentEBSD   - reconstructed @EBSD data
+%  direction    - @vector3d
 % 
 % Option
 %  grains       - plot grain data instead of ebsd data

diff --git a/src/plotCrystal_OR.m b/src/plotCrystal_OR.m
@@ -21,7 +21,7 @@ function plotCrystal_OR(job,oriP,varargin)
     planeC,...
     directionP,...
     directionC] =...
-    round2Miller(job.p2c);
+    round2Miller(job.p2c,'maxHKL',15);
 
 
 % Calculate the child variants

diff --git a/src/plotStack.m b/src/plotStack.m
@@ -1,26 +1,27 @@
 function plotStack(job,pGrainId,varargin)
-% plot maps of a prior parent grain
-%
-% Syntax
-%  plotStack(job,pGrainId)
-%
-% Input
-%  job          - @parentGrainreconstructor
-%  pGrainId     - parent grain Id
-%
-% Option
-%  grains       - plot grain data instead of EBSD data
-%  noScalebar   - Remove scalebar from maps
-%  noFrame      - Remove frame around maps
-
+    % plot maps of a prior parent grain
+    %
+    % Syntax
+    %  plotStack(job,pGrainId)
+    %
+    % Input
+    %  job          - @parentGrainreconstructor
+    %  pGrainId     - parent grain Id
+    %  direction    - @vector3d
+    %
+    % Option
+    %  grains       - plot grain data instead of EBSD data
+    %  noScalebar   - Remove scalebar from maps
+    %  noFrame      - Remove frame around maps
 
+    vector = getClass(varargin,'vector3d',vector3d.X);
     %% Define the parent grain
     pGrain = job.parentGrains(job.parentGrains.id == pGrainId);
     pEBSD = job.ebsd(pGrain);
     pEBSD = pEBSD(job.csParent);
     % Define the parent grain IPF notation
     ipfKeyParent = ipfHSVKey(job.csParent);
-    ipfKeyParent.inversePoleFigureDirection = vector3d.X;
+    ipfKeyParent.inversePoleFigureDirection = vector;
     % Define the parent PDF
     hParent = Miller(0,0,1,job.csParent,'hkl');
 
@@ -31,7 +32,7 @@ function plotStack(job,pGrainId,varargin)
     cEBSD = cEBSD(job.csChild);
     % Define the child grain(s) IPF notation
     ipfKeyChild = ipfHSVKey(job.csChild);
-    ipfKeyChild.inversePoleFigureDirection = vector3d.X;
+    ipfKeyChild.inversePoleFigureDirection = vector;
     % Define the child PDF
     hChild = Miller(0,0,1,job.csChild,'hkl');
     hParent = Miller(0,0,1,job.csParent,'hkl');
@@ -351,7 +352,7 @@ function plotStack(job,pGrainId,varargin)
     ylabel('Area normalised frequency','FontSize',14,'FontWeight','bold');
     set(f,'Name','Histogram: Weighted area packet Ids','NumberTitle','on');
 
-    try tileFigs; end
+%     try tileFigs; end
     return
     end