Changeset 140 in flair-src for trunk/lib/FlairSensorActuator/src/VrpnObject_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/VrpnObject_impl.cpp (modified) (3 diffs)

trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp

@@ -55 +55 @@
         "identifiant pour la connexion Xbee ignore car pas en mode Xbee\n");
   }
-
+  
   // state
   cvmatrix_descriptor *desc = new cvmatrix_descriptor(7, 1);
@@ -82 +82 @@
   z_plot->AddCurve(output->Element(6));
   
-  if(parent->IsRunning()) {
-    self->Warn("adding VrpnObject on running VrpnClient can crash\n");
-  }
-  
   if (parent->UseXbee()) {
     tracker = NULL;
@@ -93 +89 @@
     tracker->register_change_handler(this, handle_pos);
     tracker->shutup = true;
-    parent->pimpl_->AddTrackable(self);
+    parent->pimpl_->AddTrackable(this);
   }
+ 
 }
 
 VrpnObject_impl::~VrpnObject_impl(void) {
-  if (tracker != NULL) // normal
-  {
-    parent->pimpl_->RemoveTrackable(self);
+  parent->pimpl_->RemoveTrackable(this);
+  if (tracker != NULL) {// normal
     tracker->unregister_change_handler(this, handle_pos);
     delete tracker;
-  } else // xbee
-  {
-    parent->pimpl_->RemoveTrackable(this);
   }
   delete plot_tab;
-}
-
-void VrpnObject_impl::mainloop(void) { 
-     tracker->mainloop();
 }