glassesTools 1.3.2__tar.gz → 1.3.3__tar.gz

{glassestools-1.3.2/src/glassesTools.egg-info → glassestools-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glassesTools
-Version: 1.3.2
+Version: 1.3.3
 Summary: Tools for processing wearable eye tracker recordings.
 Home-page: https://github.com/dcnieho/glassesTools
 Author: Diederick Niehorster
@@ -38,9 +38,10 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: msgpack
-Requires-Dist: opencv-python-headless==4.9.0.80
+Requires-Dist: imgui_bundle==1.3.0
+Requires-Dist: opencv-python-headless==4.10.0.82
 Requires-Dist: ffpyplayer
-Requires-Dist: scipy==1.11.3
+Requires-Dist: eulerangles
 Provides-Extra: gui
 Requires-Dist: imgui_bundle==1.3.0; extra == "gui"
 
@@ -48,7 +49,7 @@ Requires-Dist: imgui_bundle==1.3.0; extra == "gui"
 [![PyPI Latest Release](https://img.shields.io/pypi/v/glassesTools.svg)](https://pypi.org/project/glassesTools/)
 [![image](https://img.shields.io/pypi/pyversions/glassesTools.svg)](https://pypi.org/project/glassesTools/)
 
-# GlassesTools v1.3.2
+# GlassesTools v1.3.3
 Tools for processing wearable eye tracker recordings.
 
 If you use this package or any of the code in this repository, please cite:<br>

{glassestools-1.3.2 → glassestools-1.3.3}/README.md

@@ -2,7 +2,7 @@
 [![PyPI Latest Release](https://img.shields.io/pypi/v/glassesTools.svg)](https://pypi.org/project/glassesTools/)
 [![image](https://img.shields.io/pypi/pyversions/glassesTools.svg)](https://pypi.org/project/glassesTools/)
 
-# GlassesTools v1.3.2
+# GlassesTools v1.3.3
 Tools for processing wearable eye tracker recordings.
 
 If you use this package or any of the code in this repository, please cite:<br>

{glassestools-1.3.2 → glassestools-1.3.3}/requirements.txt

@@ -1,6 +1,7 @@
 numpy
 pandas
 msgpack
-opencv-python-headless==4.9.0.80
+imgui_bundle==1.3.0
+opencv-python-headless==4.10.0.82
 ffpyplayer      # comes with ffmpeg binaries we need
-scipy==1.11.3
+eulerangles

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/aruco.py

@@ -193,7 +193,7 @@ def run_pose_estimation(in_video, frame_timestamp_file, camera_calibration_file,
             # keys is populated above
             if 's' in keys:
                 # screenshot
-                cv2.imwrite(str(output_dir / ('detect_frame_%d.png' % frame_idx)), frame)
+                cv2.imwrite(output_dir / f'detect_frame_{frame_idx}.png', frame)
             gui.update_image(frame, frame_ts/1000., frame_idx)
             closed, = gui.get_state()
             if closed:

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/importing/SMI_ETG.py

@@ -20,7 +20,7 @@ import numpy as np
 import math
 import configparser
 from io import StringIO
-from scipy.spatial.transform import Rotation
+import eulerangles
 
 from ..recording import Recording
 from ..eyetracker import EyeTracker
@@ -187,7 +187,8 @@ def getCameraFromFile(inputDir: str|pathlib.Path, outputDir: str|pathlib.Path):
     # 2. sensor offsets seem to be relative to center of sensor
     camera['principalPoint'] = camera['resolution']/2.+camera['sensorOffsets']
     # 3. turn euler angles into rotation matrix (180-Rz because poster space has positive X rightward and positive Y downward)
-    camera['rotation'] = Rotation.from_euler('XYZ', [camera['eulerAngles'][0], camera['eulerAngles'][1], 180-camera['eulerAngles'][2]], degrees=True).as_matrix()
+    eulers = [camera['eulerAngles'][0], camera['eulerAngles'][1], 180-camera['eulerAngles'][2]]
+    camera['rotation'] = eulerangles.euler2matrix(eulers, 'xyz', intrinsic=True, right_handed_rotation=True)
 
     # turn into camera matrix and distortion coefficients as used by OpenCV
     camera['cameraMatrix'] = np.identity(3)
@@ -203,7 +204,7 @@ def getCameraFromFile(inputDir: str|pathlib.Path, outputDir: str|pathlib.Path):
 
 
     # store to file
-    fs = cv2.FileStorage(str(outputDir / 'calibration.xml'), cv2.FILE_STORAGE_WRITE)
+    fs = cv2.FileStorage(outputDir / 'calibration.xml', cv2.FILE_STORAGE_WRITE)
     for key,value in camera.items():
         fs.write(name=key,val=value)
     fs.release()

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/importing/SeeTrue_STONE.py

@@ -127,7 +127,7 @@ def copySeeTrueRecording(inputDir: pathlib.Path, outputDir: pathlib.Path, recInf
     # get scene video dimensions by interrogating a frame in sceneVidDir
     sceneVidDir = inputDir / ('ScenePics_' + recInfo.name)
     frame = next(sceneVidDir.glob('*.jpeg'))
-    h,w,_ = cv2.imread(str(frame)).shape
+    h,w,_ = cv2.imread(frame).shape
 
     # prep gaze data and get video frame timestamps from it
     print('  Prepping gaze data...')
@@ -182,7 +182,7 @@ def copySeeTrueRecording(inputDir: pathlib.Path, outputDir: pathlib.Path, recInf
         blackIm = np.zeros((h,w,3), np.uint8)   # black image
         for f in blackFrames:
             # store black frame to file
-            cv2.imwrite(str(sceneVidDir / 'frame_{:d}.jpeg'.format(f)),blackIm)
+            cv2.imwrite(sceneVidDir / f'frame_{f:d}.jpeg',blackIm)
             frames.append(f)
         frames = sorted(frames)
 
@@ -253,7 +253,7 @@ def getCameraHardcoded(outputDir: str|pathlib.Path):
     camera['resolution'] = np.array([640, 480])
 
     # store to file
-    fs = cv2.FileStorage(str(outputDir / 'calibration.xml'), cv2.FILE_STORAGE_WRITE)
+    fs = cv2.FileStorage(outputDir / 'calibration.xml', cv2.FILE_STORAGE_WRITE)
     for key,value in camera.items():
         fs.write(name=key,val=value)
     fs.release()

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/importing/adhawk_mindlink.py

@@ -168,7 +168,7 @@ def getCameraHardcoded(outputDir: str|pathlib.Path):
     camera['rotation'] = cv2.Rodrigues(np.radians(np.array([12.000000000000043, 0.0, 0.0])))[0]
 
     # store to file
-    fs = cv2.FileStorage(str(outputDir / 'calibration.xml'), cv2.FILE_STORAGE_WRITE)
+    fs = cv2.FileStorage(outputDir / 'calibration.xml', cv2.FILE_STORAGE_WRITE)
     for key,value in camera.items():
         fs.write(name=key,val=value)
     fs.release()

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/importing/pupilLabs.py

@@ -354,7 +354,7 @@ def getCameraCalFromCloudExport(inputDir: str|pathlib.Path, outputDir: str|pathl
     return camInfo['resolution']
 
 def storeCameraCalibration(camInfo: dict[str, typing.Any], outputDir: str|pathlib.Path):
-    fs = cv2.FileStorage(str(outputDir / 'calibration.xml'), cv2.FILE_STORAGE_WRITE)
+    fs = cv2.FileStorage(outputDir / 'calibration.xml', cv2.FILE_STORAGE_WRITE)
     for key,value in camInfo.items():
         fs.write(name=key,val=value)
     fs.release()
@@ -376,7 +376,7 @@ def getSceneCameraResolution(inputDir: str|pathlib.Path, recInfo: Recording):
         return np.array(getCamInfo(inputDir / 'world.intrinsics')['resolution'])
     else:
         import cv2
-        cap = cv2.VideoCapture(str(recInfo.get_scene_video_path()))
+        cap = cv2.VideoCapture(recInfo.get_scene_video_path())
         if cap.isOpened():
             width  = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH))
             height = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT))

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/importing/tobii_G2.py

@@ -205,7 +205,7 @@ def getCameraFromTSLV(inputDir: str|pathlib.Path):
 
 
     # store to file
-    fs = cv2.FileStorage(str(inputDir / 'calibration.xml'), cv2.FILE_STORAGE_WRITE)
+    fs = cv2.FileStorage(inputDir / 'calibration.xml', cv2.FILE_STORAGE_WRITE)
     for key,value in camera.items():
         fs.write(name=key,val=value)
     fs.release()

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/importing/tobii_G3.py

@@ -185,7 +185,7 @@ def getCameraFromJson(inputDir: str|pathlib.Path, outputDir: str|pathlib.Path):
 
 
     # store to file
-    fs = cv2.FileStorage(str(outputDir / 'calibration.xml'), cv2.FILE_STORAGE_WRITE)
+    fs = cv2.FileStorage(outputDir / 'calibration.xml', cv2.FILE_STORAGE_WRITE)
     for key,value in camera.items():
         fs.write(name=key,val=value)
     fs.release()

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/ocv.py

@@ -26,7 +26,7 @@ class CameraParams:
         if not fileName.is_file():
             return CameraParams(None,None)
 
-        fs = cv2.FileStorage(str(fileName), cv2.FILE_STORAGE_READ)
+        fs = cv2.FileStorage(fileName, cv2.FILE_STORAGE_READ)
         resolution      = fs.getNode("resolution").mat()
         cameraMatrix    = fs.getNode("cameraMatrix").mat()
         distCoeff       = fs.getNode("distCoeff").mat()
@@ -53,7 +53,7 @@ class CV2VideoReader:
         else:
             self.ts = timestamps
 
-        self.cap = cv2.VideoCapture(str(self.file))
+        self.cap = cv2.VideoCapture(self.file)
         if not self.cap.isOpened():
             raise RuntimeError('the file "{}" could not be opened'.format(str(self.file)))
         self.nframes= float(self.cap.get(cv2.CAP_PROP_FRAME_COUNT))

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/plane.py

@@ -44,7 +44,7 @@ class Plane:
         img = None
         # read from file if image exists
         if ref_image_store_path is not None and ref_image_store_path.is_file():
-            img = cv2.imread(str(ref_image_store_path), cv2.IMREAD_COLOR)
+            img = cv2.imread(ref_image_store_path, cv2.IMREAD_COLOR)
         # if image doesn't exist or is the wrong size, create
         if img is None or img.shape[1]!=ref_image_width:
             img = self._store_reference_image(ref_image_store_path, ref_image_width)
@@ -209,7 +209,7 @@ class Plane:
                     img[idxs[0]:idxs[1], idxs[2]:idxs[3]] = mark
 
         if path:
-            cv2.imwrite(str(path), img)
+            cv2.imwrite(path, img)
 
         return img
 

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/version.py

@@ -1,4 +1,4 @@
-__version__ = "1.3.2"
+__version__ = "1.3.3"
 
 __title__ = "glassesTools"
 __description__ = "Tools for processing wearable eye tracker recordings."

{glassestools-1.3.2 → glassestools-1.3.3}/src/glassesTools/video_utils.py

@@ -118,7 +118,7 @@ def getFrameTimestampsFromVideo(vid_file):
         frameTs = (dts+empty_duration)/media_time_scale*1000
     else:
         # open file with opencv and get timestamps of each frame
-        vid = cv2.VideoCapture(str(vid_file))
+        vid = cv2.VideoCapture(vid_file)
         nframes = float(vid.get(cv2.CAP_PROP_FRAME_COUNT))
         frameTs = []
         frame_idx = 0

{glassestools-1.3.2 → glassestools-1.3.3/src/glassesTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glassesTools
-Version: 1.3.2
+Version: 1.3.3
 Summary: Tools for processing wearable eye tracker recordings.
 Home-page: https://github.com/dcnieho/glassesTools
 Author: Diederick Niehorster
@@ -38,9 +38,10 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: msgpack
-Requires-Dist: opencv-python-headless==4.9.0.80
+Requires-Dist: imgui_bundle==1.3.0
+Requires-Dist: opencv-python-headless==4.10.0.82
 Requires-Dist: ffpyplayer
-Requires-Dist: scipy==1.11.3
+Requires-Dist: eulerangles
 Provides-Extra: gui
 Requires-Dist: imgui_bundle==1.3.0; extra == "gui"
 
@@ -48,7 +49,7 @@ Requires-Dist: imgui_bundle==1.3.0; extra == "gui"
 [![PyPI Latest Release](https://img.shields.io/pypi/v/glassesTools.svg)](https://pypi.org/project/glassesTools/)
 [![image](https://img.shields.io/pypi/pyversions/glassesTools.svg)](https://pypi.org/project/glassesTools/)
 
-# GlassesTools v1.3.2
+# GlassesTools v1.3.3
 Tools for processing wearable eye tracker recordings.
 
 If you use this package or any of the code in this repository, please cite:<br>

glassestools-1.3.3/src/glassesTools.egg-info/requires.txt

@@ -0,0 +1,10 @@
+numpy
+pandas
+msgpack
+imgui_bundle==1.3.0
+opencv-python-headless==4.10.0.82
+ffpyplayer
+eulerangles
+
+[GUI]
+imgui_bundle==1.3.0

glassestools-1.3.2/src/glassesTools.egg-info/requires.txt

@@ -1,9 +0,0 @@
-numpy
-pandas
-msgpack
-opencv-python-headless==4.9.0.80
-ffpyplayer
-scipy==1.11.3
-
-[GUI]
-imgui_bundle==1.3.0