Merge pull request #64 from introlab/dev

Main merge for 0.6.7 release

Author: SBriere

python/libopenimu/db/DBManager.py

@@ -675,7 +675,8 @@ def export_file_sensor_data_gps(self, sensor: Sensor, sensors_data: list, file_f
         if 'CSV' in file_format:
             np.savetxt(filename, my_array, delimiter=";", header=header)
         elif 'Matlab' in file_format:
-            sio.savemat(filename, {sensor.name: my_array.transpose(), 'labels': header.split(';')}, do_compression=True)
+            sio.savemat(filename, {sensor.name.replace(' ', '_'): my_array.transpose(), 'labels': header.split(';')},
+                        do_compression=True)
 
     def export_file_sensor_data(self, sensor: Sensor, sensors_data: list, file_format, directory):
         result = {}
@@ -686,7 +687,7 @@ def export_file_sensor_data(self, sensor: Sensor, sensors_data: list, file_forma
             series = sensor_data.to_time_series()
             result[sensor_data.channel.id_channel].append(series)
 
-        filename = directory + sensor.location + '_' + sensor.name
+        filename = directory + sensor.location + '_' + sensor.name.replace(' ', '_')
         if 'CSV' in file_format:
             filename = filename + '.CSV'
         elif 'Matlab' in file_format:
@@ -720,4 +721,5 @@ def export_file_sensor_data(self, sensor: Sensor, sensors_data: list, file_forma
         if 'CSV' in file_format:
             np.savetxt(filename, my_array.transpose(), delimiter=";", header=header)
         elif 'Matlab' in file_format:
-            sio.savemat(filename, {sensor.name: my_array.transpose(), 'labels': header.split(';')}, do_compression=True)
+            sio.savemat(filename, {sensor.name.replace(' ', ''): my_array.transpose(), 'labels': header.split(';')},
+                        do_compression=True)

python/libopenimu/importers/AppleWatchImporter.py

@@ -223,7 +223,10 @@ def import_raw_gyro_to_database(self, sample_rate, raw_gyro: dict):
             #       len(raw_gyro[timestamp]['values']))
 
             # Calculate recordset
-            recordset = self.get_recordset(timestamp.timestamp(), session_name=self.session_name)
+            try:
+                recordset = self.get_recordset(timestamp.timestamp(), session_name=self.session_name)
+            except OSError as e:
+                print(e.filename + ' - ' + str(timestamp) + ' : ' + e.strerror)
 
             # Create time array as float64
             timesarray = np.asarray(raw_gyro[timestamp]['times'], dtype=np.float64)

python/resources/ui/StartDialog.ui

@@ -56,7 +56,6 @@
         </property>
         <property name="font">
          <font>
-          <family>Mongolian Baiti</family>
           <pointsize>31</pointsize>
          </font>
         </property>
@@ -319,7 +318,7 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Version 0.6.6</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Version 0.6.7&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>

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.6.6"
+#define MyAppVersion "0.6.7"
 #define MyAppPublisher "IntroLab - Centre de Recherche sur le Vieillissement de Sherbrooke - Université de Sherbrooke"
 #define MyAppURL "https://introlab.3it.usherbrooke.ca"
 #define MyAppExeName "OpenIMUApp.exe"