Changeset 181 in pacpusframework for trunk/include/Pacpus

Timestamp:

Oct 21, 2013, 1:30:41 PM (11 years ago)

Author:

Marek Kurdej

Message:

Minor fixes. Clean-up.

Location:

trunk/include/Pacpus

Files:

• DbitePlayer/DbtPlyFileManager.h (modified) (4 diffs)
• PacpusTools (modified) (1 prop)
• kernel (modified) (1 prop)
• kernel/ComponentBase.h (modified) (2 diffs)
• kernel/pacpus.h (modified) (1 diff)

trunk/include/Pacpus/DbitePlayer/DbtPlyFileManager.h

@@ -31 +31 @@
 
 #include <QThread>
+#include <string>
 
 class QSemaphore;
@@ -82 +83 @@
 public Q_SLOTS:
     /// slot activated by the engine when it computes new DBT time
-    void  playData(road_time_t tDbt,road_time_t tNow, bool reverse);
+    void playData(road_time_t tDbt,road_time_t tNow, bool reverse);
 
     /// put the file descriptor to the beginning of the file
@@ -98 +99 @@
     DbtPlyEngine * mEngine;
 
-    /// the absolute path of the DBT file
-    QString dbtProperty_;
-    /// @todo Documentation
-    QStringList mDbtFilenameList;
+    QStringList getDbiteFilenameList() const;
 
     /// The directory where the DBT file is located
     QString mDbtDataPath;
-
-    /// Display or not the graphical interface
-    bool mShowGui;
 
     /// @todo Documentation
@@ -141 +136 @@
 
 private:
-    // reading backward?
+    /// dbt property value
+    std::string dbtProperty_;
+    /// @todo Documentation
+    QStringList mDbtFilenameList;
+
+    /// reading backward?
     bool reverse_;
 

trunk/include/Pacpus/kernel/ComponentBase.h

@@ -192 +192 @@
     std::string mName;
     std::string mTypeName;
-    bool mHasGui;
-    bool mVerbose;
-    int mVerbosityLevel;
+    
+    /// Whether to display or not the graphical interface (GUI)
+    bool hasGui() const;
+    bool isOutputVerbose() const;
+    int getVerbosityLevel() const;
     
 private:
@@ -208 +210 @@
 
 private:
+    bool mHasGui;
+    bool mVerbose;
+    int mVerbosityLevel;
+
     boost::program_options::options_description mOptionsDescription;
 

trunk/include/Pacpus/kernel/pacpus.h

@@ -58 +58 @@
 #endif
 
+struct donnees_gps
+{
+    long  ind_qualite;
+    double x, y;
+    double lon, lat;
+    float a, b, phi, sigma_lat, sigma_lon;
+    road_time_t time;
+    double alt_msl, d_geoidal;
+};
+
+struct donnees_abs_zy
+{
+    float dArD, dArG;
+    float speed;
+    road_time_t time;
+};
+
+struct donnees_gyro
+{
+    // les mesures sont prises par rapport au point C
+    // position de la centrale inertielle
+    // vitesse de lacet (rad.s-1) dans le repère de la masse suspendue
+    float psi_s;
+    road_time_t time;
+};
+
+/// Definition of the structure which will be sent for each positioning
+/// requests -> MapMatching.cpp 
+struct s_MatchedPosition
+{
+    int                         state;      /* Etat du serveur de position absolue hybridée*/
+    double                      x_match;        /* Position Matchée         */
+    double                      y_match;        /*  en x et y                           */
+    double                      x;                      /* Position du véhicule         */
+    double                      y;                      /*      en x et y                               */
+    double                      theta;          /* cap (par rapport à l'est) dans le système de la carte */
+    double                      v;                      /* vitesse horizontale par rapport à la terre  */
+    unsigned long       ID;                     /* ID de la route à laquelle appartient la position matchée */
+    road_time_t         time;
+    int                         way;            /* Sens de la route parcourue 1=W2E, 2=E2W*/
+    double                      dist;           /* abscisse curviligne par rapport au début de la route */
+    double                      pxx, pyy, pxy; /* covariance de l'erreur en position absolue*/
+    double                      ptheta;         /*covariance de l'erreur en cap*/
+    double      error; 
+    donnees_gyro gyro;  
+    donnees_abs_zy odo; 
+};
+
 #endif // DEF_PACPUS_H