Changeset 214 in flair-src for trunk/demos

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

matrix

Location:

trunk/demos

Files:

• CircleFollower/simulator/build_x86_64/bin/setup_x4.xml (modified) (2 diffs)
• CircleFollower/simulator/build_x86_64/bin/setup_x8.xml (modified) (4 diffs)
• CircleFollower/uav/src/CircleFollower.cpp (modified) (2 diffs)
• OpticalFlow/uav/src/DemoOpticalFlow.cpp (modified) (4 diffs)
• OpticalFlow/uav/src/DemoOpticalFlow.h (modified) (2 diffs)
• SimpleFleet/uav/src/SimpleFleet.cpp (modified) (2 diffs)
• Sinus/src/Loop.cpp (modified) (3 diffs)
• Sinus/src/MeanFilter.cpp (modified) (4 diffs)
• Sinus/src/MeanFilter.h (modified) (3 diffs)
• Sinus/src/Sinus.cpp (modified) (3 diffs)
• Sinus/src/Sinus.h (modified) (3 diffs)

trunk/demos/CircleFollower/simulator/build_x86_64/bin/setup_x4.xml

@@ -27 +27 @@
     <DoubleSpinBox value="0.006" name="j_pitch:"/>
     <DoubleSpinBox value="0.1" name="j_yaw:"/>
-   </Tab>
+   <SpinBox name="motor timeout:" value="100"/></Tab>
    <Tab name="us">
     <GroupBox name="position">
@@ -40 +40 @@
     </GroupBox>
     <DoubleSpinBox value="6" name="range:"/>
-   <Vector3DSpinBox name="position" value_x="0.00" value_y="0.00" value_z="0.0400000000000000"/><Vector3DSpinBox name="direction" value_x="0" value_y="0" value_z="1"/></Tab>
+   <Vector3DSpinBox name="position" value_x="0" value_y="0" value_z="0.04"/><Vector3DSpinBox name="direction" value_x="0" value_y="0" value_z="1"/></Tab>
    <Tab name="bottom camera">
     <GroupBox name="position">

trunk/demos/CircleFollower/simulator/build_x86_64/bin/setup_x8.xml

@@ -16 +16 @@
     <DoubleSpinBox value="-1.2" name="z:"/>
     <SpinBox value="90" name="yaw (deg):"/>
-   <Vector3DSpinBox name="position" value_x="-1.50" value_y="0.00" value_z="-1.00"/></Tab>
+   <Vector3DSpinBox name="position" value_x="-1.5" value_y="0" value_z="-1"/></Tab>
    <Tab name="model">
     <DoubleSpinBox value="1.6" name="mass (kg):"/>
@@ -31 +31 @@
     <DoubleSpinBox value="0.72" name="sigma:"/>
     <DoubleSpinBox value="1" name="S:"/>
-   </Tab>
+   <SpinBox name="motor timeout:" value="100"/></Tab>
    <Tab name="us">
     <GroupBox name="position">
@@ -44 +44 @@
     </GroupBox>
     <DoubleSpinBox value="6" name="range:"/>
-   <Vector3DSpinBox name="position" value_x="0.00" value_y="0.00" value_z="0.04"/><Vector3DSpinBox name="direction" value_x="0.00" value_y="0.00" value_z="1.00"/></Tab>
+   <Vector3DSpinBox name="position" value_x="0" value_y="0" value_z="0.04"/><Vector3DSpinBox name="direction" value_x="0" value_y="0" value_z="1"/></Tab>
    <Tab name="bottom camera">
     <GroupBox name="position">
@@ -96 +96 @@
     <DoubleSpinBox value="0" name="z:"/>
     <SpinBox value="90" name="yaw (deg):"/>
-   <Vector3DSpinBox name="position" value_x="-1.50" value_y="1.00" value_z="0.00"/></Tab>
+   <Vector3DSpinBox name="position" value_x="-1.5" value_y="1" value_z="0"/></Tab>
    <Tab name="model">
     <DoubleSpinBox value="1.3" name="translational speed (m/s):"/>

trunk/demos/CircleFollower/uav/src/CircleFollower.cpp

@@ -24 +24 @@
 #include <MetaVrpnObject.h>
 #include <TrajectoryGenerator2DCircle.h>
+#include <Matrix.h>
 #include <cvmatrix.h>
 #include <cmath>
@@ -61 +62 @@
 
     circle=new TrajectoryGenerator2DCircle(vrpnclient->GetLayout()->NewRow(),"circle");
-    uavVrpn->xPlot()->AddCurve(circle->Matrix()->Element(0,0),DataPlot::Blue);
-    uavVrpn->yPlot()->AddCurve(circle->Matrix()->Element(0,1),DataPlot::Blue);
-    uavVrpn->VxPlot()->AddCurve(circle->Matrix()->Element(1,0),DataPlot::Blue);
-    uavVrpn->VyPlot()->AddCurve(circle->Matrix()->Element(1,1),DataPlot::Blue);
-    uavVrpn->XyPlot()->AddCurve(circle->Matrix()->Element(0,1),circle->Matrix()->Element(0,0),DataPlot::Blue,"circle");
+    uavVrpn->xPlot()->AddCurve(circle->GetMatrix()->Element(0,0),DataPlot::Blue);
+    uavVrpn->yPlot()->AddCurve(circle->GetMatrix()->Element(0,1),DataPlot::Blue);
+    uavVrpn->VxPlot()->AddCurve(circle->GetMatrix()->Element(1,0),DataPlot::Blue);
+    uavVrpn->VyPlot()->AddCurve(circle->GetMatrix()->Element(1,1),DataPlot::Blue);
+    uavVrpn->XyPlot()->AddCurve(circle->GetMatrix()->Element(0,1),circle->GetMatrix()->Element(0,0),DataPlot::Blue,"circle");
 
     uX=new Pid(setupLawTab->At(1,0),"u_x");

trunk/demos/OpticalFlow/uav/src/DemoOpticalFlow.cpp

@@ -22 +22 @@
 #include <LowPassFilter.h>
 #include <EulerDerivative.h>
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <GridLayout.h>
 #include <DataPlot1D.h>
@@ -65 +65 @@
   opticalFlowSpeedRaw=new OpticalFlowSpeed(opticalFlowCompensated,uav->GetAhrs(),uav->GetVerticalCamera()->GetLayout()->NewRow(),"vitesse du Flux Optique");
   //opticalFlowSpeed=vitesse de déplacement en pixels par seconde (moyenne sur tous les points et division par le delta T)
-  cvmatrix* twoByOneOFS=new cvmatrix((const Thread*)this,2,1,floatType);
-  cvmatrix* twoByOneOFAR=new cvmatrix((const Thread*)this,2,1,floatType);
-  cvmatrix* twoByOneOFA=new cvmatrix((const Thread*)this,2,1,floatType);
+  Matrix* twoByOneOFS=new Matrix((const Thread*)this,2,1,floatType);
+  Matrix* twoByOneOFAR=new Matrix((const Thread*)this,2,1,floatType);
+  Matrix* twoByOneOFA=new Matrix((const Thread*)this,2,1,floatType);
   opticalFlowSpeed=new LowPassFilter(opticalFlowSpeedRaw,uav->GetVerticalCamera()->GetLayout()->NewRow(),"Speed lowPass",twoByOneOFS);
   opticalFlowAccelerationRaw=new EulerDerivative(opticalFlowSpeed,uav->GetVerticalCamera()->GetLayout()->NewRow(),"derivative",twoByOneOFAR);
@@ -83 +83 @@
 
   xVelocityPlot->AddCurve(opticalFlowSpeedRaw->Output()->Element(0,0));
-  xVelocityPlot->AddCurve(opticalFlowSpeed->Matrix()->Element(0,0),DataPlot::Blue);
+  xVelocityPlot->AddCurve(opticalFlowSpeed->GetMatrix()->Element(0,0),DataPlot::Blue);
   yVelocityPlot->AddCurve(opticalFlowSpeedRaw->Output()->Element(1,0));
-  yVelocityPlot->AddCurve(opticalFlowSpeed->Matrix()->Element(1,0),DataPlot::Blue);
+  yVelocityPlot->AddCurve(opticalFlowSpeed->GetMatrix()->Element(1,0),DataPlot::Blue);
   xFirstPointPlot->AddCurve(opticalFlowCompensated->GetFirstPointDisplacement()->Element(0,0));
   xFirstPointPlot->AddCurve(opticalFlowCompensated->GetFirstPointDisplacement()->Element(1,0),DataPlot::Blue);
@@ -107 +107 @@
   
   Tab* opticalFlowRealTab=new Tab(getFrameworkManager()->GetTabWidget(),"real speed");
-  opticalFlowRealSpeed=new cvmatrix((const Thread*)this,2,1,floatType);
-  opticalFlowReference=new cvmatrix((const Thread*)this,2,1,floatType);
-  opticalFlowRealAcceleration=new cvmatrix((const Thread*)this,2,1,floatType);
+  opticalFlowRealSpeed=new Matrix((const Thread*)this,2,1,floatType);
+  opticalFlowReference=new Matrix((const Thread*)this,2,1,floatType);
+  opticalFlowRealAcceleration=new Matrix((const Thread*)this,2,1,floatType);
   DataPlot1D* xRealVelocityPlot=new DataPlot1D(opticalFlowRealTab->NewRow(),"x speed (m/s)",-2,2);
   DataPlot1D* yRealVelocityPlot=new DataPlot1D(opticalFlowRealTab->LastRowLastCol(),"y speed (m/s)",-2,2);

trunk/demos/OpticalFlow/uav/src/DemoOpticalFlow.h

@@ -20 +20 @@
 namespace flair {
     namespace core {
-        class cvmatrix;
+        class Matrix;
     }
     namespace gui {
@@ -55 +55 @@
         flair::gui::GroupBox* opticalFlowGroupBox;
         flair::gui::DoubleSpinBox *maxXSpeed,*maxYSpeed;
-        flair::core::cvmatrix *opticalFlowReference;
+        flair::core::Matrix *opticalFlowReference;
         flair::filter::Pid *u_x, *u_y;
         flair::filter::CvtColor* greyCameraImage;
         flair::core::AhrsData *customReferenceOrientation;
-        flair::core::cvmatrix *opticalFlowRealSpeed,*opticalFlowRealAcceleration;
+        flair::core::Matrix *opticalFlowRealSpeed,*opticalFlowRealAcceleration;
 
     private:

trunk/demos/SimpleFleet/uav/src/SimpleFleet.cpp

@@ -29 +29 @@
 #include <PidThrust.h>
 #include <Euler.h>
+#include <Matrix.h>
 #include <cvmatrix.h>
 #include <AhrsData.h>
@@ -60 +61 @@
 
     circle=new TrajectoryGenerator2DCircle(vrpnclient->GetLayout()->NewRow(),"circle");
-    uavVrpn->xPlot()->AddCurve(circle->Matrix()->Element(0,0),0,0,255);
-    uavVrpn->yPlot()->AddCurve(circle->Matrix()->Element(0,1),0,0,255);
-    uavVrpn->VxPlot()->AddCurve(circle->Matrix()->Element(1,0),0,0,255);
-    uavVrpn->VyPlot()->AddCurve(circle->Matrix()->Element(1,1),0,0,255);
+    uavVrpn->xPlot()->AddCurve(circle->GetMatrix()->Element(0,0),0,0,255);
+    uavVrpn->yPlot()->AddCurve(circle->GetMatrix()->Element(0,1),0,0,255);
+    uavVrpn->VxPlot()->AddCurve(circle->GetMatrix()->Element(1,0),0,0,255);
+    uavVrpn->VyPlot()->AddCurve(circle->GetMatrix()->Element(1,1),0,0,255);
 
     xCircleCenter=new DoubleSpinBox(vrpnclient->GetLayout()->NewRow(),"x circle center"," m",-5,5,0.1,1,0);

trunk/demos/Sinus/src/Loop.cpp

@@ -24 +24 @@
 #include <PushButton.h>
 #include <DataPlot1D.h>
-#include <cvmatrix.h>
+#include <Matrix.h>
 
 using namespace std;
@@ -47 +47 @@
                                    "1st order lawpass filter");
   sinus->GetPlot()->AddCurve(
-      firstLowPass->Matrix()->Element(0),
+      firstLowPass->GetMatrix()->Element(0),
       DataPlot::Blue); // add output of the filter to signal's graph
 
@@ -54 +54 @@
       sinus, sinus->GetSetupLayout()->NewRow(), "3rd order lawpass filter", 3);
   sinus->GetPlot()->AddCurve(
-      thirdLowPass->Matrix()->Element(0),
+      thirdLowPass->GetMatrix()->Element(0),
       DataPlot::Yellow); // add output of the filter to signal's graph
 

trunk/demos/Sinus/src/MeanFilter.cpp

@@ -13 +13 @@
 
 #include "MeanFilter.h"
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <LayoutPosition.h>
 #include <GroupBox.h>
@@ -42 +42 @@
   desc->SetElementName(0, 0,
                        "mean filter"); // name will be used for graphs and logs
-  output = new cvmatrix(this, desc, floatType, name);
+  output = new Matrix(this, desc, floatType, name);
   delete desc;
 
@@ -52 +52 @@
 MeanFilter::~MeanFilter() {}
 
-cvmatrix *MeanFilter::GetMatrix() const { return output; }
+Matrix *MeanFilter::GetMatrix() const { return output; }
 
 float MeanFilter::GetValue(void) const { return output->Value(0, 0); }
@@ -64 +64 @@
 
   float result = 0;
-  // get input argument in a cvmatrix
-  cvmatrix *input = (cvmatrix *)data;
+  // get input argument in a matrix
+  const Matrix* input = dynamic_cast<const Matrix*>(data);
+  
+  if (!input) {
+      Warn("casting %s to Matrix failed\n",data->ObjectName().c_str());
+      return;
+  }
 
   // simple (and not efficent!) implementation of the filter

trunk/demos/Sinus/src/MeanFilter.h

@@ -25 +25 @@
 namespace flair {
 namespace core {
-class cvmatrix;
+class Matrix;
 }
 namespace gui {
@@ -70 +70 @@
   * \return pointer to the output matrix
   */
-  core::cvmatrix *GetMatrix(void) const;
+  core::Matrix *GetMatrix(void) const;
 
   /*!
@@ -86 +86 @@
   gui::GroupBox *groupBox;
   gui::SpinBox *numberOfElements;
-  core::cvmatrix *output;
+  core::Matrix *output;
   float previousValues[MAX_NUMBER_OF_ELEMENTS]; // previous values storage
 };

trunk/demos/Sinus/src/Sinus.cpp

@@ -21 +21 @@
 #include <SpinBox.h>
 #include <DataPlot1D.h>
-#include <cvmatrix.h>
+#include <Matrix.h>
 #include <math.h>
 
@@ -41 +41 @@
   cvmatrix_descriptor *desc = new cvmatrix_descriptor(1, 1);
   desc->SetElementName(0, 0, "value"); // name will be used for graphs and logs
-  output = new cvmatrix((IODevice *)this, desc, floatType, name);
+  output = new Matrix((IODevice *)this, desc, floatType, name);
   delete desc;
 
@@ -94 +94 @@
 }
 
-cvmatrix *Sinus::GetMatrix(void) const { return output; }
+Matrix *Sinus::GetMatrix(void) const { return output; }
 
 float Sinus::GetValue(void) const { return output->Value(0, 0); }

trunk/demos/Sinus/src/Sinus.h

@@ -23 +23 @@
 namespace core {
 class FrameworkManager;
-class cvmatrix;
+class Matrix;
 }
 namespace gui {
@@ -69 +69 @@
   * \return un pointeur vers la matrice de sortie
   */
-  core::cvmatrix *GetMatrix(void) const;
+  core::Matrix *GetMatrix(void) const;
 
   /*!
@@ -113 +113 @@
   void Run(void);
 
-  core::cvmatrix *output;
+  core::Matrix *output;
   gui::Tab *mainTab;
   gui::TabWidget *tabWidget;