Changeset 15 in flair-src for trunk/lib/FlairMeta/src/UavFactory.cpp

Timestamp:

04/08/16 15:40:57 (8 years ago)

Author:

Bayard Gildas

Message:

sources reformatted with flair-format-dir script

File:

• trunk/lib/FlairMeta/src/UavFactory.cpp (modified) (1 diff)

trunk/lib/FlairMeta/src/UavFactory.cpp

@@ -29 +29 @@
 using namespace flair::meta;
 
-Uav* CreateUav(FrameworkManager* parent,string uav_name,string uav_type,UavMultiplex *multiplex) {
-    /*if(uav_type=="ardrone2") {
+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") {
-        parent->Err("UAV type %s not yet implemented\n",uav_type.c_str());
-        return NULL;
-    } else if(uav_type=="hds_x8") {
-        return new HdsX8(parent,uav_name,multiplex);
-    } else if(uav_type=="xair") {
-        return new XAir(parent,uav_name,multiplex);
-    } else if(uav_type=="hds_xufo") {
-        parent->Err("UAV type %s not yet implemented\n",uav_type.c_str());
-        return NULL;
-    } else if(uav_type.compare(0,7,"x4_simu")==0) {
-        int simu_id=0;
-        if(uav_type.size()>7) {
-            simu_id=atoi(uav_type.substr (7,uav_type.size()-7).c_str());
-        }
-        return new SimuX4(parent,uav_name,simu_id,multiplex);
-    } else if(uav_type.compare(0,7,"x8_simu") == 0) {
-        int simu_id=0;
-        if(uav_type.size()>7) {
-            simu_id=atoi(uav_type.substr (7,uav_type.size()-7).c_str());
-        }
-        return new SimuX8(parent,uav_name,simu_id,multiplex);
-    } else {
-        parent->Err("UAV type %s unknown\n",uav_type.c_str());
-        return NULL;
+    } else */ if (uav_type == "hds_x4") {
+    parent->Err("UAV type %s not yet implemented\n", uav_type.c_str());
+    return NULL;
+  } else if (uav_type == "hds_x8") {
+    return new HdsX8(parent, uav_name, multiplex);
+  } else if (uav_type == "xair") {
+    return new XAir(parent, uav_name, multiplex);
+  } else if (uav_type == "hds_xufo") {
+    parent->Err("UAV type %s not yet implemented\n", uav_type.c_str());
+    return NULL;
+  } else if (uav_type.compare(0, 7, "x4_simu") == 0) {
+    int simu_id = 0;
+    if (uav_type.size() > 7) {
+      simu_id = atoi(uav_type.substr(7, uav_type.size() - 7).c_str());
     }
+    return new SimuX4(parent, uav_name, simu_id, multiplex);
+  } else if (uav_type.compare(0, 7, "x8_simu") == 0) {
+    int simu_id = 0;
+    if (uav_type.size() > 7) {
+      simu_id = atoi(uav_type.substr(7, uav_type.size() - 7).c_str());
+    }
+    return new SimuX8(parent, uav_name, simu_id, multiplex);
+  } else {
+    parent->Err("UAV type %s unknown\n", uav_type.c_str());
+    return NULL;
+  }
 }