Changeset 214 in flair-src for trunk/lib/FlairSensorActuator/src/EmulatedController.cpp

Timestamp:

02/07/18 17:49:27 (6 years ago)

Author:

Sanahuja Guillaume

Message:

matrix

File:

• trunk/lib/FlairSensorActuator/src/EmulatedController.cpp (modified) (7 diffs)

trunk/lib/FlairSensorActuator/src/EmulatedController.cpp

@@ -17 +17 @@
 #include <cstring>
 #include <string>
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <stdexcept>
 
@@ -46 +46 @@
 }
 
-template<typename T> void EmulatedController::fillVectorNoMutex(cvmatrix &vector,T data[],unsigned int size) {
+template<typename T> void EmulatedController::fillVectorNoMutex(Matrix &vector,T data[],unsigned int size) {
     for (unsigned int i=0; i<size; i++) {
         vector.SetValueNoMutex(i,0,data[i]);
@@ -52 +52 @@
 }
 
-void EmulatedController::fillVectorNoMutex(cvmatrix &destination,cvmatrix &source,unsigned int size) {
+void EmulatedController::fillVectorNoMutex(Matrix &destination,Matrix &source,unsigned int size) {
     for (unsigned int i=0; i<size; i++) {
         destination.SetValueNoMutex(i,0,source.Value(i,0));
@@ -69 +69 @@
 
 void EmulatedController::AddStep(unsigned int durationMs,string description,uint16_t buttonPressed, float leftAxisX, float leftAxisY, float rightAxisX, float rightAxisY) {
-    cvmatrix *axisMatrix=new cvmatrix((IODevice *)this,4,1,floatType);
+    Matrix *axisMatrix=new Matrix((IODevice *)this,4,1,floatType);
     axisMatrix->SetValueNoMutex(0,0,leftAxisX);
     axisMatrix->SetValueNoMutex(1,0,leftAxisY);
@@ -75 +75 @@
     axisMatrix->SetValueNoMutex(3,0,rightAxisY);
 
-    cvmatrix *buttonMatrix=new cvmatrix((IODevice *)this,16,1,SignedIntegerType(8));
+    Matrix *buttonMatrix=new Matrix((IODevice *)this,16,1,SignedIntegerType(8));
     if (buttonPressed&(uint16_t)ButtonType::start) buttonMatrix->SetValueNoMutex(0,0,1);
     if (buttonPressed&(uint16_t)ButtonType::select) buttonMatrix->SetValueNoMutex(1,0,1);
@@ -98 +98 @@
 }
 
-void EmulatedController::ComputeControllerData(DataType dataType, cvmatrix &data) {
+void EmulatedController::ComputeControllerData(DataType dataType, Matrix &data) {
     static Time startStepTime=GetTime();
 
@@ -130 +130 @@
 }
 
-void EmulatedController::AcquireAxisData(core::cvmatrix &axis) {
+void EmulatedController::AcquireAxisData(core::Matrix &axis) {
     ComputeControllerData(DataType::axis,axis);
 }
 
-void EmulatedController::AcquireButtonData(core::cvmatrix &button) {
+void EmulatedController::AcquireButtonData(core::Matrix &button) {
     ComputeControllerData(DataType::button,button);
 }