Changeset 318 in flair-src for trunk/lib/FlairSensorActuator

Timestamp:

Jul 3, 2019, 5:05:33 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

• completely removed cvmatrix
• replaced cvmatrix_descriptor by MatrixDescriptor

Location:

trunk/lib/FlairSensorActuator/src

Files:

• BlCtrlV2_x4_speed.cpp (modified) (1 diff)
• Bldc.cpp (modified) (1 diff)
• HokuyoUTM30Lx.cpp (modified) (1 diff)
• LaserRangeFinder.cpp (modified) (1 diff)
• PressureSensor.cpp (modified) (1 diff)
• RadioReceiver.cpp (modified) (1 diff)
• UsRangeFinder.cpp (modified) (1 diff)
• VrpnObject_impl.cpp (modified) (2 diffs)

trunk/lib/FlairSensorActuator/src/BlCtrlV2_x4_speed.cpp

@@ -122 +122 @@
   input = new Matrix((IODevice *)this, 8, 1, floatType);
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(4, 2);
+  MatrixDescriptor *desc = new MatrixDescriptor(4, 2);
   desc->SetElementName(0, 0, "avant gauche");
   desc->SetElementName(1, 0, "arriere droite");

trunk/lib/FlairSensorActuator/src/Bldc.cpp

@@ -43 +43 @@
   pimpl_ = new Bldc_impl(this, layout, name, motors_count);
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(motors_count, 2);
+  MatrixDescriptor *desc = new MatrixDescriptor(motors_count, 2);
   for (int i = 0; i < motors_count; i++) {
     ostringstream speed, current;

trunk/lib/FlairSensorActuator/src/HokuyoUTM30Lx.cpp

@@ -39 +39 @@
     : LaserRangeFinder(name), Thread(getFrameworkManager(), name, priority) {
   main_tab = new Tab(getFrameworkManager()->GetTabWidget(), name);
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(1081, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(1081, 1);
   output = new Matrix((IODevice *)this, desc, SignedIntegerType(16));
   delete desc;

trunk/lib/FlairSensorActuator/src/LaserRangeFinder.cpp

@@ -37 +37 @@
 LaserRangeFinder::LaserRangeFinder(string name)
     : IODevice(getFrameworkManager(), name) {
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(360, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(360, 1);
   output = new Matrix(this, desc, floatType);
   delete desc;

trunk/lib/FlairSensorActuator/src/PressureSensor.cpp

@@ -36 +36 @@
   plot_tab = NULL;
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
   desc->SetElementName(0, 0, name);
   output = new Matrix(this, desc, floatType);

trunk/lib/FlairSensorActuator/src/RadioReceiver.cpp

@@ -38 +38 @@
 
   // init matrix
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(nb_channels, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(nb_channels, 1);
   for (int i = 0; i < nb_channels; i++) {
     ostringstream channel_name;

trunk/lib/FlairSensorActuator/src/UsRangeFinder.cpp

@@ -36 +36 @@
   plot_tab = NULL;
 
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
   desc->SetElementName(0, 0, name);
   output = new Matrix(this, desc, floatType);

trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp

@@ -59 +59 @@
   
   // state
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(7, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(7, 1);
   desc->SetElementName(0, 0, "q0");
   desc->SetElementName(1, 0, "q1");
@@ -70 +70 @@
   delete desc;
 
-  desc = new cvmatrix_descriptor(3, 1);
+  desc = new MatrixDescriptor(3, 1);
   desc->SetElementName(0, 0, "roll");
   desc->SetElementName(1, 0, "pitch");