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

Timestamp:

Dec 16, 2020, 4:50:34 PM (4 years ago)

Author:

Sanahuja Guillaume

Message:

up ugv

Location:

trunk/lib/FlairMeta/src

Files:

• SimuUgv.h (modified) (1 diff)
• SumoUgv.cpp (added)
• SumoUgv.h (added)
• UgvFactory.cpp (modified) (2 diffs)

trunk/lib/FlairMeta/src/SimuUgv.h

@@ -5 +5 @@
 /*!
  * \file SimuUgv.h
- * \brief Class defining a simulation x4 uav
+ * \brief Class defining a simulation ugv
  * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253
  * \date 2020/12/16

trunk/lib/FlairMeta/src/UgvFactory.cpp

@@ -19 +19 @@
 #include "FrameworkManager.h"
 #include "SimuUgv.h"
+#include "SumoUgv.h"
 
 
@@ -52 +53 @@
     }
     return new SimuUgv(name, simu_id);
-  }/* else if (type.compare(0, 7, "x8_simu") == 0) {
-    int simu_id = 0;
-    if (type.size() > 7) {
-      simu_id = atoi(type.substr(7, type.size() - 7).c_str());
-    }
-    return new SimuX8(name, simu_id,options, multiplex);
-  }*/ else {
+  } else if (type.compare(0, 4, "sumo") == 0) {
+    return new SumoUgv(name);
+  } else {
     getFrameworkManager()->Err("UGV type %s unknown\n", type.c_str());
     return NULL;