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


Ignore:
Timestamp:
04/12/17 13:59:38 (5 years ago)
Author:
Sanahuja Guillaume
Message:

modifs pour template vectors

Location:
trunk/lib/FlairMeta/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairMeta/src/MetaVrpnObject.cpp

    r148 r167  
    2828#include <TabWidget.h>
    2929#include <cvmatrix.h>
    30 #include <Vector3D.h>
    3130
    3231using std::string;
     
    5554    desc->SetElementName(i, 0, Output()->Name(i, 0));
    5655  }
    57   cvmatrix *prev_value = new cvmatrix(this, desc, elementDataType, name);
     56  cvmatrix *prev_value = new cvmatrix(this, desc, floatType, name);
    5857  delete desc;
    5958
     
    6665    desc->SetElementName(i, 0, "d" + Output()->Name(i, 0));
    6766  }
    68   prev_value = new cvmatrix(this, desc, elementDataType, name);
     67  prev_value = new cvmatrix(this, desc, floatType, name);
    6968  delete desc;
    7069
     
    9594DataPlot2D *MetaVrpnObject::XyPlot(void) const { return xy_plot; }
    9695
    97 void MetaVrpnObject::GetSpeed(Vector3D &speed) const {
     96void MetaVrpnObject::GetSpeed(Vector3Df &speed) const {
    9897  speed.x = euler->Output(4, 0);
    9998  speed.y = euler->Output(5, 0);
  • trunk/lib/FlairMeta/src/MetaVrpnObject.h

    r122 r167  
    1515
    1616#include <VrpnObject.h>
    17 #include "io_data.h"
     17#include <io_data.h>
     18#include <Vector3D.h>
    1819
    1920namespace flair {
    20         namespace core {
    21                 class Vector3D;
    22                 class FloatType;
    23         }
    2421        namespace gui {
    2522                class DataPlot1D;
     
    5148  gui::DataPlot1D *VzPlot(void) const; // 1,2
    5249  gui::DataPlot2D *XyPlot(void) const;
    53   void GetSpeed(core::Vector3D &speed) const;
     50  void GetSpeed(core::Vector3Df &speed) const;
    5451
    5552private:
     
    6057  gui::DataPlot1D *vx_opti_plot, *vy_opti_plot, *vz_opti_plot;
    6158  gui::Tab *plot_tab;
    62   core::FloatType elementDataType;
    6359};
    6460} // end namespace meta
  • trunk/lib/FlairMeta/src/UavStateMachine.cpp

    r164 r167  
    132132}
    133133
    134 const Vector3D &UavStateMachine::GetCurrentAngularSpeed(void) const {
     134const Vector3Df &UavStateMachine::GetCurrentAngularSpeed(void) const {
    135135  return currentAngularSpeed;
    136136}
     
    423423    const AhrsData *refOrientation = ComputeReferenceOrientation();
    424424    Quaternion refQuaternion;
    425     Vector3D refAngularRates;
     425    Vector3Df refAngularRates;
    426426    refOrientation->GetQuaternionAndAngularRates(refQuaternion,
    427427                                                 refAngularRates);
  • trunk/lib/FlairMeta/src/UavStateMachine.h

    r165 r167  
    107107  const core::Quaternion &GetCurrentQuaternion(void) const;
    108108
    109   const core::Vector3D &GetCurrentAngularSpeed(void) const;
     109  const core::Vector3Df &GetCurrentAngularSpeed(void) const;
    110110
    111111        void Land(void);
     
    267267
    268268  core::Quaternion currentQuaternion;
    269   core::Vector3D currentAngularSpeed;
     269  core::Vector3Df currentAngularSpeed;
    270270
    271271  const core::AhrsData *ComputeReferenceOrientation(void);
Note: See TracChangeset for help on using the changeset viewer.