Merge pull request #103 from Digitelektro/develop

Develop

Author: Digitelektro

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
 include(ExternalProject)
 
 project(meteordemod
-    VERSION 2.6.3
+    VERSION 2.6.5
     LANGUAGES CXX
 )
 

common/settings.h

@@ -58,6 +58,15 @@ class Settings {
         uint8_t B;
     };
 
+    struct ProjectionSetting {
+        std::string satelliteNameInTLE;
+        float scanAngle;
+        float yaw;
+        float pitch;
+        float roll;
+        float timeOffsetMs;
+    };
+
     friend std::istream& operator>>(std::istream& is, HTMLColor& color) {
         std::string rgb;
         is >> rgb;
@@ -105,35 +114,15 @@ class Settings {
         return mJpegQuality;
     }
 
-    std::string getSatNameInTLE() {
-        std::string name;
-        ini::extract(mIniParser.sections[getSateliteName()]["SatNameInTLE"], name);
-        return name;
-    }
-    float getScanAngle() {
-        float angle;
-        ini::extract(mIniParser.sections[getSateliteName()]["ScanAngle"], angle, 110.8f);
-        return angle;
-    }
-    float getRoll() {
-        float roll;
-        ini::extract(mIniParser.sections[getSateliteName()]["Roll"], roll, 0.0f);
-        return roll;
-    }
-    float getPitch() {
-        float pitch;
-        ini::extract(mIniParser.sections[getSateliteName()]["Pitch"], pitch, 0.0f);
-        return pitch;
-    }
-    float getYaw() {
-        float yaw;
-        ini::extract(mIniParser.sections[getSateliteName()]["Yaw"], yaw, 0.0f);
-        return yaw;
-    }
-    float getTimeOffsetMs() {
-        float timeOffset;
-        ini::extract(mIniParser.sections[getSateliteName()]["TimeOffset"], timeOffset, 0.0f);
-        return timeOffset;
+    ProjectionSetting getProjectionSetting(const std::string& satellite) {
+        ProjectionSetting result;
+        ini::extract(mIniParser.sections[satellite]["SatNameInTLE"], result.satelliteNameInTLE);
+        ini::extract(mIniParser.sections[satellite]["ScanAngle"], result.scanAngle, 110.8f);
+        ini::extract(mIniParser.sections[satellite]["Roll"], result.roll, 0.0f);
+        ini::extract(mIniParser.sections[satellite]["Pitch"], result.pitch, 0.0f);
+        ini::extract(mIniParser.sections[satellite]["Yaw"], result.yaw, 0.0f);
+        ini::extract(mIniParser.sections[satellite]["TimeOffset"], result.timeOffsetMs, 0.0f);
+        return result;
     }
 
     bool equadistantProjection() const {

decoder/protocol/lrpt/decoder.cpp

@@ -9,6 +9,28 @@ namespace decoder {
 namespace protocol {
 namespace lrpt {
 
+std::string Decoder::serialNumberToSatName(uint8_t serialNumber) {
+    switch(serialNumber) {
+        case 1:
+            return "METEOR M2-1";
+            break;
+        case 2:
+            return "METEOR M2-2";
+            break;
+        case 3:
+            return "METEOR M2-3";
+            break;
+        case 4:
+            return "METEOR M2-4";
+            break;
+        case 5:
+            return "METEOR M2-5";
+            break;
+        default:
+            return "METEOR M2";
+    }
+}
+
 void Decoder::process(const uint8_t* cadu) {
     VCDU vcdu(cadu);
 
@@ -106,6 +128,10 @@ void Decoder::parse70(const CCSDS& ccsds) {
     uint16_t s = ccsds.packetData()[18];
     uint16_t ms = static_cast<uint32_t>(ccsds.packetData()[19]) * 4;
 
+    mSerialNumber = ccsds.packetData()[20] >> 4;
+
+    // std::cout << "Serial number : " << (int)mSerialNumber << std::endl;
+
     mLastTimeStamp = TimeSpan(0, h, m, s, ms * 1000);
     mLastHeightAtTimeStamp = getLastY();
     if(mFirstTime) {

decoder/protocol/lrpt/decoder.h

@@ -15,6 +15,9 @@ namespace lrpt {
 
 // http://planet.iitp.ru/retro/index.php?lang=en&page_type=spacecraft&page=meteor_m_n2_structure_2
 class Decoder : public msumr::Image {
+  public:
+    static std::string serialNumberToSatName(uint8_t serialNumber);
+
   public:
     void process(const uint8_t* cadu);
 
@@ -34,6 +37,10 @@ class Decoder : public msumr::Image {
         return mLastTimeStamp.Add(missingTime);
     }
 
+    uint8_t getSerialNumber() const {
+        return mSerialNumber;
+    }
+
   private:
     uint16_t parsePartial(const uint8_t* data, uint32_t length);
     void processPacket(const CCSDS& ccsds);
@@ -50,6 +57,7 @@ class Decoder : public msumr::Image {
     int mFirstHeightAtTimeStamp = 0;
     int mLastHeightAtTimeStamp = 0;
     bool mFirstTime = true;
+    uint8_t mSerialNumber = 0;
 
   private:
     static constexpr uint8_t cVCIDAVHRR = 5;

imageproc/threatimage.cpp

@@ -4,6 +4,7 @@
 #include <opencv2/imgcodecs.hpp>
 
 #include "settings.h"
+#include "version.h"
 
 std::map<std::string, ThreatImage::WatermarkPosition> ThreatImage::WatermarkPositionLookup{
     {"top_left", WatermarkPosition::TOP_LEFT},
@@ -182,13 +183,14 @@ cv::Mat ThreatImage::contrast(const cv::Mat& image, double contrast, double brig
     return result;
 }
 
-void ThreatImage::drawWatermark(cv::Mat image, const std::string& date) {
+void ThreatImage::drawWatermark(cv::Mat image, const std::string& date, const std::string& satelliteName) {
     int x = 0;
     int y = 0;
     Settings& settings = Settings::getInstance();
     double fontScale = cv::getFontScaleFromHeight(cv::FONT_ITALIC, settings.getWaterMarkSize() * settings.getProjectionScale(), settings.getWaterMarkLineWidth());
 
     std::string watermarkText = settings.getWaterMarkText();
+    const std::string versionStr = std::to_string(VERSION_MAJOR) + "." + std::to_string(VERSION_MINOR) + "." + std::to_string(VERSION_FIX);
 
     WatermarkPosition position = TOP_CENTER;
     auto itr = WatermarkPositionLookup.find(settings.getWaterMarkPlace());
@@ -197,6 +199,8 @@ void ThreatImage::drawWatermark(cv::Mat image, const std::string& date) {
     }
 
     replaceAll(watermarkText, "%date%", date);
+    replaceAll(watermarkText, "%sat%", satelliteName);
+    replaceAll(watermarkText, "%version%", versionStr);
     replaceAll(watermarkText, "\\n", "\n");
 
     size_t lineCount = std::count(watermarkText.begin(), watermarkText.end(), '\n') + 1;

imageproc/threatimage.h

@@ -21,7 +21,7 @@ class ThreatImage {
 
     // Constrast 0.0-inf, brightnes -225 to 255
     static cv::Mat contrast(const cv::Mat& image, double contrast, double brightness);
-    static void drawWatermark(cv::Mat image, const std::string& date);
+    static void drawWatermark(cv::Mat image, const std::string& date, const std::string& satelliteName);
     static bool isNightPass(const cv::Mat& image, float treshold);
 
   private: