Changeset 325 in flair-src for branches/sanscv/demos/OpticalFlow/uav/src

Timestamp:

Aug 28, 2019, 4:12:11 PM (5 years ago)

Author:

Sanahuja Guillaume

Message:

using pimpl

Location:

branches/sanscv/demos/OpticalFlow/uav/src

Files:

• DemoOpticalFlow.cpp (modified) (1 diff)
• DemoOpticalFlow.h (modified) (1 diff)

branches/sanscv/demos/OpticalFlow/uav/src/DemoOpticalFlow.cpp

@@ -77 +77 @@
   DataPlot1D* xVelocityPlot=new DataPlot1D(opticalFlowTab->NewRow(),"x speed (px/s)",-250,250);
   DataPlot1D* yVelocityPlot=new DataPlot1D(opticalFlowTab->LastRowLastCol(),"y speed (px/s)",-250,250);
-  DataPlot1D* xFirstPointPlot=new DataPlot1D(opticalFlowTab->NewRow(),"x movement first point",-25,25);
-  DataPlot1D* yFirstPointPlot=new DataPlot1D(opticalFlowTab->LastRowLastCol(),"y movement first point",-25,25);
-//  DataPlot1D* xAccelerationPlot=new DataPlot1D(opticalFlowTab->NewRow(),"x_acceleration",-250,250);
-//  DataPlot1D* yAccelerationPlot=new DataPlot1D(opticalFlowTab->LastRowLastCol(),"y_acceleration",-250,250);
-
+  
   xVelocityPlot->AddCurve(opticalFlowSpeedRaw->Output()->Element(0,0));
   xVelocityPlot->AddCurve(opticalFlowSpeed->GetMatrix()->Element(0,0),DataPlot::Blue);
   yVelocityPlot->AddCurve(opticalFlowSpeedRaw->Output()->Element(1,0));
   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);
-  xFirstPointPlot->AddCurve(opticalFlowCompensated->GetFirstPointDisplacement()->Element(2,0),DataPlot::Green);
-  yFirstPointPlot->AddCurve(opticalFlowCompensated->GetFirstPointDisplacement()->Element(0,1));
-  yFirstPointPlot->AddCurve(opticalFlowCompensated->GetFirstPointDisplacement()->Element(1,1),DataPlot::Blue);
-  yFirstPointPlot->AddCurve(opticalFlowCompensated->GetFirstPointDisplacement()->Element(2,1),DataPlot::Green);
-//  xAccelerationPlot->AddCurve(opticalFlowAccelerationRaw->Matrix()->Element(0,0));
-//  xAccelerationPlot->AddCurve(opticalFlowAcceleration->Matrix()->Element(0,0),DataPlot::Blue);
-//  yAccelerationPlot->AddCurve(opticalFlowAccelerationRaw->Matrix()->Element(1,0));
-//  yAccelerationPlot->AddCurve(opticalFlowAcceleration->Matrix()->Element(1,0),DataPlot::Blue);
-
+  
   u_x=new Pid(setupLawTab->At(1,0),"u_x");
   u_x->UseDefaultPlot(graphLawTab->NewRow());

branches/sanscv/demos/OpticalFlow/uav/src/DemoOpticalFlow.h

@@ -65 +65 @@
         flair::filter::OpticalFlowCompensated *opticalFlowCompensated;
         flair::filter::OpticalFlowSpeed *opticalFlowSpeedRaw;
-        flair::filter::EulerDerivative *opticalFlowAccelerationRaw;
+        //flair::filter::EulerDerivative *opticalFlowAccelerationRaw;
     flair::gui::PushButton *startOpticalflow,*stopOpticalflow;
     void StartOpticalFlow(void);