Fixed AppleWatch Importer of file version 1.

introlab · Sep 14, 2018 · 0f1a174 · 0f1a174
1 parent 6fa894f
commit 0f1a174
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/python/env/CMakeLists.txt b/python/env/CMakeLists.txt
@@ -21,9 +21,18 @@ if(WIN32)
         PyQtChart
         PyQt3D
         pypiwin32
-        # PyInstaller
+        PyInstaller
         # Warning, development version for now to fix OSX package
-        https://github.com/pyinstaller/pyinstaller/tarball/develop
+        #https://github.com/pyinstaller/pyinstaller/tarball/develop
+    )
+
+    set (conda_packages
+        PyInstaller
+        cython
+        numpy
+        scipy
+        jupyter
+        sqlalchemy
     )
 else(WIN32)
     set (pip_packages
@@ -34,16 +43,17 @@ else(WIN32)
         # Warning, development version for now to fix OSX package
         https://github.com/pyinstaller/pyinstaller/tarball/develop
     )
+    set (conda_packages
+        # PyInstaller
+        cython
+        numpy
+        scipy
+        jupyter
+        sqlalchemy
+    )
 endif(WIN32)
 
-set (conda_packages
-    # PyInstaller
-    cython
-    numpy
-    scipy
-    jupyter
-    sqlalchemy
-)
+
 
 if(WIN32)
     # Create environment, will produce python executable

diff --git a/python/libopenimu/importers/AppleWatchImporter.py b/python/libopenimu/importers/AppleWatchImporter.py
@@ -629,7 +629,8 @@ def import_to_database(self, result):
 
     def get_sampling_rate_from_header(self, sensor_id, header): #header = string of json
         sample_rate = 0
-        json_settings = json.loads(header) # converts to json
+        if header != "":
+            json_settings = json.loads(header) # converts to json
 
         if sensor_id == self.BATTERY_ID:
             sample_rate = 1 / 3  # Default value (if file version = 1)

diff --git a/setup/setup_windows.iss b/setup/setup_windows.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "OpenIMU"
-#define MyAppVersion "0.2.0"
+#define MyAppVersion "0.3.0"
 #define MyAppPublisher "IntroLab - CDRV"
 #define MyAppURL "http://www.cdrv.ca"
 #define MyAppExeName "OpenIMUApp.exe"