Change from Electro-L N2 to Electro-L N3(GOMS3)

hvanruys · Mar 26, 2021 · 7b3256d · 7b3256d
1 parent 3b76ff2
commit 7b3256d
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ The Open Source program **EUMETCastView** allows you to view
 - AVHRR images from NOAA-19, Metop-A, Metop-B and Metop-C.
 - VIIRS images from SUOMI-NPP and NOAA-20.
 - OLCI EFR/ERR and SLSTR from Sentinel-3A
-- HRIT/LRIT images from Meteosat-11, Meteosat-10, Meteosat-8, Electro L2, FengYun 2H/2G, GOES-16, GOES-17 and Himawari-8.
+- HRIT/LRIT images from Meteosat-11, Meteosat-10, Meteosat-8, Electro L3, FengYun 2H/2G, GOES-16, GOES-17 and Himawari-8.
 - and MERSI from FY-3D
 
 More details are found on http://hvanruys.github.io

diff --git a/core/avhrrsatellite.cpp b/core/avhrrsatellite.cpp
@@ -1439,7 +1439,7 @@ void AVHRRSatellite::InsertToMap(QFileInfoList fileinfolist, QMap<QString, QFile
         //H-000-GOMS2_-GOMS2_4_____-_________-PRO______-201705181530-__
         //H-000-GOMS2_-GOMS2_4_____-00_9_077E-000001___-201705181530-C_
         //H-000-GOMS2_-GOMS2_4_____-_________-EPI______-201705181530-__
-        else if (fileinfo.fileName().mid( 0, 20) == "H-000-GOMS2_-GOMS2_4" && fileinfo.isFile()) //E1B-TPG-1
+        else if (fileinfo.fileName().mid( 0, 20) == "H-000-GOMS3_-GOMS3_4" && fileinfo.isFile()) //E1B-TPG-1
         {
             QDate d(fileinfo.fileName().mid( 46, 4).toInt(), fileinfo.fileName().mid( 50, 2).toInt(), fileinfo.fileName().mid( 52, 2).toInt());
             filedate.setDate(d);

diff --git a/core/formimage.cpp b/core/formimage.cpp
@@ -2248,7 +2248,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
                 memcpy(pixelsBlue + (sl->bisRSS ? i - 5 : i) * 464 * 3712, imageptrs->ptrBlue[i], 464 * 3712 * sizeof(quint16));
         }
     }
-    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOMS2)
+    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOMS3)
     {
         pixelsRed = new quint16[npix];
         pixelsGreen = new quint16[npix];
@@ -2346,7 +2346,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
                 memcpy(pixelsRed + (sl->bisRSS ? i - 5 : i) * 464 * 3712, imageptrs->ptrRed[i], 464 * 3712 * sizeof(quint16));
         }
     }
-    else if(sl->getKindofImage() == "VIS_IR" && sl->getGeoSatellite() == eGeoSatellite::GOMS2)
+    else if(sl->getKindofImage() == "VIS_IR" && sl->getGeoSatellite() == eGeoSatellite::GOMS3)
     {
         pixelsRed = new quint16[npix];
         for( int i = 0; i < 6 ; i++)
@@ -2401,7 +2401,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
         imageptrs->CLAHE(pixelsGreen, 3712, (sl->bisRSS ? 3*464 : 3712), 0, 1023, 16, 16, 256, opts.clahecliplimit);
         imageptrs->CLAHE(pixelsBlue, 3712, (sl->bisRSS ? 3*464 : 3712), 0, 1023, 16, 16, 256, opts.clahecliplimit);
     }
-    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOMS2)
+    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOMS3)
     {
         imageptrs->CLAHE(pixelsRed, 2784, 2784, 0, 1023, 16, 16, 256, opts.clahecliplimit);
         imageptrs->CLAHE(pixelsGreen, 2784, 2784, 0, 1023, 16, 16, 256, opts.clahecliplimit);
@@ -2451,7 +2451,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
             imageptrs->CLAHE(pixelsRed, 3712, (sl->bisRSS ? 3*464 : 3712), 0, 1023, 16, 16, 256, opts.clahecliplimit);
         else if(sl->getGeoSatellite() == eGeoSatellite::GOES_15)
             imageptrs->CLAHE(pixelsRed, 2816, 464*7, 0, 1023, 16, 16, 256, opts.clahecliplimit);
-        else if(sl->getGeoSatellite() == eGeoSatellite::GOMS2)
+        else if(sl->getGeoSatellite() == eGeoSatellite::GOMS3)
         {
             ret = imageptrs->CLAHE(pixelsRed, 2784, 464*6, 0, 1023, 16, 16, 256, opts.clahecliplimit);
         }
@@ -2533,7 +2533,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
         }
 
     }
-    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOMS2)
+    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOMS3)
     {
 
         for(int i = 0; i < 6; i++)
@@ -2637,7 +2637,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
                 }
             }
         }
-        else if(sl->getGeoSatellite() == eGeoSatellite::GOMS2)
+        else if(sl->getGeoSatellite() == eGeoSatellite::GOMS3)
         {
             for(int i = 0 ; i < 6; i++)
             {
@@ -3091,7 +3091,7 @@ void FormImage::recalculateCLAHE1(QVector<QString> spectrumvector, QVector<bool>
         }
 
     }
-    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOMS2)
+    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOMS3)
     {
 
         for(int i = 0; i < 6; i++)
@@ -3195,7 +3195,7 @@ void FormImage::recalculateCLAHE1(QVector<QString> spectrumvector, QVector<bool>
                 }
             }
         }
-        else if(sl->getGeoSatellite() == eGeoSatellite::GOMS2)
+        else if(sl->getGeoSatellite() == eGeoSatellite::GOMS3)
         {
             for(int i = 0 ; i < 6; i++)
             {

diff --git a/core/formtoolbox.cpp b/core/formtoolbox.cpp
@@ -2242,7 +2242,7 @@ void FormToolbox::on_btnGeoColor_clicked()
         ui->pbProgress->setMaximum(8+8+8);
     else if(geoindex == (int)eGeoSatellite::MET_10)
         ui->pbProgress->setMaximum(3+3+3);
-    else if(geoindex == (int)eGeoSatellite::GOMS2)
+    else if(geoindex == (int)eGeoSatellite::GOMS3)
         ui->pbProgress->setMaximum(6+6+6);
     else if(geoindex == (int)eGeoSatellite::FY2H || geoindex == (int)eGeoSatellite::FY2G )
         ui->pbProgress->setMaximum(100);
@@ -2369,7 +2369,7 @@ void FormToolbox::on_btnHRV_clicked()
             ui->pbProgress->setMaximum(0);
     }
 
-    if(geoindex == (int)eGeoSatellite::GOMS2)
+    if(geoindex == (int)eGeoSatellite::GOMS3)
     {
         if(ui->cmbHRVtype->currentIndex() == 0 && ui->chkColorHRV->isChecked() == false)
             ui->pbProgress->setMaximum(6);
@@ -2509,7 +2509,7 @@ void FormToolbox::onButtonColorHRV(QString type)
             inversevector[ui->comboGeo5->currentIndex()-1] = ui->chkInverseGeo5->isChecked();
         }
     }
-    else if (geoindex == (int)eGeoSatellite::GOMS2)
+    else if (geoindex == (int)eGeoSatellite::GOMS3)
     {
         if(ui->comboGeo1->currentIndex() > 0)
         {

diff --git a/core/globals.h b/core/globals.h
@@ -74,7 +74,7 @@ enum class eGeoSatellite {
     MET_10 = 1,
     MET_9 = 2,
     MET_8 = 3,
-    GOMS2 = 4,
+    GOMS3 = 4,
     FY2H = 5,
     FY2G = 6,
     GOES_15 = 7,

diff --git a/core/mainwindow.cpp b/core/mainwindow.cpp
@@ -393,7 +393,7 @@ void MainWindow::on_actionAbout_triggered()
     "<br>MERSI from FengYun 3D"
     "<br><br><b>Geostationary satellites :</b>"
     "<br>XRIT from Meteosat-11, Meteosat-10, Meteosat-8"
-    "<br>Electro L2, FengYun 2H, FengYun 2G"
+    "<br>Electro L3, FengYun 2H, FengYun 2G"
     "<br>GOES-16, GOES-17 and Himawari-8"
     "<ul>"
     "<li>Made by Hugo Van Ruyskensvelde.</li>"

diff --git a/core/options.cpp b/core/options.cpp
@@ -924,14 +924,14 @@ void Options::CreateGeoSatelliteIni()
     }
 
     //E1B-TPG-1
-    geosatellites[4].fullname = "Electro L2";
-    geosatellites[4].shortname = "GOMS2";
+    geosatellites[4].fullname = "Electro L3";
+    geosatellites[4].shortname = "GOMS3";
     geosatellites[4].longitude = 76.1;
     geosatellites[4].longitudelimit1 = 0.0;
     geosatellites[4].longitudelimit2 = 0.0;
     geosatellites[4].protocol = "XRIT";
     geosatellites[4].rss = false;
-    geosatellites[4].searchstring = "H-000-GOMS2_-GOMS2_4";
+    geosatellites[4].searchstring = "H-000-GOMS3_-GOMS3_4";
     geosatellites[4].indexsearchstring = 0;
     geosatellites[4].filepattern = "H-???-??????-?????????___-?????????-0?????___-%1-C_";
     geosatellites[4].imagewidth = 2784;

diff --git a/core/segmentlistgeostationary.cpp b/core/segmentlistgeostationary.cpp
@@ -159,8 +159,8 @@ eGeoSatellite SegmentListGeostationary::getGeoSatellite()
         return eGeoSatellite::MET_9;
     else if(str_GeoSatellite == "MET_8")
         return eGeoSatellite::MET_8;
-    else if(str_GeoSatellite == "GOMS2")
-        return eGeoSatellite::GOMS2;
+    else if(str_GeoSatellite == "GOMS3")
+        return eGeoSatellite::GOMS3;
     else if(str_GeoSatellite == "FY2H")
         return eGeoSatellite::FY2H;
     else if(str_GeoSatellite == "FY2G")
@@ -239,9 +239,9 @@ void SegmentListGeostationary::setGeoSatellite(int geoindex, QString strgeo)
     {
         this->m_GeoSatellite = eGeoSatellite::MET_8;
     }
-    else if(strgeo == "GOMS2")
+    else if(strgeo == "GOMS3")
     {
-        this->m_GeoSatellite = eGeoSatellite::GOMS2;
+        this->m_GeoSatellite = eGeoSatellite::GOMS3;
     }
     else if(strgeo == "FY2H")
     {
@@ -345,7 +345,7 @@ bool SegmentListGeostationary::ComposeImageXRIT(QFileInfo fileinfo, QVector<QStr
     {
         QtConcurrent::run(doComposeGeostationaryXRIT, this, fileinfo.filePath(), 0, spectrumvector, inversevector);
     }
-    else if(m_GeoSatellite == eGeoSatellite::MET_11 || m_GeoSatellite == eGeoSatellite::MET_10 || m_GeoSatellite == eGeoSatellite::MET_9 || m_GeoSatellite == eGeoSatellite::MET_8 || m_GeoSatellite == eGeoSatellite::GOMS2)
+    else if(m_GeoSatellite == eGeoSatellite::MET_11 || m_GeoSatellite == eGeoSatellite::MET_10 || m_GeoSatellite == eGeoSatellite::MET_9 || m_GeoSatellite == eGeoSatellite::MET_8 || m_GeoSatellite == eGeoSatellite::GOMS3)
     {
         if( spectrumvector.at(1) == "" && spectrumvector.at(2) == "")
         {
@@ -479,7 +479,7 @@ void SegmentListGeostationary::InsertPresent( QVector<QString> spectrumvector, Q
     qDebug() << QString("InsertPresent ; spectrum %1 %2 %3    filespectrum  %4  fileseq %5").arg(spectrumvector[0]).arg(spectrumvector[1]).arg(spectrumvector[2]).arg(filespectrum).arg(filesequence);
     if(m_GeoSatellite == eGeoSatellite::MET_11 || m_GeoSatellite == eGeoSatellite::MET_10 || m_GeoSatellite == eGeoSatellite::MET_9 ||
             m_GeoSatellite == eGeoSatellite::MET_8 || m_GeoSatellite == eGeoSatellite::H8 || m_GeoSatellite == eGeoSatellite::GOES_16 ||
-            m_GeoSatellite == eGeoSatellite::GOES_17 || m_GeoSatellite == eGeoSatellite::GOMS2)
+            m_GeoSatellite == eGeoSatellite::GOES_17 || m_GeoSatellite == eGeoSatellite::GOMS3)
     {
         if(spectrumvector.at(0) == filespectrum)
         {
@@ -2070,7 +2070,7 @@ void SegmentListGeostationary::ComposeVISIR()
 
     for (int line = opts.geosatellites[geoindex].maxsegments*nbroflinespersegment - 1; line >= 0; line--)
     {
-        if(m_GeoSatellite == eGeoSatellite::GOES_15 || m_GeoSatellite == eGeoSatellite::GOMS2)
+        if(m_GeoSatellite == eGeoSatellite::GOES_15 || m_GeoSatellite == eGeoSatellite::GOMS3)
             row_col = (QRgb*)imageptrs->ptrimageGeostationary->scanLine(line);
         else
             row_col = (QRgb*)imageptrs->ptrimageGeostationary->scanLine(opts.geosatellites[geoindex].maxsegments*nbroflinespersegment - 1 - line);
@@ -2154,7 +2154,7 @@ void SegmentListGeostationary::ComposeVISIR()
                     b = r;
                 }
             }
-            if(m_GeoSatellite == eGeoSatellite::GOES_15 || m_GeoSatellite == eGeoSatellite::GOMS2 )
+            if(m_GeoSatellite == eGeoSatellite::GOES_15 || m_GeoSatellite == eGeoSatellite::GOMS3 )
                 row_col[pixelx] = qRgb(r,g,b);
             else
                 row_col[opts.geosatellites[geoindex].imagewidth - 1 - pixelx] = qRgb(r,g,b);
@@ -2575,7 +2575,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
                 }
             }
         }
-        else if(m_GeoSatellite == eGeoSatellite::GOMS2)
+        else if(m_GeoSatellite == eGeoSatellite::GOMS3)
         {
             for(int i = 0 ; i < 6; i++)
             {
@@ -2610,7 +2610,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
                     pbCounter++;
             }
         }
-        else if(m_GeoSatellite == eGeoSatellite::GOMS2)
+        else if(m_GeoSatellite == eGeoSatellite::GOMS3)
         {
             for(int i = 0; i < 6; i++)
             {
@@ -2701,7 +2701,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
                 if (isPresentBlue[i] && issegmentcomposedBlue[i] == false)
                     return false;
             }
-        } else if(m_GeoSatellite == eGeoSatellite::GOMS2)
+        } else if(m_GeoSatellite == eGeoSatellite::GOMS3)
         {
             for(int i = 0 ; i < 6; i++)
             {
@@ -2744,7 +2744,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
                     return false;
             }
         }
-        else if(m_GeoSatellite == eGeoSatellite::GOMS2)
+        else if(m_GeoSatellite == eGeoSatellite::GOMS3)
         {
             for(int i = 0; i < 6; i++)
             {