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

Timestamp:

06/28/16 15:20:04 (8 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/lib/FlairMeta/src

Files:

• UavFactory.cpp (modified) (2 diffs)
• UavFactory.h (modified) (1 diff)

trunk/lib/FlairMeta/src/UavFactory.cpp

@@ -29 +29 @@
 using namespace flair::meta;
 
+namespace { // anonymous
+     vector<flair::meta::Uav* (*)(FrameworkManager*,string,string,UavMultiplex*)> vectoroffunctions;
+}
+
 Uav *CreateUav(FrameworkManager *parent, string uav_name, string uav_type,
                UavMultiplex *multiplex) {
-  /*if(uav_type=="ardrone2") {
-        return new ArDrone2(parent,uav_name,multiplex);
-    } else */ if (uav_type == "hds_x4") {
+
+  Uav *uav;
+  for(int i=0;i<vectoroffunctions.size();i++) {
+    uav=vectoroffunctions.at(i)(parent, uav_name, uav_type,multiplex);
+    if(uav!=NULL) return uav;
+  }
+
+  if (uav_type == "hds_x4") {
     parent->Err("UAV type %s not yet implemented\n", uav_type.c_str());
     return NULL;
@@ -60 +69 @@
   }
 }
+
+void RegisterUavCreator(flair::meta::Uav*(*func)(FrameworkManager *parent, string uav_name, string uav_type,
+               UavMultiplex *multiplex)) {
+                 vectoroffunctions.push_back(func);
+
+}

trunk/lib/FlairMeta/src/UavFactory.h

@@ -25 +25 @@
                             flair::filter::UavMultiplex *multiplex = NULL);
 
+void RegisterUavCreator(flair::meta::Uav*(*func)(flair::core::FrameworkManager *parent,
+                                   std::string uav_name, std::string uav_type,
+                                   flair::filter::UavMultiplex *multiplex));
 #endif // UAVFACTORY