Merge pull request #38 from Digitelektro/beta

Beta
Digitelektro · Sep 28, 2022 · 3c33000 · 3c33000
2 parents 71ded81 + 8d1c852
commit 3c33000
Show file tree

Hide file tree

Showing 15 changed files with 169 additions and 366 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,10 +149,11 @@ if(UNIX AND NOT APPLE)
         SET(CPACK_GENERATOR "DEB")
         SET(CPACK_PACKAGE_VERSION_MAJOR "2")
         SET(CPACK_PACKAGE_VERSION_MINOR "3")
-        SET(CPACK_PACKAGE_VERSION_PATCH "0")
+        SET(CPACK_PACKAGE_VERSION_PATCH "1")
         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")
+		SET(CPACK_DEBIAN_PACKAGE_DEPENDS "python3-opencv")
         INCLUDE(CPack)
     endif()
 endif()
diff --git a/GIS/shapereader.h b/GIS/shapereader.h
@@ -5,6 +5,7 @@
 #include <iostream>
 #include <vector>
 #include <iterator>
+#include <memory>
 #include "databuffer.h"
 #include "dbfilereader.h"
 
@@ -373,24 +374,24 @@ class ShapeReader
         }
     }
 
-    RecordIterator *getRecordIterator() {
+    std::unique_ptr<RecordIterator> getRecordIterator() {
         if(mLoaded) {
-            return new RecordIterator(mBinaryData);
+            return std::unique_ptr<RecordIterator>(new RecordIterator(mBinaryData));
         }
-        return nullptr;
+        return std::unique_ptr<RecordIterator>(nullptr);
     }
-    PolyLineIterator *getPolyLineIterator(const RecordIterator &recordIterator) {
+    std::unique_ptr<PolyLineIterator> getPolyLineIterator(const RecordIterator &recordIterator) {
         if(mLoaded) {
-            return new PolyLineIterator(mBinaryData, recordIterator.mRecordPosition);
+            return std::unique_ptr<PolyLineIterator>(new PolyLineIterator(mBinaryData, recordIterator.mRecordPosition));
         }
-        return nullptr;
+        return std::unique_ptr<PolyLineIterator>(nullptr);
     }
 
-    MultiPointIterator *getMultiPointIterator(const RecordIterator &recordIterator) {
+    std::unique_ptr<MultiPointIterator> getMultiPointIterator(const RecordIterator &recordIterator) {
         if(mLoaded) {
-            return new MultiPointIterator(mBinaryData, recordIterator.mRecordPosition);
+            return std::unique_ptr<MultiPointIterator>(new MultiPointIterator(mBinaryData, recordIterator.mRecordPosition));
         }
-        return nullptr;
+        return std::unique_ptr<MultiPointIterator>(nullptr);
     }
 
     const DbFileReader &getDbFilereader() const {

diff --git a/GIS/shaperenderer.cpp b/GIS/shaperenderer.cpp
@@ -1,6 +1,6 @@
 #include "shaperenderer.h"
-#include <vector>
 #include "pixelgeolocationcalculator.h"
+#include <vector>
 
 
 GIS::ShapeRenderer::ShapeRenderer(const std::string shapeFile, const cv::Scalar &color, int earthRadius, int altitude)
@@ -32,11 +32,11 @@ void GIS::ShapeRenderer::drawShapeMercator(cv::Mat &src, float xStart, float ySt
     }
 
     if(getShapeType() == ShapeReader::ShapeType::stPolyline) {
-        ShapeReader::RecordIterator *recordIterator = getRecordIterator();
+        auto recordIterator = getRecordIterator();
 
         if(recordIterator) {
             for(recordIterator->begin(); *recordIterator != recordIterator->end(); ++(*recordIterator)) {
-                ShapeReader::PolyLineIterator *polyLineIterator = getPolyLineIterator(*recordIterator);
+                auto polyLineIterator = getPolyLineIterator(*recordIterator);
 
                 if(polyLineIterator) {
                     std::vector<cv::Point> polyLines;
@@ -54,15 +54,11 @@ void GIS::ShapeRenderer::drawShapeMercator(cv::Mat &src, float xStart, float ySt
                     if(polyLines.size() > 1) {
                         cv::polylines(src, polyLines, false, mColor, mThicknes);
                     }
-
-                    delete polyLineIterator;
                 }
             }
-
-            delete recordIterator;
         }
     } else if(getShapeType() == ShapeReader::ShapeType::stPoint) {
-        ShapeReader::RecordIterator *recordIterator = getRecordIterator();
+        auto recordIterator = getRecordIterator();
 
         if(mfilter.size() == 0) {
             if(recordIterator) {
@@ -135,11 +131,11 @@ void GIS::ShapeRenderer::drawShapeEquidistant(cv::Mat &src, float xStart, float
     }
 
     if(getShapeType() == ShapeReader::ShapeType::stPolyline) {
-        ShapeReader::RecordIterator *recordIterator = getRecordIterator();
+        auto recordIterator = getRecordIterator();
 
         if(recordIterator) {
             for(recordIterator->begin(); *recordIterator != recordIterator->end(); ++(*recordIterator)) {
-                ShapeReader::PolyLineIterator *polyLineIterator = getPolyLineIterator(*recordIterator);
+                auto polyLineIterator = getPolyLineIterator(*recordIterator);
 
                 if(polyLineIterator) {
                     std::vector<cv::Point> polyLines;
@@ -159,15 +155,11 @@ void GIS::ShapeRenderer::drawShapeEquidistant(cv::Mat &src, float xStart, float
                     if(polyLines.size() > 1) {
                         cv::polylines(src, polyLines, false, mColor, mThicknes);
                     }
-
-                    delete polyLineIterator;
                 }
             }
-
-            delete recordIterator;
         }
     } else if(getShapeType() == ShapeReader::ShapeType::stPoint) {
-        ShapeReader::RecordIterator *recordIterator = getRecordIterator();
+        auto recordIterator = getRecordIterator();
 
         if(mfilter.size() == 0) {
             if(recordIterator) {

diff --git a/common/settings.cpp b/common/settings.cpp
@@ -57,8 +57,10 @@ void Settings::parseIni(const std::string &path)
     ini::extract(mIniParser.sections["Program"]["SpreadImage"], mSpreadImage, true);
     ini::extract(mIniParser.sections["Program"]["AddRainOverlay"], mAddRainOverlay, true);
     ini::extract(mIniParser.sections["Program"]["JpgQuality"], mJpegQuality, 90);
-    ini::extract(mIniParser.sections["Program"]["AlfaM2"], mAlfaM2, 110.8f);
-    ini::extract(mIniParser.sections["Program"]["DeltaM2"], DeltaM2, -3.2f);
+    ini::extract(mIniParser.sections["Program"]["ScanAngleM2"], mScanAngleM2, 110.8f);
+    ini::extract(mIniParser.sections["Program"]["RollM2"], mM2Roll, -2.9f);
+    ini::extract(mIniParser.sections["Program"]["PitchM2"], mM2Pitch, 0.3f);
+    ini::extract(mIniParser.sections["Program"]["YawM2"], mM2Yaw, 0.0f);
     ini::extract(mIniParser.sections["Program"]["NightPassTreshold"], mNightPassTreshold, 10.0f);
 
     ini::extract(mIniParser.sections["Demodulator"]["CostasBandwidth"], mCostasBw, 50);

diff --git a/common/settings.h b/common/settings.h
@@ -104,8 +104,10 @@ class Settings
     bool getBrokenM2Modulation() const;
 
     int getJpegQuality() const { return mJpegQuality; }
-    float getM2Alfa() const { return mAlfaM2; }
-    float getM2Delta() const { return DeltaM2; }
+    float getM2ScanAngle() const { return mScanAngleM2; }
+    float getM2Roll() const { return mM2Roll; }
+    float getM2Pitch() const { return mM2Pitch; }
+    float getM2Yaw() const { return mM2Yaw; }
     bool equadistantProjection() const { return mEquidistantProjection; }
     bool mercatorProjection() const { return mMercatorProjection; }
     bool spreadImage() const { return mSpreadImage; }
@@ -159,8 +161,10 @@ class Settings
 
     //ini section: Program
     int mJpegQuality;
-    float mAlfaM2;
-    float DeltaM2;
+    float mScanAngleM2;
+    float mM2Roll;
+    float mM2Pitch;
+    float mM2Yaw;
     bool mEquidistantProjection;
     bool mMercatorProjection;
     bool mSpreadImage;

diff --git a/common/version.h b/common/version.h
@@ -3,6 +3,6 @@
 
 #define VERSION_MAJOR 2
 #define VERSION_MINOR 3
-#define VERSION_FIX 0
+#define VERSION_FIX 1
 
 #endif // VERSION_H