Changeset 318 in flair-src for trunk/demos

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/demos

Files:

• CircleFollower/uav/src/CircleFollower.cpp (modified) (1 diff)
• Gps/uav/src/DemoGps.cpp (modified) (1 diff)
• MixedReality/real/uav/src/CircleFollower.cpp (modified) (1 diff)
• PidStandalone/uav/src/PidUav.cpp (modified) (1 diff)
• PidStandalone/uav/src/PidUav.h (modified) (1 diff)
• SimpleFleet/uav/src/SimpleFleet.cpp (modified) (1 diff)
• Sinus/src/MeanFilter.cpp (modified) (1 diff)
• Sinus/src/Sinus.cpp (modified) (1 diff)

trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

@@ -24 +24 @@
 #include <TrajectoryGenerator2DCircle.h>
 #include <Matrix.h>
-#include <cvmatrix.h>
 #include <cmath>
 #include <Tab.h>

trunk/demos/Gps/uav/src/DemoGps.cpp

@@ -22 +22 @@
 #include <FrameworkManager.h>
 #include <TrajectoryGenerator2DCircle.h>
-#include <cvmatrix.h>
 #include <cmath>
 #include <Tab.h>

trunk/demos/MixedReality/real/uav/src/CircleFollower.cpp

@@ -25 +25 @@
 #include <TrajectoryGenerator2DCircle.h>
 #include <Matrix.h>
-#include <cvmatrix.h>
 #include <cmath>
 #include <Tab.h>

trunk/demos/PidStandalone/uav/src/PidUav.cpp

@@ -14 +14 @@
 #include "PidUav.h"
 #include <TargetController.h>
-#include <cvmatrix.h>
 #include <GridLayout.h>
 #include <DataPlot1D.h>

trunk/demos/PidStandalone/uav/src/PidUav.h

@@ -18 +18 @@
 
 namespace flair {
-  namespace core {
-    class cvmatrix;
-  }
   namespace gui {
     class GroupBox;

trunk/demos/SimpleFleet/uav/src/SimpleFleet.cpp

@@ -30 +30 @@
 #include <Euler.h>
 #include <Matrix.h>
-#include <cvmatrix.h>
 #include <AhrsData.h>
 #include <Ahrs.h>

trunk/demos/Sinus/src/MeanFilter.cpp

@@ -39 +39 @@
 
   // 1*1 output matrix
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
   desc->SetElementName(0, 0,
                        "mean filter"); // name will be used for graphs and logs

trunk/demos/Sinus/src/Sinus.cpp

@@ -39 +39 @@
 
   // 1*1 output matrix
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
+  MatrixDescriptor *desc = new MatrixDescriptor(1, 1);
   desc->SetElementName(0, 0, "value"); // name will be used for graphs and logs
   output = new Matrix((IODevice *)this, desc, floatType, name);