Changeset 214 in flair-src for trunk/demos/SimpleFleet

Timestamp:

Feb 7, 2018, 5:49:27 PM (7 years ago)

Author:

Sanahuja Guillaume

Message:

matrix

File:

• trunk/demos/SimpleFleet/uav/src/SimpleFleet.cpp (modified) (2 diffs)

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

@@ -29 +29 @@
 #include <PidThrust.h>
 #include <Euler.h>
+#include <Matrix.h>
 #include <cvmatrix.h>
 #include <AhrsData.h>
@@ -60 +61 @@
 
     circle=new TrajectoryGenerator2DCircle(vrpnclient->GetLayout()->NewRow(),"circle");
-    uavVrpn->xPlot()->AddCurve(circle->Matrix()->Element(0,0),0,0,255);
-    uavVrpn->yPlot()->AddCurve(circle->Matrix()->Element(0,1),0,0,255);
-    uavVrpn->VxPlot()->AddCurve(circle->Matrix()->Element(1,0),0,0,255);
-    uavVrpn->VyPlot()->AddCurve(circle->Matrix()->Element(1,1),0,0,255);
+    uavVrpn->xPlot()->AddCurve(circle->GetMatrix()->Element(0,0),0,0,255);
+    uavVrpn->yPlot()->AddCurve(circle->GetMatrix()->Element(0,1),0,0,255);
+    uavVrpn->VxPlot()->AddCurve(circle->GetMatrix()->Element(1,0),0,0,255);
+    uavVrpn->VyPlot()->AddCurve(circle->GetMatrix()->Element(1,1),0,0,255);
 
     xCircleCenter=new DoubleSpinBox(vrpnclient->GetLayout()->NewRow(),"x circle center"," m",-5,5,0.1,1,0);