Changeset 139 in flair-src for trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp

Timestamp:

02/14/17 17:02:06 (7 years ago)

Author:

Sanahuja Guillaume

Message:

warn message if vrpnobject is added on running client

File:

• trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp (modified) (3 diffs)

trunk/lib/FlairSensorActuator/src/VrpnObject_impl.cpp

@@ -56 +56 @@
   }
 
-  if (parent->UseXbee()) {
-    parent->pimpl_->AddTrackable(this, id);
-    tracker = NULL;
-  } else {
-    parent->pimpl_->AddTrackable(self);
-    tracker = new vrpn_Tracker_Remote(name.c_str(), parent->pimpl_->connection);
-    tracker->register_change_handler(this, handle_pos);
-    tracker->shutup = true;
-  }
-
   // state
   cvmatrix_descriptor *desc = new cvmatrix_descriptor(7, 1);
@@ -91 +81 @@
   z_plot = new DataPlot1D(plot_tab->LastRowLastCol(), "z", -2, 0);
   z_plot->AddCurve(output->Element(6));
+  
+  if(parent->IsRunning()) {
+    self->Warn("adding VrpnObject on running VrpnClient can crash\n");
+  }
+  
+  if (parent->UseXbee()) {
+    tracker = NULL;
+    parent->pimpl_->AddTrackable(this, id);
+  } else {
+    tracker = new vrpn_Tracker_Remote(name.c_str(), parent->pimpl_->connection);
+    tracker->register_change_handler(this, handle_pos);
+    tracker->shutup = true;
+    parent->pimpl_->AddTrackable(self);
+  }
 }
 
@@ -106 +110 @@
 }
 
-void VrpnObject_impl::mainloop(void) { tracker->mainloop(); }
+void VrpnObject_impl::mainloop(void) { 
+     tracker->mainloop();
+}
 
 bool VrpnObject_impl::IsTracked(unsigned int timeout_ms) {