Index: trunk/doc/Flair/classflair_1_1sensor_1_1_vrpn_object.html
===================================================================
--- trunk/doc/Flair/classflair_1_1sensor_1_1_vrpn_object.html	(revision 94)
+++ trunk/doc/Flair/classflair_1_1sensor_1_1_vrpn_object.html	(revision 98)
@@ -136,10 +136,10 @@
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="pub-methods"></a>
 Public Member Functions</h2></td></tr>
-<tr class="memitem:ae63bc389dc7a4eb878d07cb71eb7d710"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classflair_1_1sensor_1_1_vrpn_object.html#ae63bc389dc7a4eb878d07cb71eb7d710">VrpnObject</a> (std::string name, const <a class="el" href="classflair_1_1gui_1_1_tab_widget.html">gui::TabWidget</a> *tab)</td></tr>
-<tr class="memdesc:ae63bc389dc7a4eb878d07cb71eb7d710"><td class="mdescLeft">&#160;</td><td class="mdescRight">Constructor.  <a href="#ae63bc389dc7a4eb878d07cb71eb7d710">More...</a><br /></td></tr>
-<tr class="separator:ae63bc389dc7a4eb878d07cb71eb7d710"><td class="memSeparator" colspan="2">&#160;</td></tr>
-<tr class="memitem:a18c54c8e2e297647fc2ffdebc2835c2f"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classflair_1_1sensor_1_1_vrpn_object.html#a18c54c8e2e297647fc2ffdebc2835c2f">VrpnObject</a> (std::string name, uint8_t id, const <a class="el" href="classflair_1_1gui_1_1_tab_widget.html">gui::TabWidget</a> *tab)</td></tr>
-<tr class="memdesc:a18c54c8e2e297647fc2ffdebc2835c2f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Constructor.  <a href="#a18c54c8e2e297647fc2ffdebc2835c2f">More...</a><br /></td></tr>
-<tr class="separator:a18c54c8e2e297647fc2ffdebc2835c2f"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a334e0f4266682bb0f95a81eb1bacca46"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classflair_1_1sensor_1_1_vrpn_object.html#a334e0f4266682bb0f95a81eb1bacca46">VrpnObject</a> (std::string name, const <a class="el" href="classflair_1_1gui_1_1_tab_widget.html">gui::TabWidget</a> *tab, <a class="el" href="classflair_1_1sensor_1_1_vrpn_client.html">sensor::VrpnClient</a> *client=<a class="el" href="namespaceflair_1_1sensor.html#a96c531aa24e6dd95ac9dc400d8e52b2c">GetVrpnClient</a>())</td></tr>
+<tr class="memdesc:a334e0f4266682bb0f95a81eb1bacca46"><td class="mdescLeft">&#160;</td><td class="mdescRight">Constructor.  <a href="#a334e0f4266682bb0f95a81eb1bacca46">More...</a><br /></td></tr>
+<tr class="separator:a334e0f4266682bb0f95a81eb1bacca46"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a199dd7221f3330bfebe9b799c4c6036b"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classflair_1_1sensor_1_1_vrpn_object.html#a199dd7221f3330bfebe9b799c4c6036b">VrpnObject</a> (std::string name, uint8_t id, const <a class="el" href="classflair_1_1gui_1_1_tab_widget.html">gui::TabWidget</a> *tab, <a class="el" href="classflair_1_1sensor_1_1_vrpn_client.html">sensor::VrpnClient</a> *client=<a class="el" href="namespaceflair_1_1sensor.html#a96c531aa24e6dd95ac9dc400d8e52b2c">GetVrpnClient</a>())</td></tr>
+<tr class="memdesc:a199dd7221f3330bfebe9b799c4c6036b"><td class="mdescLeft">&#160;</td><td class="mdescRight">Constructor.  <a href="#a199dd7221f3330bfebe9b799c4c6036b">More...</a><br /></td></tr>
+<tr class="separator:a199dd7221f3330bfebe9b799c4c6036b"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a3f763c10994c9105bc24b3ab61f90afa"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classflair_1_1sensor_1_1_vrpn_object.html#a3f763c10994c9105bc24b3ab61f90afa">~VrpnObject</a> (void)</td></tr>
 <tr class="memdesc:a3f763c10994c9105bc24b3ab61f90afa"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destructor.  <a href="#a3f763c10994c9105bc24b3ab61f90afa">More...</a><br /></td></tr>
@@ -255,5 +255,5 @@
 <div class="textblock"><p>Class for VRPN object. The IODevice is created with the <a class="el" href="classflair_1_1sensor_1_1_vrpn_client.html" title="Class to connect to a Vrpn server. The Thread is created with the FrameworkManager as parent...">VrpnClient</a> as parent. <a class="el" href="classflair_1_1sensor_1_1_vrpn_client.html" title="Class to connect to a Vrpn server. The Thread is created with the FrameworkManager as parent...">VrpnClient</a> must be created before. </p>
 </div><h2 class="groupheader">Constructor &amp; Destructor Documentation</h2>
-<a class="anchor" id="ae63bc389dc7a4eb878d07cb71eb7d710"></a>
+<a class="anchor" id="a334e0f4266682bb0f95a81eb1bacca46"></a>
 <div class="memitem">
 <div class="memproto">
@@ -269,5 +269,11 @@
           <td></td>
           <td class="paramtype">const <a class="el" href="classflair_1_1gui_1_1_tab_widget.html">gui::TabWidget</a> *&#160;</td>
-          <td class="paramname"><em>tab</em>&#160;</td>
+          <td class="paramname"><em>tab</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="classflair_1_1sensor_1_1_vrpn_client.html">sensor::VrpnClient</a> *&#160;</td>
+          <td class="paramname"><em>client</em> = <code><a class="el" href="namespaceflair_1_1sensor.html#a96c531aa24e6dd95ac9dc400d8e52b2c">GetVrpnClient</a>()</code>&#160;</td>
         </tr>
         <tr>
@@ -285,4 +291,5 @@
     <tr><td class="paramname">name</td><td>VRPN object name, should be the same as defined in the server </td></tr>
     <tr><td class="paramname">tab</td><td>Tab for the user interface </td></tr>
+    <tr><td class="paramname">client</td><td><a class="el" href="classflair_1_1sensor_1_1_vrpn_client.html" title="Class to connect to a Vrpn server. The Thread is created with the FrameworkManager as parent...">VrpnClient</a> of the connection, if unspecified, use the default one </td></tr>
   </table>
   </dd>
@@ -291,5 +298,5 @@
 </div>
 </div>
-<a class="anchor" id="a18c54c8e2e297647fc2ffdebc2835c2f"></a>
+<a class="anchor" id="a199dd7221f3330bfebe9b799c4c6036b"></a>
 <div class="memitem">
 <div class="memproto">
@@ -311,5 +318,11 @@
           <td></td>
           <td class="paramtype">const <a class="el" href="classflair_1_1gui_1_1_tab_widget.html">gui::TabWidget</a> *&#160;</td>
-          <td class="paramname"><em>tab</em>&#160;</td>
+          <td class="paramname"><em>tab</em>, </td>
+        </tr>
+        <tr>
+          <td class="paramkey"></td>
+          <td></td>
+          <td class="paramtype"><a class="el" href="classflair_1_1sensor_1_1_vrpn_client.html">sensor::VrpnClient</a> *&#160;</td>
+          <td class="paramname"><em>client</em> = <code><a class="el" href="namespaceflair_1_1sensor.html#a96c531aa24e6dd95ac9dc400d8e52b2c">GetVrpnClient</a>()</code>&#160;</td>
         </tr>
         <tr>
@@ -322,10 +335,11 @@
 
 <p>Constructor. </p>
-<p>Construct a <a class="el" href="classflair_1_1sensor_1_1_vrpn_object.html" title="Class for VRPN object. The IODevice is created with the VrpnClient as parent. VrpnClient must be crea...">VrpnObject</a>. Connection is done by IP.</p>
+<p>Construct a <a class="el" href="classflair_1_1sensor_1_1_vrpn_object.html" title="Class for VRPN object. The IODevice is created with the VrpnClient as parent. VrpnClient must be crea...">VrpnObject</a>. Connection is done by xbee.</p>
 <dl class="params"><dt>Parameters</dt><dd>
   <table class="params">
     <tr><td class="paramname">name</td><td>name </td></tr>
-    <tr><td class="paramname">id</td><td>VRPN object id, should be the same as defined in the server </td></tr>
+    <tr><td class="paramname">id</td><td>VRPN object id, should be the same as defined in the xbee bridge </td></tr>
     <tr><td class="paramname">tab</td><td>Tab for the user interface </td></tr>
+    <tr><td class="paramname">client</td><td><a class="el" href="classflair_1_1sensor_1_1_vrpn_client.html" title="Class to connect to a Vrpn server. The Thread is created with the FrameworkManager as parent...">VrpnClient</a> of the connection, if unspecified, use the default one </td></tr>
   </table>
   </dd>
@@ -578,5 +592,5 @@
   <ul>
     <li class="navelem"><a class="el" href="namespaceflair.html">flair</a></li><li class="navelem"><a class="el" href="namespaceflair_1_1sensor.html">sensor</a></li><li class="navelem"><a class="el" href="classflair_1_1sensor_1_1_vrpn_object.html">VrpnObject</a></li>
-    <li class="footer">Generated on Wed Dec 5 2018 16:50:43 for Flair by
+    <li class="footer">Generated on Wed Jan 16 2019 09:54:10 for Flair by
     <a href="http://www.doxygen.org/index.html">
     <img class="footer" src="doxygen.png" alt="doxygen"/></a> 1.8.9.1 </li>
