Added Macro to disable Stereo and upgraded to OpenCV4.

Ref #1

include/animation.h

@@ -23,8 +23,12 @@ they can be represented in QT.
 #include <QStringList>
 #include <QTime>
 
+#ifndef STEREO_DISABLED
 #include "opencv/cv.h"
 #include "opencv/highgui.h"
+#else
+#include "opencv.hpp"
+#endif
 
 #include "filter.h"
 #include "helper.h"
@@ -123,20 +127,24 @@ public:
     bool isImageSequence();
     bool isCameraLiveStream();
 
+#ifndef STEREO_DISABLED
     enum Camera getCamera();
     void setCamera(enum Camera);
+#endif
     int getFirstFrameSec();
     int getFirstFrameMicroSec();
 
     QString getFileBase();
     QFileInfo getFileInfo();
 
+#ifndef STEREO_DISABLED
     // used to get access of both frames only with calibStereoFilter
 #ifdef STEREO
     PgrAviFile *getCaptureStereo();
 #else
     StereoAviFile *getCaptureStereo();
 #endif
+#endif
 
 private:
 
@@ -149,9 +157,11 @@ private:
     // Indicate if the current animation is a video or a photo or a stereo video
     bool mVideo, mImgSeq, mStereo, mCameraLiveStream;
 
+#ifndef STEREO_DISABLED
     // indicates which camera is used for stereo video
     enum Camera mCamera;
- 
+ #endif
+
     // Pointer that will be used by the animation and that will be returned in the public functions 
 //    IplImage *mImage;
     cv::Mat mImage;
@@ -224,7 +234,9 @@ private:
     // Opens an animation from a sequence of stereo video files
     // fileNumber indicates the number of the successive files splited while writing
     // nur bei einer ganz neuen sequenz ist stereoImgBuffer != 0
+#ifndef STEREO_DISABLED
     bool openAnimationStereoVideo(int fileNumber, IplImage* stereoImgLeft, IplImage* stereoImgRight);
+#endif
     bool openAnimationStereoVideo(int fileNumber, cv::Mat &stereoImgLeft, cv::Mat &stereoImgRight);
 
     // like above for the first time with new filename
@@ -251,11 +263,12 @@ private:
 #if CV_MAJOR_VERSION == 2
     // Capture structure from OpenCV 2
     CvCapture *mCapture;
-#elif CV_MAJOR_VERSION == 3
-    // Capture structure from OpenCV 3
+#else
+    // Capture structure from OpenCV 3/4
     cv::VideoCapture mVideoCapture;
 #endif
 
+#ifndef STEREO_DISABLED
     // Capture structure from pgrAviFile for Stereo Videos
 #ifdef STEREO
     PgrAviFile *mCaptureStereo;
@@ -271,7 +284,7 @@ private:
 
     // A list with all the filenames of the stereo video series
     QStringList mStereoVideoFilesList;
- 
+ #endif
 };
 
 #endif

include/backgroundFilter.h

@@ -3,8 +3,12 @@
 
 #include "filter.h"
 
+#ifndef STEREO_DISABLED
 #include "cvaux.h"
 #include "opencv/cvaux.h"
+#else
+#include "opencv2/opencv.hpp"
+#endif
 #include "opencv2/video/background_segm.hpp"
 
 
@@ -20,7 +24,7 @@ class BackgroundFilter : public Filter
 private:
 #if CV_MAJOR_VERSION == 2
     CvBGStatModel* mBgModel;
-#elif CV_MAJOR_VERSION == 3
+#elif CV_MAJOR_VERSION == 3 || CV_MAJOR_VERSION == 4
     cv::Ptr<cv::BackgroundSubtractorMOG2> mBgModel;
     //Ptr<BackgroundSubtractor> mBgModel;
 #endif

include/blurFilter.h

@@ -2,7 +2,11 @@
 #define BLURFILTER_H
 
 #include "filter.h"
+#if not CV_MAJOR_VERSION == 4
 #include "cv.h" 
+#else
+#include "opencv.hpp"
+#endif
 
 class BlurFilter : public Filter
 {

include/borderFilter.h

@@ -3,7 +3,6 @@
 
 #include "filter.h"
 
-using namespace::cv;
 
 class BorderFilter : public Filter
 {

include/brightContrastFilter.h

@@ -4,7 +4,6 @@
 #include "filter.h"
 #include "helper.h"
 
-using namespace::cv;
 
 class BrightContrastFilter : public Filter
 {

include/brightFilter.h

@@ -10,8 +10,9 @@ private:
 
 public:
     BrightFilter();
-
+#ifndef STEREO_DISABLED
     IplImage* act(IplImage *img, IplImage *res);
+#endif
 
 //     bool changed();
 

include/calibFilter.h

@@ -3,7 +3,6 @@
 
 #include "filter.h"
 
-using namespace::cv;
 
 class CalibFilter : public Filter
 {

include/codeMarkerItem.h

@@ -16,7 +16,7 @@ private:
 //    QImage *mImage;
 
     vector<int> mIds;
-    vector<vector<Point2f> > mCorners, mRejected;
+    vector<vector<cv::Point2f> > mCorners, mRejected;
     Vec2F mUlc;  // upper left corner to draw
 
 public:
@@ -24,8 +24,8 @@ public:
     QRectF boundingRect() const;
     void setRect(Vec2F& v);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
-    void setDetectedMarkers(vector<vector<Point2f> > corners, vector<int> ids);
-    void setRejectedMarkers(vector<vector<Point2f> > rejected);
+    void setDetectedMarkers(vector<vector<cv::Point2f> > corners, vector<int> ids);
+    void setRejectedMarkers(vector<vector<cv::Point2f> > rejected);
 };
 
 #endif

include/contrastFilter.h

@@ -11,8 +11,9 @@ private:
 
 public:
     ContrastFilter();
-
+#ifndef STEREO_DISABLED
     IplImage* act(IplImage *img, IplImage *res);
+#endif
 
 //     bool changed();
 

include/ellipse.h

 #ifndef ELLIPSE_H
 #define ELLIPSE_H
 
+#ifndef STEREO_DISABLED
 #include <cxcore.h>
+#else
+#include "opencv.hpp"
+#endif
 
 #include "vector.h"
 

include/extrCalibration.h

@@ -2,6 +2,10 @@
 #define EXTRCALIBRATION_H
 
 #include <iostream>
+#include <vector>
+
+#include <QString>
+#include <QVector>
 
 //#include <opencv.hpp>
 
@@ -12,17 +16,16 @@
 
 #include <opencv.hpp>
 
+#ifndef STEREO_DISABLED
 #include "cxcore.h"
 #include "cvaux.h"
+#endif
 #include "opencv.hpp"
 
 class Petrack;
 class Control;
 
 
-using namespace cv;
-using namespace std;
-
 class ExtrCalibration
 {
 
@@ -30,8 +33,8 @@ private:
     Petrack *mMainWindow;
     Control *mControlWidget;
 
-    vector<Point3f> points3D;
-    vector<Point2f> points2D;
+    std::vector<cv::Point3f> points3D;
+    std::vector<cv::Point2f> points2D;
 
 //    Mat mRotation;
 //    Mat mTranslation;
@@ -66,27 +69,27 @@ public:
     bool fetch2DPoints();
     void calibExtrParams();
     bool calcReprojectionError();
-    Point2f getImagePoint(Point3f p3d);
-    Point3f get3DPoint(Point2f p2d, double h);
-    Point3f transformRT(Point3f p);
-    bool isOutsideImage(Point2f p2d);
-    inline bool isOutsideImage(Point3f p3d)
+    cv::Point2f getImagePoint(cv::Point3f p3d);
+    cv::Point3f get3DPoint(cv::Point2f p2d, double h);
+    cv::Point3f transformRT(cv::Point3f p);
+    bool isOutsideImage(cv::Point2f p2d);
+    inline bool isOutsideImage(cv::Point3f p3d)
     {
         return isOutsideImage(getImagePoint(p3d));
     }
-    inline vector<Point3f> get3DList()
+    inline std::vector<cv::Point3f> get3DList()
     {
         return points3D;
     }
-    inline void set3DList(vector<Point3f> list3D)
+    inline void set3DList(std::vector<cv::Point3f> list3D)
     {
         this->points3D = list3D;
     }
-    inline vector<Point2f> get2DList()
+    inline std::vector<cv::Point2f> get2DList()
     {
         return points2D;
     }
-    inline void set2DList(vector<Point2f> list2D)
+    inline void set2DList(std::vector<cv::Point2f> list2D)
     {
         this->points2D = list2D;
     }

include/filter.h

 #ifndef FILTER_H
 #define FILTER_H
 
+#ifndef STEREO_DISABLED
 #include "cv.h"
 #include "opencv/cv.h"
+#else
+#include "opencv2/opencv.hpp"
+#endif
 
 class Filter;
 

include/gridItem.h

@@ -31,7 +31,7 @@ public:
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
 //    void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
-    int drawLine(QPainter *painter, Point2f *p, int y_offset);
+    int drawLine(QPainter *painter, cv::Point2f *p, int y_offset);
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 };
 

include/helper.h

@@ -54,12 +54,16 @@ inline ostream& operator<<(ostream& s, const QString& t)
 // Static function that converts an iplImg in a qImg.
 // If the images are not the same size, a new qImg will be created with the same size as the iplImg.
 #include <QImage>
+#ifndef STEREO_DISABLED
 #include "cxcore.h"
 void copyToQImage(QImage *qImg, IplImage *iplImg); // war static functin in animatioln class
+#endif
 void copyToQImage(QImage *qImg, cv::Mat &img);
 
 #include <QLabel>
+#ifndef STEREO_DISABLED
 void showImg(QLabel *l, IplImage *i);
+#endif
 
 cv::Mat getRoi(cv::Mat &img, const QRect &roi, cv::Rect &rect, bool evenPixelNumber = true);
 

include/markerCasern.h

@@ -6,6 +6,8 @@
 
 #include "ellipse.h"
 
+
+
 class TrackPoint;
 
 class MarkerCasern

include/petrack.h

@@ -6,8 +6,10 @@
 #include <QKeyEvent>
 #include <QMouseEvent>
 
+#ifndef STEREO_DISABLED
 #include "cvaux.h"
 #include "cxcore.h"
+#endif
 
 #include <opencv.hpp>
 //#include "opencv2/cxcore.h"
@@ -32,6 +34,10 @@
 #include "animation.h"
 #include "extrCalibration.h"
 
+#ifdef STEREO_DISABLED
+enum Camera {cameraLeft, cameraRight, cameraUnset};
+#endif
+
 #define HEAD_SIZE 21. // durchschnittliche Kopflaenge in cm (Kopf 21x14)
 #define AXIS_MARKERS_LENGTH 10
 
@@ -159,7 +165,7 @@ public:
     void playAll();
     int winSize(QPointF *pos=NULL, int pers=-1, int frame=-1, int level=-1);
     void updateImage(bool imageChanged = false);
-    void updateImage(const Mat &img);
+    void updateImage(const cv::Mat &img);
 //    void updateImage(IplImage *iplImg);
     void updateSequence();
 //    void calcBackground();

include/player.h

@@ -9,7 +9,11 @@
 #else
 #include "aviFileWriter.h"
 #endif
+#ifndef STEREO_DISABLED
 #include "cv.h"
+#else
+#include "opencv.hpp"
+#endif
 
 class QLabel;
 class QSlider;

include/stereoAviFile.h

-
+#ifndef STEREO_DISABLED
 #ifndef STEREOAVIFILE_H
 #define STEREOAVIFILE_H
 #undef UNICODE
@@ -117,3 +117,4 @@ private:
 };
 
 #endif // STEREOAVIFILE_H
+#endif // STEREO_DISABLED

include/stereoContext.h

@@ -41,10 +41,11 @@ public:
     void init(cv::Mat &viewImg);
 
     void preprocess();
-
+#ifndef STEREO_DISABLED
     IplImage *getRectified(enum Camera camera=cameraRight);
 
     IplImage *getDisparity(bool *dispNew = NULL);
+#endif
 
     // von person.cpp benoetigt, um frame nummer zu erhalten
     inline Animation *getAnimation()
@@ -124,13 +125,16 @@ protected:
 #endif
     BackgroundFilter   *mBackgroundFilterLeft;
     BackgroundFilter   *mBackgroundFilterRight;
+#ifndef STEREO_DISABLED
     IplImage           mRectLeft;
     IplImage           mRectRight;
     IplImage           mDisparity;
     CvStereoBMState   *mBMState;
+#endif
+
 #if CV_MAJOR_VERSION == 2
     cv::StereoSGBM    *mSgbm;
-#elif CV_MAJOR_VERSION == 3
+#elif CV_MAJOR_VERSION == 3 || CV_MAJOR_VERSION == 4
     cv::Ptr<cv::StereoSGBM>    mSgbm;
 #endif
     CvMat             *mBMdisparity16;

include/stereoItem.h

@@ -19,7 +19,9 @@ public:
     StereoItem(QWidget *wParent, QGraphicsItem * parent = NULL);
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
     void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
+#ifndef STEREO_DISABLED
     void updateData(IplImage *disp);
+#endif
     QRectF boundingRect() const;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
     void setDispNew(bool d = true);