Img_processing: arange defines and includes order

Author: TziporaGoldshmidt

img_processing/data.json

@@ -1,17 +1,12 @@
 [
     {
-        "path": "../tests/images/road.mov",
+        "path": "C:/Users/user1/Desktop/day/sun/sun_in_street.mov",
         "focal_length": 1500,
         "is_travel": true
     },
     {
-        "path": "../tests/images/close_cars.mov",
+        "path": "C:/Users/user1/Desktop/day/close_cars/road.mov",
         "focal_length": 2000,
         "is_travel": true
-    },
-    {
-        "path": "../tests/images/sun_in_street.mov",
-        "focal_length": 1000,
-        "is_travel": true
     }
-]
+]

img_processing/include/sun_detector.h

@@ -7,6 +7,7 @@ class SunDetector {
    public:
     void detectSun(const std::shared_ptr<cv::Mat> &frame);
     void drowSun(std::shared_ptr<cv::Mat> &frame);
+    bool isSunDetected() const;
 
    private:
     cv::Point2f center;

img_processing/src/manager.cpp

@@ -49,7 +49,6 @@ void Manager::mainDemo()
     int focalLength;
     bool isTravel;
     // Open the JSON file
-    // Open the JSON file
     std::ifstream file("../data.json");
 
     if (!file.is_open()) {

img_processing/src/sun_detector.cpp

@@ -72,3 +72,8 @@ void SunDetector::drowSun(std::shared_ptr<cv::Mat> &frame)
         circle(*frame, center, static_cast<int>(radius), Scalar(0, 255, 0), 2);
     }
 }
+
+bool SunDetector::isSunDetected() const
+{
+    return isSun;
+}

img_processing/tests/images/no_sun.png

@@ -7,31 +7,26 @@ using namespace cv;
 
 TEST(SunDetectorTest, detectSun)
 {
-    VideoCapture capture("../tests/images/sun_in_street.mov");
-
-    if (!capture.isOpened()) {
-        // LogManager::logErrorMessage(ErrorType::VIDEO_ERROR, "video not found");
-        // throw runtime_error("video not found");
-        cout << "couldn't open video" << endl;
+    Mat img = imread("sun.png");
+    SunDetector sd;
+    if (img.empty()) {
+        cout << "error open img" << endl;
         return;
     }
-    Mat img;
-    SunDetector sd;
-    while (1) {
-        capture >> img;
+    shared_ptr<Mat> frame = make_shared<Mat>(img);
+    sd.detectSun(frame);
+    EXPECT_TRUE(sd.isSunDetected());
+}
 
-        if (img.empty()) {
-            // LogManager::logInfoMessage(InfoType::MEDIA_FINISH);
-            cout << "media finish" << endl;
-            break;
-        }
-        shared_ptr<Mat> frame = make_shared<Mat>(img);
-        sd.detectSun(frame);
-        sd.drowSun(frame);
-        imshow("sun", *frame);
-        int key = waitKey(1);
-        if (key == 27) {
-            break;
-        }
+TEST(SunDetectorTest, noSun)
+{
+    Mat img = imread("no_sun.png");
+    SunDetector sd;
+    if (img.empty()) {
+        cout << "error open img" << endl;
+        return;
     }
+    shared_ptr<Mat> frame = make_shared<Mat>(img);
+    sd.detectSun(frame);
+    EXPECT_FALSE(sd.isSunDetected());
 }