Bugfixes for hex EBSD meshes

Author: AHartmaier

src/kanapy/ebsd_hex_grid.py

@@ -112,11 +112,23 @@ def quat_markley_mean(quats, weights=None):
 def resample_quat_knn_markley(quat_src, idx, dist, p=2.0):
     """
     Quaternion resampling using k-NN, IDW weights, and Markley mean.
-    quat_src: (N,4)
-    idx/dist: (M,k)
-    returns (M,4)
+
+    quat_src: (N, 4)
+    idx:      (M, k) or (M,)
+    dist:     (M, k) or (M,)
+    returns:  (M, 4)
     """
-    Qs = _normalize_quat(quat_src.astype(float, copy=False))
+    Qs = _normalize_quat(np.asarray(quat_src, dtype=float))
+
+    idx = np.asarray(idx)
+    dist = np.asarray(dist)
+
+    # Make sure idx/dist are always 2D: (M, k)
+    if idx.ndim == 1:
+        idx = idx[:, None]
+    if dist.ndim == 1:
+        dist = dist[:, None]
+
     M, k = idx.shape
     out = np.empty((M, 4), dtype=float)
 
@@ -127,12 +139,12 @@ def resample_quat_knn_markley(quat_src, idx, dist, p=2.0):
 
     nonzero = ~zero
     if np.any(nonzero):
-        w = _idw_weights(dist[nonzero], p=p)  # (M', k)
-        neigh = Qs[idx[nonzero]]             # (M', k, 4)
+        w = _idw_weights(dist[nonzero], p=p)      # (M', k)
+        neigh = Qs[idx[nonzero]]                  # (M', k, 4)
 
-        # Sign alignment: align all neighbors to the first neighbor
-        ref = neigh[:, :1, :]                # (M',1,4)
-        sgn = np.sign(np.sum(neigh * ref, axis=2, keepdims=True))  # (M',k,1)
+        # Align signs to first neighbor
+        ref = neigh[:, :1, :]                     # (M', 1, 4)
+        sgn = np.sign(np.sum(neigh * ref, axis=2, keepdims=True))
         sgn[sgn == 0] = 1.0
         neigh_aligned = neigh * sgn
 

src/kanapy/texture.py

@@ -1795,12 +1795,18 @@ def _plot_hex_rgb(xy, rgb, dx, dy=None, ax=None):
                 ori_e = Orientation.from_euler(self.emap[mask].orientations.in_euler_fundamental_region())
                 ori_q = np.stack([ori_e.a, ori_e.b, ori_e.c, ori_e.d]).T
                 rgb_val = ipf_key.orientation2color(ori_e)
-                ax = _plot_hex_rgb(xy, rgb_val, self.dx, self.dy)
+                #ax = _plot_hex_rgb(xy, rgb_val, self.dx, self.dy)
+                #xg, yg, phase_g, ci_g, quat_g = \
+                #    resample_ebsd_to_rect_grid(xy[self.emap.is_indexed],
+                #                               self.emap.phase_id[self.emap.is_indexed],
+                #                               ori_q,
+                #                               val_ci[self.emap.is_indexed],
+                #                               nx=self.sh_y, ny=self.sh_x)
                 xg, yg, phase_g, ci_g, quat_g = \
-                    resample_ebsd_to_rect_grid(xy[self.emap.is_indexed],
-                                               self.emap.phase_id[self.emap.is_indexed],
+                    resample_ebsd_to_rect_grid(xy[mask],
+                                               self.emap.phase_id[mask],
                                                ori_q,
-                                               val_ci[self.emap.is_indexed],
+                                               val_ci[mask],
                                                nx=self.sh_y, ny=self.sh_x)
                 # get Euler Angles
                 q_flat = quat_g.reshape(-1, 4)