Merge pull request #48 from Digitelektro/develop

Develop

Author: Digitelektro

CMakeLists.txt

@@ -151,7 +151,7 @@ if(UNIX AND NOT APPLE)
         SET(CPACK_GENERATOR "DEB")
         SET(CPACK_PACKAGE_VERSION_MAJOR "2")
         SET(CPACK_PACKAGE_VERSION_MINOR "4")
-        SET(CPACK_PACKAGE_VERSION_PATCH "3")
+        SET(CPACK_PACKAGE_VERSION_PATCH "4")
         SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Digitelektro")
         SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/Digitelektro/MeteorDemod")
         SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Russian Meteor M2 weather satellite data decoder")

common/version.h

@@ -3,6 +3,6 @@
 
 #define VERSION_MAJOR 2
 #define VERSION_MINOR 4
-#define VERSION_FIX 3
+#define VERSION_FIX 4
 
 #endif // VERSION_H

imageproc/threatimage.cpp

@@ -79,7 +79,25 @@ cv::Mat ThreatImage::irToRain(const cv::Mat &irImage, const cv::Mat &ref)
         }
     }
 
-    return rainImage;
+    cv::Mat result = cv::Mat::zeros(irImage.size(), irImage.type());
+    cv::Mat grayScale;
+    cv::Mat alpha;
+
+    cv::cvtColor(irImage, grayScale, cv::COLOR_BGR2GRAY);
+    std::vector<std::vector<cv::Point> > contours;
+    cv::findContours(grayScale, contours, cv::RETR_TREE, cv::CHAIN_APPROX_SIMPLE);
+    for (std::size_t i = 0; i < contours.size(); i++) {
+        cv::drawContours(grayScale, contours, i, cv::Scalar(255, 255, 255), -1);
+    }
+
+    //create alpha mask
+    cv::threshold(grayScale, alpha, 0, 255, cv::THRESH_BINARY);
+
+    //apply mask
+    cv::bitwise_and(rainImage, rainImage, result, alpha);
+
+
+    return result;
 }
 
 cv::Mat ThreatImage::invertIR(const cv::Mat &image)

main.cpp

@@ -649,14 +649,14 @@ void searchForImages(std::list<cv::Mat> &imagesOut, std::list<PixelGeolocationCa
                 fs::path fileJPG(folder + "/" + fileNameBase + "_" + channelName + ".jpg");
 
                 if(fs::exists(fileJPG)) {
-                    map[cftime] = std::make_tuple(entry.path().generic_string(), fileJPG);
+                    map[cftime] = std::make_tuple(entry.path().generic_string(), fileJPG.generic_string());
                     break;
                 }
 
                 fs::path fileBMP(folder + "/" + fileNameBase + "_" + channelName + ".bmp");
 
                 if(fs::exists(fileBMP)) {
-                    map[cftime] = std::make_tuple(entry.path().generic_string(), fileBMP);
+                    map[cftime] = std::make_tuple(entry.path().generic_string(), fileBMP.generic_string());
 
                     break;
                 }