Merge branch 'develop' into feature/pseudo3d_EBSD

# Conflicts: # VERSION # plotting/plotting_tools/setColorRange.m
mtex-toolbox · Sep 7, 2023 · 361a245 · 361a245
2 parents d1f0432 + 3e760d3
commit 361a245
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/geometry/@crystalSymmetry/crystalSymmetry.m b/geometry/@crystalSymmetry/crystalSymmetry.m
@@ -166,6 +166,7 @@
       % set axes, mineral name and color
       s.axes = axes;
       s.mineral = get_option(varargin,'mineral','');
+      s.mineral = strtrim(regexprep(s.mineral,char(0),' '));
       s.color = get_option(varargin,'color','');
 
       if check_option(varargin,'density')

diff --git a/geometry/@vector3d/smooth.m b/geometry/@vector3d/smooth.m
@@ -98,7 +98,7 @@
 
   % adjust caxis according to colorRange
   if ~any(isnan(colorRange)) && diff(colorRange)>0
-    clim(sP(j).ax,colorRange); 
+    caxis(sP(j).ax,colorRange); 
   end
   if check_option(varargin,'log'), set(sP(j).ax,'colorScale','log'); end
 

diff --git a/plotting/plotting_tools/setColorRange.m b/plotting/plotting_tools/setColorRange.m
@@ -52,7 +52,11 @@ function setColorRange(varargin)
   % find maximum color range
   c = zeros(length(mtexFig.children),2);
   for i = 1:length(mtexFig.children)
-    c(i,:) = clim(mtexFig.children(i));
+    try
+      c(i,:) = clim(mtexFig.children(i));
+    catch
+      c(i,:) = caxis(mtexFig.children(i));
+    end
   end
   mi = min(c,[],1);
   ma = max(c,[],1);