Merge pull request #68 from ralfHielscher/master

mtex 4.0.22

Makefile

@@ -60,7 +60,7 @@ clean:
 
 
 # rule for making release
-RNAME = mtex-4.0.21
+RNAME = mtex-4.0.22
 RDIR = ../releases
 release:
 	rm -rf $(RDIR)/$(RNAME)*

VERSION

@@ -1 +1 @@
-MTEX 4.0.21
+MTEX 4.0.22

geometry/@orientation/axis.m

@@ -30,7 +30,17 @@
 % See also
 % orientation/angle
 
-if nargin == 2
+
+if nargin == 1
+
+  % project to Fundamental region to get the axis with the smallest angle
+  o1 = project2FundamentalRegion(o1);
+  a = axis@quaternion(o1);
+
+  % add symmetry to axis
+  if isa(o1.SS,'crystalSymmetry'), a = Miller(a,o1.SS); end
+
+else
 
   [l,d,r] = factor(o1.CS,o2.CS);
   l = l * d;
@@ -61,15 +71,8 @@
   q = reshape(inv(r(irMax)),size(q21)) .* q21 .* reshape(l(ilMax),size(q21));
 
   % now the misorientation axis is given by in specimen coordinates is
-  % given by l(il) * q.axis or equivalently by  
-  a = r(irMax) .* q.axis;
+  % given by o2 * l(il) * q.axis or equivalently by  
+  a = q2 .* r(irMax) .* axis@quaternion(q);
 
-  return
 end
 
-% project to Fundamental region to get the axis with the smallest angle
-o1 = project2FundamentalRegion(o1);
-a = axis@quaternion(o1);
-
-% add symmetry to axis
-if isa(o1.SS,'crystalSymmetry') > 1, a = Miller(a,o1.SS); end

geometry/@sphericalRegion/char.m

@@ -1,7 +1,7 @@
 function s = char(sR)
 % convert spherical region to char
 
-switch length(length(sR.N))  
+switch length(sR.N)
   case 0
     s = 'full sphere';
   case 1
@@ -10,7 +10,8 @@
     else
       s = 'lower hemisphere';
     end
-  case 2
+  otherwise
+    s = 'sector';
 end
 
 end

tools/orientationMappings/HSVOrientationMapping.m

@@ -124,6 +124,7 @@ function updateColorPostRotation(oM)
 
     function rgb = h2color(oM,h,varargin)
 
+      h.antipodal = false;
       h = h.project2FundamentalRegion(oM.CS1);
       whiteCenter = oM.whiteCenter.project2FundamentalRegion(oM.CS1); %#ok<*PROP>
       switchWB = false;

tools/orientationMappings/ipdfOrientationMapping.m

@@ -38,7 +38,7 @@ function plot(oM,varargin)
       else
         defaultPlotCMD = 'pcolor';
       end
-      plot(h,d,defaultPlotCMD,'parent',mtexFig.gca,varargin{:});
+      plot(h,d,defaultPlotCMD,varargin{:});
       if ~check_option(varargin,'noTitle')
         tt = mtexTitle(mtexFig.gca,char(oM(1).inversePoleFigureDirection));
         set(tt,'string',['IPF ' get(tt,'string')]);