Changeset 263 in flair-src for trunk

Timestamp:

Sep 12, 2018, 4:50:01 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

CircleFollower: remove depdency to cameras

Location:

trunk/demos/CircleFollower/uav/src

Files:

• CircleFollower.cpp (modified) (2 diffs)
• CircleFollower.h (modified) (1 diff)
• main.cpp (modified) (2 diffs)

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

@@ -31 +31 @@
 #include <Ahrs.h>
 #include <AhrsData.h>
-#include <Camera.h>
-#include <CvtColor.h>
 
 using namespace std;
@@ -52 +50 @@
     stopCircle=new PushButton(GetButtonsLayout()->LastRowLastCol(),"stop_circle");
     positionHold=new PushButton(GetButtonsLayout()->LastRowLastCol(),"position hold");
-
-    greyCameraImage=new CvtColor(uav->GetVerticalCamera(),"gray",CvtColor::Conversion_t::ToGray);
-    uav->GetVerticalCamera()->UseDefaultPlot(greyCameraImage->Output()); // Le defaultPlot de la caméra peut afficher n'importe quoi?
 
     if(vrpnclient->UseXbee()==true) {

trunk/demos/CircleFollower/uav/src/CircleFollower.h

@@ -39 +39 @@
 
     private:
-        flair::filter::CvtColor* greyCameraImage;
 
         enum class BehaviourMode_t {

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

@@ -18 +18 @@
 #include <tclap/CmdLine.h>
 #include <TargetEthController.h>
-#include <VisionFilter.h>
+//#include <VisionFilter.h>
 
 using namespace TCLAP;
@@ -39 +39 @@
 int main(int argc, char* argv[]) {
     parseOptions(argc,argv);
-
-    if(!InitVisionFilter("file=tutu")) {
-        exit(1);
-    }
 
     FrameworkManager *manager;