Merge pull request #102 from Digitelektro/bugfix/issue_100

Bugfix/issue 100

Author: Digitelektro

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

@@ -183,7 +183,7 @@ 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();
@@ -199,6 +199,7 @@ 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");
 

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:

main.cpp

@@ -409,6 +409,7 @@ int main(int argc, char* argv[]) {
         oss << std::setfill('0') << std::setw(2) << passStart.Day() << "/" << std::setw(2) << passStart.Month() << "/" << passStart.Year() << " " << std::setw(2) << passStart.Hour() << ":" << std::setw(2) << passStart.Minute() << ":"
             << std::setw(2) << passStart.Second() << " UTC";
         std::string dateStr = oss.str();
+        std::string satelliteName = decoder::protocol::lrpt::Decoder::serialNumberToSatName(mLrptDecoder.getSerialNumber());
 
 
         ProjectImage rectifier(ProjectImage::Projection::Rectify, calc, mSettings.getProjectionScale());
@@ -436,23 +437,23 @@ int main(int argc, char* argv[]) {
 
             if(mSettings.spreadImage()) {
                 cv::Mat spreaded = rectifier.project(img.image);
-                ThreatImage::drawWatermark(spreaded, dateStr);
+                ThreatImage::drawWatermark(spreaded, dateStr, satelliteName);
                 const std::string filePath = mSettings.getOutputPath() + std::string("spread_") + fileName;
                 std::cout << "Saving " << filePath << std::endl;
                 saveImage(filePath, spreaded);
             }
 
             if(mSettings.mercatorProjection()) {
                 cv::Mat mercator = mercatorProjector.project(img.image);
-                ThreatImage::drawWatermark(mercator, dateStr);
+                ThreatImage::drawWatermark(mercator, dateStr, satelliteName);
                 const std::string filePath = mSettings.getOutputPath() + std::string("mercator_") + fileName;
                 std::cout << "Saving " << filePath << std::endl;
                 saveImage(filePath, mercator);
             }
 
             if(mSettings.equadistantProjection()) {
                 cv::Mat equidistant = equdistantProjector.project(img.image);
-                ThreatImage::drawWatermark(equidistant, dateStr);
+                ThreatImage::drawWatermark(equidistant, dateStr, satelliteName);
                 const std::string filePath = mSettings.getOutputPath() + std::string("equidistant_") + fileName;
                 std::cout << "Saving " << filePath << std::endl;
                 saveImage(filePath, equidistant);

resources/settings.ini

@@ -64,8 +64,8 @@ Color=#AD880C
 Size=80
 # Font line width in pixels
 Width=3
-;Text options: use '%date%' for date, %version% for current version of meteordemod '\n' for new line
-Text=MeteorDemod %version% by Digitelektro\nMETEOR M2-3\n%date%
+;Text options: use '%date%' for date %sat% for satellite name, %version% for current version of meteordemod '\n' for new line
+Text=MeteorDemod %version% by Digitelektro\n%sat%\n%date%
 
 [ReceiverLocation]
 Draw=true