Changeset 140 in flair-src for trunk/lib/FlairSensorActuator/src/VrpnClient_impl.cpp

Timestamp:

02/15/17 14:41:36 (7 years ago)

Author:

Sanahuja Guillaume

Message:

improved vprnobject added to vrpnclient

File:

• trunk/lib/FlairSensorActuator/src/VrpnClient_impl.cpp (modified) (5 diffs)

trunk/lib/FlairSensorActuator/src/VrpnClient_impl.cpp

@@ -82 +82 @@
 VrpnClient_impl::~VrpnClient_impl() {
   if (!UseXbee()) {
-    // on fait une copie car le delete touche a xbee_objects_copy via
+    // on fait une copie car le delete touche a trackables_copy via
     // RemoveTrackable
-    vector<VrpnObject *> trackables_copy = trackables;
+    vector<VrpnObject_impl *> trackables_copy = trackables;
     for (unsigned int i = 0; i < trackables_copy.size(); i++)
-      delete trackables_copy.at(i);
+      delete trackables_copy.at(i)->self;
     // trackables.clear();
   } else {
@@ -114 +114 @@
 }
 
-void VrpnClient_impl::AddTrackable(VrpnObject *obj) {
+void VrpnClient_impl::AddTrackable(VrpnObject_impl *obj) {
   mutex->GetMutex();
   trackables.push_back(obj);
@@ -120 +120 @@
 }
 
-void VrpnClient_impl::RemoveTrackable(VrpnObject *obj) {
+void VrpnClient_impl::RemoveTrackable(VrpnObject_impl *obj) {
   mutex->GetMutex();
-  for (vector<VrpnObject *>::iterator it = trackables.begin();
+  for (vector<VrpnObject_impl *>::iterator it = trackables.begin();
        it < trackables.end(); it++) {
     if (*it == obj) {
       trackables.erase(it);
+      break;
+    }
+  }
+  for (vector<xbee_object>::iterator it = xbee_objects.begin();
+       it < xbee_objects.end(); it++) {
+    if ((*it).vrpnobject == obj) {
+      xbee_objects.erase(it);
       break;
     }
@@ -138 +145 @@
   mutex->GetMutex();
   xbee_objects.push_back(tmp);
-  mutex->ReleaseMutex();
-}
-
-void VrpnClient_impl::RemoveTrackable(VrpnObject_impl *obj) {
-  mutex->GetMutex();
-  for (vector<xbee_object>::iterator it = xbee_objects.begin();
-       it < xbee_objects.end(); it++) {
-    if ((*it).vrpnobject == obj) {
-      xbee_objects.erase(it);
-      break;
-    }
-  }
   mutex->ReleaseMutex();
 }
@@ -232 +227 @@
             mutex->GetMutex();
             for (unsigned int i = 0; i < trackables.size(); i++)
-                trackables.at(i)->mainloop();
+                trackables.at(i)->tracker->mainloop();
             mutex->ReleaseMutex();
         } else {