Fixed subframes inversion in rotation for python

pyomeca · Jun 26, 2024 · 4bd161b · 4bd161b
1 parent a35c545
commit 4bd161b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/binding/python3/ezc3d_python.i b/binding/python3/ezc3d_python.i
@@ -131,7 +131,11 @@ PyObject * _get_analogs(const ezc3d::c3d& c3d, const std::vector<int>& analogs)
     for (size_t f = 0; f < nFrames; ++f)
         for (size_t sf = 0; sf < nSubframes; ++sf)
             for (int a = 0; a < nAnalogs; ++a)
-                data[nSubframes*nFrames*a + sf+nSubframes*f] = c3d.data().frame(f).analogs().subframe(sf).channel(analogs[a]).data();
+                data[
+                    f * nSubframes + 
+                    sf + 
+                    a * nSubframes * nFrames
+                ] = c3d.data().frame(f).analogs().subframe(sf).channel(analogs[a]).data();
 
     // Export them to Python Object
     int nArraySize = 3;
@@ -168,8 +172,8 @@ PyObject * _get_rotations(
                 for (size_t i = 0; i<4; ++i){
                     for (size_t j = 0; j<4; ++j){
                         data[
-                            f + 
-                            sf * nFrames +
+                            f * nSubframes + 
+                            sf +
                             r * nSubframes * nFrames + 
                             j * nRotations * nSubframes * nFrames + 
                             i * 4 * nRotations * nSubframes * nFrames