Changeset 214 in flair-src for trunk/lib/FlairMeta/src/MetaVrpnObject.cpp

Timestamp:

02/07/18 17:49:27 (5 years ago)

Author:

Sanahuja Guillaume

Message:

matrix

File:

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

trunk/lib/FlairMeta/src/MetaVrpnObject.cpp

@@ -27 +27 @@
 #include <Tab.h>
 #include <TabWidget.h>
-#include <cvmatrix.h>
+#include <Matrix.h>
 
 using std::string;
@@ -54 +54 @@
     desc->SetElementName(i, 0, Output()->Name(i, 0));
   }
-  cvmatrix *prev_value = new cvmatrix(this, desc, floatType, name);
+  Matrix *prev_value = new Matrix(this, desc, floatType, name);
   delete desc;
 
@@ -65 +65 @@
     desc->SetElementName(i, 0, "d" + Output()->Name(i, 0));
   }
-  prev_value = new cvmatrix(this, desc, floatType, name);
+  prev_value = new Matrix(this, desc, floatType, name);
   delete desc;
 
@@ -73 +73 @@
 
   vx_opti_plot = new DataPlot1D(GetPlotTab()->NewRow(), "vx", -3, 3);
-  vx_opti_plot->AddCurve(euler->Matrix()->Element(4));
+  vx_opti_plot->AddCurve(euler->GetMatrix()->Element(4));
   vy_opti_plot = new DataPlot1D(GetPlotTab()->LastRowLastCol(), "vy", -3, 3);
-  vy_opti_plot->AddCurve(euler->Matrix()->Element(5));
+  vy_opti_plot->AddCurve(euler->GetMatrix()->Element(5));
   vz_opti_plot = new DataPlot1D(GetPlotTab()->LastRowLastCol(), "vz", -2, 2);
-  vz_opti_plot->AddCurve(euler->Matrix()->Element(6));
+  vz_opti_plot->AddCurve(euler->GetMatrix()->Element(6));
 
   plot_tab = new Tab(GetVrpnClient()->GetTabWidget(), "Mesures (xy) " + name);