Merge pull request WPI-AIM#10 from ajlewis02/master

Replaced Point with PointArray where necessary. closes WPI-AIM#12
ajlewis02 · Jul 17, 2020 · c39448c · c39448c
2 parents 04ad6df + 78c7b2f
commit c39448c
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/Vicon/Devices/Accel.py b/Vicon/Devices/Accel.py
@@ -44,13 +44,13 @@
 # //==============================================================================
 
 from . import Devices
-from GaitCore.Core import Point
+from GaitCore.Core import PointArray
 
 
 class Accel(Devices.Devices):
 
     def __init__(self, name, sensor):
-        accel = Point.Point(sensor["ACCX"]["data"],
+        accel = PointArray.PointArray(sensor["ACCX"]["data"],
                             sensor["ACCY"]["data"],
                             sensor["ACCZ"]["data"])
         super(Accel, self).__init__(name, accel, "Accel")

diff --git a/Vicon/Devices/EMG.py b/Vicon/Devices/EMG.py
@@ -44,12 +44,12 @@
 # //==============================================================================
 
 from . import Devices
-from GaitCore.Core import Point
+from GaitCore.Core import PointArray
 
 class EMG(Devices.Devices):
 
     def __init__(self, name, sensor):
-        emg = Point.Point(sensor["data"],sensor["data"],sensor["data"])
+        emg = PointArray.PointArray(sensor["data"],sensor["data"],sensor["data"])
         super(EMG, self).__init__(name, emg, "EMG")
 
 

diff --git a/Vicon/Devices/ForcePlate.py b/Vicon/Devices/ForcePlate.py
@@ -45,15 +45,15 @@
 
 
 from . import Devices
-from GaitCore.Core import Point
+from GaitCore.Core import PointArray
 from GaitCore.Core import Newton
 
 class ForcePlate(Devices.Devices):
 
     def __init__(self, name, forces, moments, CoP):
-        self.force = Point.Point(forces["Fx"]["data"], forces["Fy"]["data"], forces["Fz"]["data"])
-        self.moment = Point.Point(moments["Mx"]["data"], moments["My"]["data"], moments["Mz"]["data"])
-        self.CoP = Point.Point(CoP["Cx"]["data"], CoP["Cy"]["data"], CoP["Cz"]["data"])
+        self.force = PointArray.PointArray(forces["Fx"]["data"], forces["Fy"]["data"], forces["Fz"]["data"])
+        self.moment = PointArray.PointArray(moments["Mx"]["data"], moments["My"]["data"], moments["Mz"]["data"])
+        self.CoP = PointArray.PointArray(CoP["Cx"]["data"], CoP["Cy"]["data"], CoP["Cz"]["data"])
         sensor = Newton.Newton(self.CoP, self.force, self.moment, None)
         super(ForcePlate, self).__init__(name, sensor, "IMU")
 

diff --git a/Vicon/Devices/Gyro.py b/Vicon/Devices/Gyro.py
@@ -44,13 +44,13 @@
 # //==============================================================================
 
 from . import Devices
-from GaitCore.Core import Point
+from GaitCore.Core import PointArray
 
 
 class Gyro(Devices.Devices):
 
     def __init__(self, name, sensor):
-        gyro = Point.Point(sensor["GYROX"]["data"],
+        gyro = PointArray.PointArray(sensor["GYROX"]["data"],
                            sensor["GYROY"]["data"],
                            sensor["GYROZ"]["data"])
         super(Gyro, self).__init__(name, gyro, "Gyro")

diff --git a/Vicon/Devices/IMU.py b/Vicon/Devices/IMU.py
@@ -44,16 +44,15 @@
 # //==============================================================================
 
 from . import Devices
-from GaitCore.Core import Point
+from GaitCore.Core import PointArray
 
 class IMU(Devices.Devices):
 
     def __init__(self, name, sensor):
-
-        self._accel = Point.Point(sensor["ACCX"]["data"],
+        self._accel = PointArray.PointArray(sensor["ACCX"]["data"],
                                  sensor["ACCY"]["data"],
                                  sensor["ACCZ"]["data"])
-        self._gyro = Point.Point(sensor["GYROX"]["data"],
+        self._gyro = PointArray.PointArray(sensor["GYROX"]["data"],
                                  sensor["GYROY"]["data"],
                                  sensor["GYROZ"]["data"])
 

diff --git a/Vicon/Markers/ModelOutput.py b/Vicon/Markers/ModelOutput.py
@@ -62,19 +62,19 @@ def __init__(self, data, joint_name):
                 moment = None
                 force = None
                 if side + output + "Angles" in data.keys():
-                    angle = core.Point.Point(data[side + output + "Angles"]["X"]["data"],
+                    angle = core.PointArray.PointArray(data[side + output + "Angles"]["X"]["data"],
                                        data[side + output + "Angles"]["Y"]["data"],
                                        data[side + output + "Angles"]["Z"]["data"])
                 if side + output + "Force" in data.keys():
-                    force = core.Point.Point(data[side + output + "Force"]["X"]["data"],
+                    force = core.PointArray.PointArray(data[side + output + "Force"]["X"]["data"],
                                        data[side + output + "Force"]["Y"]["data"],
                                        data[side + output + "Force"]["Z"]["data"])
                 if side + output + "Moment" in data.keys():
-                    moment = core.Point.Point(data[side + output + "Moment"]["X"]["data"],
+                    moment = core.PointArray.PointArray(data[side + output + "Moment"]["X"]["data"],
                                         data[side + output + "Moment"]["Y"]["data"],
                                         data[side + output + "Moment"]["Z"]["data"])
                 if side + output + "Power" in data.keys():
-                    power = core.Point.Point(data[side + output + "Power"]["X"]["data"],
+                    power = core.PointArray.PointArray(data[side + output + "Power"]["X"]["data"],
                                        data[side + output + "Power"]["Y"]["data"],
                                        data[side + output + "Power"]["Z"]["data"])
 

diff --git a/Vicon/Vicon.py b/Vicon/Vicon.py
@@ -50,6 +50,7 @@
 from .Markers import ModelOutput as modeloutput
 from .Markers import Markers as markers
 from .Devices import EMG, IMU, Accel, ForcePlate
+import matplotlib.pyplot as plt
 from Vicon import Markers
 
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-GaitCore>=1.1
+GaitCore>=1.3
 numpy
 scipy
 matplotlib