fix Leap Motion import, update dependencies (#15)

seanschneeweiss · Jun 20, 2022 · e93644e · e93644e
1 parent 9e3f731
commit e93644e
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -55,7 +55,7 @@ Plug in the Leap Motion Controller and make a recording of the right hand
 
 **Windows**
 
-* Install python (3.8.8) i.e. from
+* Install python (3.9.13) i.e. from
 
   https://www.python.org/downloads/
 * Add python to system path during setup or follow the following instructions:
@@ -75,15 +75,15 @@ python app/main.py
 
 ---
 Following python packages and versions were tested:
- * _Gooey_ (1.0.8)
- * _AnyPyTools_ (1.4.6)
+ * _Gooey_ (1.0.8.1)
+ * _AnyPyTools_ (1.7.8)
  * _Matplotlib_ (3.3.3) (only for AnyBody results)
  * _Numpy_ (1.19.5)
  * _Pandas_ (1.1.5)
- * _pywin32_ (300) (only for window size automation)
- * _pywinauto_ (0.6.6) (only for window size automation)
+ * _pywin32_ (301) (only for window size automation)
+ * _pywinauto_ (0.6.8) (only for window size automation)
  * _Scikit-learn_ (0.23.2) (only for BVH animation)
- * _wxPython_ (4.1.0)
+ * _wxPython_ ([4.1.2a1.dev5330+3e6be81d](https://wxpython.org/Phoenix/snapshot-builds/wxPython-4.1.2a1.dev5330+3e6be81d-cp39-cp39-win_amd64.whl))
 
 ## Credits
 * https://github.com/chriskiehl/Gooey

diff --git a/app/AnyPy.py b/app/AnyPy.py
@@ -171,8 +171,7 @@ def run(self):
         os.chdir(self.any_path)
         app = AnyPyProcess()
 
-        self.output = app.start_macro(macrolist=self.macrolist,
-                                      logfile=AnyPy.LOG_FILE)
+        self.output = app.start_macro(macrolist=self.macrolist)
 
         # change back to original folder
         os.chdir(cwd)

diff --git a/app/GuiControl.py b/app/GuiControl.py
@@ -10,7 +10,7 @@ def __init__(self):
         self.recorder_dlg = None
 
     def set_windows_record(self):
-        self.visualizer = Application().start(r"C:\Program Files\Leap Motion\Core Services\Visualizer.exe")
+        self.visualizer = Application().start(r"C:\Program Files\Ultraleap\TrackingVisualizer\TrackingVisualizer.exe")
         self.visualizer_dlg = self.visualizer.window()
         self.recorder = Application().connect(class_name="wxWindowNR")
         self.recorder_dlg = self.recorder.window()

diff --git a/app/LeapData.py b/app/LeapData.py
@@ -8,7 +8,7 @@
 from config.BasisFirstFrame import BasisFirstFrame
 from resources.pymo.pymo.data import MocapData
 from RotationUtil import rot2eul, get_order
-from resources.LeapSDK.v41_python38 import Leap
+from resources.LeapSDK.v53_python39 import Leap
 
 
 class LeapData:

diff --git a/app/LeapRecord.py b/app/LeapRecord.py
@@ -4,7 +4,7 @@
 from threading import Thread
 
 from config.Configuration import env
-from resources.LeapSDK.v41_python38 import Leap
+from resources.LeapSDK.v53_python39 import Leap
 from LeapData import LeapData
 from resources.pymo.pymo.writers import BVHWriter as Pymo_BVHWriter
 # from resources.b3d.bvh_reader import BVH as B3D_BVHReader

diff --git a/app/RotationUtil.py b/app/RotationUtil.py
@@ -1,7 +1,7 @@
 import numpy as np
 import math
 
-from resources.LeapSDK.v41_python38 import Leap
+from resources.LeapSDK.v53_python39 import Leap
 
 
 def get_order():

diff --git a/requirements.txt b/requirements.txt
@@ -1,13 +1,13 @@
 # for Leap Motion recording
 matplotlib==3.3.3
-numpy==1.19.5
+numpy>=1.19.5
 pandas==1.1.5
 # for simulation
-AnyPyTools==1.4.6
+AnyPyTools==1.7.8
 # for PyMO (bvh animation)
 scikit-learn==0.23.2
 # for GUI
-Gooey==1.0.8
+Gooey==1.0.8.1
 pywin32==301
 pywinauto==0.6.8
-wxPython==4.1.0
+wxPython>=4.1.0