Merge pull request #84 from Digitelektro/bugfix/file_naming

Bugfix/file naming

Author: Digitelektro

CMakeLists.txt

@@ -152,7 +152,7 @@ if(UNIX AND NOT APPLE)
         SET(CPACK_GENERATOR "DEB")
         SET(CPACK_PACKAGE_VERSION_MAJOR "2")
         SET(CPACK_PACKAGE_VERSION_MINOR "5")
-        SET(CPACK_PACKAGE_VERSION_PATCH "5")
+        SET(CPACK_PACKAGE_VERSION_PATCH "6")
         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/settings.cpp

@@ -79,7 +79,7 @@ void Settings::parseIni(const std::string& path) {
     ini::extract(mIniParser.sections["Program"]["CompositeProjectionScale"], mCompositeProjectionScale, 0.75f);
     ini::extract(mIniParser.sections["Program"]["CompositeAzimuthalEquidistantProjection"], mCompositeEquadistantProjection, true);
     ini::extract(mIniParser.sections["Program"]["CompositeMercatorProjection"], mCompositeMercatorProjection, false);
-    ini::extract(mIniParser.sections["Program"]["GenerateComposite123"], mGenerateComposite123, true);
+    ini::extract(mIniParser.sections["Program"]["GenerateComposite321"], mGenerateComposite321, true);
     ini::extract(mIniParser.sections["Program"]["GenerateComposite125"], mGenerateComposite125, true);
     ini::extract(mIniParser.sections["Program"]["GenerateComposite221"], mGenerateComposite221, true);
     ini::extract(mIniParser.sections["Program"]["GenerateComposite68"], mGenerateComposite68, true);

common/settings.h

@@ -164,8 +164,8 @@ class Settings {
     bool compositeMercatorProjection() const {
         return mCompositeMercatorProjection;
     }
-    bool generateComposite123() const {
-        return mGenerateComposite123;
+    bool generateComposite321() const {
+        return mGenerateComposite321;
     }
     bool generateComposite125() const {
         return mGenerateComposite125;
@@ -310,7 +310,7 @@ class Settings {
 
     bool mCompositeEquadistantProjection;
     bool mCompositeMercatorProjection;
-    bool mGenerateComposite123;
+    bool mGenerateComposite321;
     bool mGenerateComposite125;
     bool mGenerateComposite221;
     bool mGenerateComposite68;

common/version.h

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

main.cpp

@@ -330,32 +330,32 @@ int main(int argc, char* argv[]) {
     std::stringstream compositeFileNameDateSS;
     compositeFileNameDateSS << std::put_time(std::localtime(&now), "%Y-%m-%d-%H-%M-%S");
 
-    if(mSettings.generateComposite123()) {
-        std::list<cv::Mat> images123;
-        std::list<PixelGeolocationCalculator> geolocationCalculators123;
-        searchForImages(images123, geolocationCalculators123, "123");
+    if(mSettings.generateComposite321()) {
+        std::list<cv::Mat> images321;
+        std::list<PixelGeolocationCalculator> geolocationCalculators321;
+        searchForImages(images321, geolocationCalculators321, "321");
 
-        if(images123.size() > 1 && images123.size() == geolocationCalculators123.size()) {
+        if(images321.size() > 1 && images321.size() == geolocationCalculators321.size()) {
             if(mSettings.compositeEquadistantProjection() || mSettings.compositeMercatorProjection()) {
-                for(auto& img : images123) {
+                for(auto& img : images321) {
                     img = ThreatImage::sharpen(img);
                 }
             }
 
             SpreadImage spreadImage;
             if(mSettings.compositeEquadistantProjection()) {
-                cv::Mat composite = spreadImage.equidistantProjection(images123, geolocationCalculators123, mSettings.getCompositeProjectionScale(), [](float progress) {
-                    std::cout << "Generate equidistant channel 123 composite image " << (int)progress << "% \t\t\r" << std::flush;
+                cv::Mat composite = spreadImage.equidistantProjection(images321, geolocationCalculators321, mSettings.getCompositeProjectionScale(), [](float progress) {
+                    std::cout << "Generate equidistant channel 321 composite image " << (int)progress << "% \t\t\r" << std::flush;
                 });
                 std::cout << std::endl;
-                saveImage(mSettings.getOutputPath() + "equidistant_" + compositeFileNameDateSS.str() + "_123_composite.jpg", composite);
+                saveImage(mSettings.getOutputPath() + "equidistant_" + compositeFileNameDateSS.str() + "_321_composite.jpg", composite);
             }
             if(mSettings.compositeMercatorProjection()) {
-                cv::Mat composite = spreadImage.mercatorProjection(images123, geolocationCalculators123, mSettings.getCompositeProjectionScale(), [](float progress) {
-                    std::cout << "Generate mercator channel 123 composite image " << (int)progress << "% \t\t\r" << std::flush;
+                cv::Mat composite = spreadImage.mercatorProjection(images321, geolocationCalculators321, mSettings.getCompositeProjectionScale(), [](float progress) {
+                    std::cout << "Generate mercator channel 321 composite image " << (int)progress << "% \t\t\r" << std::flush;
                 });
                 std::cout << std::endl;
-                saveImage(mSettings.getOutputPath() + "mercator_" + compositeFileNameDateSS.str() + "_123_composite.jpg", composite);
+                saveImage(mSettings.getOutputPath() + "mercator_" + compositeFileNameDateSS.str() + "_321_composite.jpg", composite);
             }
         }
     }

resources/settings.ini

@@ -10,7 +10,7 @@ ProjectionScale=0.75
 CompositeProjectionScale=0.7
 CompositeAzimuthalEquidistantProjection=true
 CompositeMercatorProjection=false
-GenerateComposite123=true
+GenerateComposite321=true
 GenerateComposite125=true
 GenerateComposite221=true
 GenerateComposite68=true