Merge pull request Eomys#104 from EOMYS-Public/GUI

[BC] Solving issue related to animation
lyhehehe · May 2, 2022 · 82197ea · 82197ea
2 parents 76271c8 + 255ff7f
commit 82197ea
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/SciDataTool/Functions/Plot/__init__.py b/SciDataTool/Functions/Plot/__init__.py
@@ -16,6 +16,7 @@
     "speed": "rpm",
     "Rotation speed": "rpm",
     "modes": "",
+    "designs": "",
 }
 
 axis_norm_dict = {

diff --git a/SciDataTool/GUI/DDataPlotter/DDataPlotter.py b/SciDataTool/GUI/DDataPlotter/DDataPlotter.py
@@ -439,6 +439,8 @@ def set_cursor(event):
             x_min, x_max = self.ax.get_xlim()
             dx = (x_max - x_min) / 50
             if X is not None and Y is not None:
+                if isinstance(X, str):
+                    X = ind
                 label = format_coord(X, Y, Z, sep="\n", ind=ind)
                 if legend is not None:
                     label = legend + "\n" + label

diff --git a/SciDataTool/Methods/DataND/export_along.py b/SciDataTool/Methods/DataND/export_along.py
@@ -153,7 +153,7 @@ def export_along(
                     )
                     second_line = format_matrix(
                         np.insert(
-                            results[axes_list_new[1].name].astype("str"),
+                            results[axes_list_new[1].name].astype("<U64"),
                             0,
                             A2_cell,
                         ),

diff --git a/SciDataTool/Methods/DataND/plot_3D_Data_Animated.py b/SciDataTool/Methods/DataND/plot_3D_Data_Animated.py
@@ -2,6 +2,7 @@
 from numpy import arange, nanmax, nanmin, frombuffer
 import imageio
 from ...GUI.DDataPlotter.DDataPlotter import PARAM_2D
+from ...Functions.Plot import ifft_dict
 
 
 def plot_3D_Data_Animated(
@@ -31,9 +32,14 @@ def plot_3D_Data_Animated(
 
     # Detecting if animated axis is a DataPattern, if true changing the input given to the function
     for ax_obj in self.get_axes():
-        if ax_obj.name == animated_axis.split("[")[0]:
-            animated_axis_obj = ax_obj
-            break
+        if ax_obj.name in ifft_dict:
+            if ifft_dict[ax_obj.name] == animated_axis.split("[")[0]:
+                animated_axis_obj = ax_obj
+                break
+        else:
+            if ax_obj.name == animated_axis.split("[")[0]:
+                animated_axis_obj = ax_obj
+                break
 
     if isinstance(animated_axis_obj, DataPattern):
         # Removing one_period as it is not available with a DataPattern