Changeset 135 in flair-src for trunk/lib/FlairMeta/src

Timestamp:

Feb 13, 2017, 11:38:33 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

VrpnObject no longer outputs Euler (ony Quaternion): warning, output matrix has changed!

File:

• trunk/lib/FlairMeta/src/MetaVrpnObject.cpp (modified) (4 diffs)

trunk/lib/FlairMeta/src/MetaVrpnObject.cpp

@@ -51 +51 @@
 
 void MetaVrpnObject::ConstructorCommon(string name) {
-  cvmatrix_descriptor *desc = new cvmatrix_descriptor(6, 1);
-  for (int i = 0; i < 6; i++) {
+  cvmatrix_descriptor *desc = new cvmatrix_descriptor(7, 1);
+  for (int i = 0; i < desc->Rows(); i++) {
     desc->SetElementName(i, 0, Output()->Name(i, 0));
   }
   cvmatrix *prev_value = new cvmatrix(this, desc, elementDataType, name);
-  for (int i = 0; i < 6; i++) {
+  for (int i = 0; i < prev_value->Rows(); i++) {
     prev_value->SetValue(i, 0, 0);
   }
@@ -63 +63 @@
                            name + " Passe bas", prev_value);
 
-  desc = new cvmatrix_descriptor(6, 1);
-  for (int i = 0; i < 6; i++) {
+  desc = new cvmatrix_descriptor(7, 1);
+  for (int i = 0; i < desc->Rows(); i++) {
     desc->SetElementName(i, 0, "d" + Output()->Name(i, 0));
   }
   prev_value = new cvmatrix(this, desc, elementDataType, name);
-  for (int i = 0; i < 6; i++) {
+  for (int i = 0; i < prev_value->Rows(); i++) {
     prev_value->SetValue(i, 0, 0);
   }
@@ -76 +76 @@
 
   vx_opti_plot = new DataPlot1D(GetPlotTab()->NewRow(), "vx", -3, 3);
-  vx_opti_plot->AddCurve(euler->Matrix()->Element(3));
+  vx_opti_plot->AddCurve(euler->Matrix()->Element(4));
   vy_opti_plot = new DataPlot1D(GetPlotTab()->LastRowLastCol(), "vy", -3, 3);
-  vy_opti_plot->AddCurve(euler->Matrix()->Element(4));
+  vy_opti_plot->AddCurve(euler->Matrix()->Element(5));
   vz_opti_plot = new DataPlot1D(GetPlotTab()->LastRowLastCol(), "vz", -2, 2);
-  vz_opti_plot->AddCurve(euler->Matrix()->Element(5));
+  vz_opti_plot->AddCurve(euler->Matrix()->Element(6));
 
   plot_tab = new Tab(GetVrpnClient()->GetTabWidget(), "Mesures (xy) " + name);
   xy_plot = new DataPlot2D(plot_tab->NewRow(), "xy", "y", -5, 5, "x", -5, 5);
-  xy_plot->AddCurve(Output()->Element(4, 0), Output()->Element(3, 0));
+  xy_plot->AddCurve(Output()->Element(5, 0), Output()->Element(4, 0));
 }
 
@@ -98 +98 @@
 
 void MetaVrpnObject::GetSpeed(Vector3D &speed) const {
-  speed.x = euler->Output(3, 0);
-  speed.y = euler->Output(4, 0);
-  speed.z = euler->Output(5, 0);
+  speed.x = euler->Output(4, 0);
+  speed.y = euler->Output(5, 0);
+  speed.z = euler->Output(6, 0);
 }