Changeset 167 in flair-src for trunk/lib/FlairMeta

Timestamp:

Apr 12, 2017, 1:59:38 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs pour template vectors

Location:

trunk/lib/FlairMeta/src

Files:

• MetaVrpnObject.cpp (modified) (4 diffs)
• MetaVrpnObject.h (modified) (3 diffs)
• UavStateMachine.cpp (modified) (2 diffs)
• UavStateMachine.h (modified) (2 diffs)

trunk/lib/FlairMeta/src/MetaVrpnObject.cpp

@@ -28 +28 @@
 #include <TabWidget.h>
 #include <cvmatrix.h>
-#include <Vector3D.h>
 
 using std::string;
@@ -55 +54 @@
     desc->SetElementName(i, 0, Output()->Name(i, 0));
   }
-  cvmatrix *prev_value = new cvmatrix(this, desc, elementDataType, name);
+  cvmatrix *prev_value = new cvmatrix(this, desc, floatType, name);
   delete desc;
 
@@ -66 +65 @@
     desc->SetElementName(i, 0, "d" + Output()->Name(i, 0));
   }
-  prev_value = new cvmatrix(this, desc, elementDataType, name);
+  prev_value = new cvmatrix(this, desc, floatType, name);
   delete desc;
 
@@ -95 +94 @@
 DataPlot2D *MetaVrpnObject::XyPlot(void) const { return xy_plot; }
 
-void MetaVrpnObject::GetSpeed(Vector3D &speed) const {
+void MetaVrpnObject::GetSpeed(Vector3Df &speed) const {
   speed.x = euler->Output(4, 0);
   speed.y = euler->Output(5, 0);

trunk/lib/FlairMeta/src/MetaVrpnObject.h

@@ -15 +15 @@
 
 #include <VrpnObject.h>
-#include "io_data.h"
+#include <io_data.h>
+#include <Vector3D.h>
 
 namespace flair {
-        namespace core {
-                class Vector3D;
-                class FloatType;
-        }
         namespace gui {
                 class DataPlot1D;
@@ -51 +48 @@
   gui::DataPlot1D *VzPlot(void) const; // 1,2
   gui::DataPlot2D *XyPlot(void) const;
-  void GetSpeed(core::Vector3D &speed) const;
+  void GetSpeed(core::Vector3Df &speed) const;
 
 private:
@@ -60 +57 @@
   gui::DataPlot1D *vx_opti_plot, *vy_opti_plot, *vz_opti_plot;
   gui::Tab *plot_tab;
-  core::FloatType elementDataType;
 };
 } // end namespace meta

trunk/lib/FlairMeta/src/UavStateMachine.cpp

@@ -132 +132 @@
 }
 
-const Vector3D &UavStateMachine::GetCurrentAngularSpeed(void) const {
+const Vector3Df &UavStateMachine::GetCurrentAngularSpeed(void) const {
   return currentAngularSpeed;
 }
@@ -423 +423 @@
     const AhrsData *refOrientation = ComputeReferenceOrientation();
     Quaternion refQuaternion;
-    Vector3D refAngularRates;
+    Vector3Df refAngularRates;
     refOrientation->GetQuaternionAndAngularRates(refQuaternion,
                                                  refAngularRates);

trunk/lib/FlairMeta/src/UavStateMachine.h

@@ -107 +107 @@
   const core::Quaternion &GetCurrentQuaternion(void) const;
 
-  const core::Vector3D &GetCurrentAngularSpeed(void) const;
+  const core::Vector3Df &GetCurrentAngularSpeed(void) const;
 
         void Land(void);
@@ -267 +267 @@
 
   core::Quaternion currentQuaternion;
-  core::Vector3D currentAngularSpeed;
+  core::Vector3Df currentAngularSpeed;
 
   const core::AhrsData *ComputeReferenceOrientation(void);