Skip to content

Commit

Permalink
Change from FY2E to FY2H
Browse files Browse the repository at this point in the history
  • Loading branch information
@hvanruys
hvanruys committed Jun 15, 2019
1 parent 5a3f2ca commit 1a1f80c
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion core/avhrrsatellite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,7 @@ void AVHRRSatellite::InsertToMap(QFileInfoList fileinfolist, QMap<QString, QFile
}
//0123456789012345678901234567890123456789012345678901234567890
//Z_SATE_C_BABJ_20150624130000_O_FY2G_FDI_IR1_001_NOM.HDF.gz
else if (fileinfo.fileName().mid( 0, 14) == "Z_SATE_C_BABJ_" && fileinfo.fileName().mid( 31, 8) == "FY2E_FDI" && fileinfo.isFile()) // Data Channel 12
else if (fileinfo.fileName().mid( 0, 14) == "Z_SATE_C_BABJ_" && fileinfo.fileName().mid( 31, 8) == "FY2H_FDI" && fileinfo.isFile()) // Data Channel 12
{
QDate d(fileinfo.fileName().mid( 14, 4).toInt(), fileinfo.fileName().mid( 18, 2).toInt(), fileinfo.fileName().mid( 20, 2).toInt());
filedate.setDate(d);
Expand Down
12 changes: 6 additions & 6 deletions core/formgeostationary.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -730,20 +730,20 @@ void FormGeostationary::CreateGeoImageHDF(SegmentListGeostationary *sl, QString
filedate = tex.mid(0, 4) + tex.mid(5, 2) + tex.mid(8, 2);


if(whichgeo == eGeoSatellite::FY2E && (type == "VIS_IR" || type == "VIS_IR Color"))
if(whichgeo == eGeoSatellite::FY2H && (type == "VIS_IR" || type == "VIS_IR Color"))
{
filepatterngz = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2E_FDI_???") + QString("_001_NOM.HDF.gz");
filepattern = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2E_FDI_???") + QString("_001_NOM.HDF");
filepatterngz = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2H_FDI_???") + QString("_001_NOM.HDF.gz");
filepattern = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2H_FDI_???") + QString("_001_NOM.HDF");
}
else if(whichgeo == eGeoSatellite::FY2G && (type == "VIS_IR" || type == "VIS_IR Color"))
{
filepatterngz = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2G_FDI_???") + QString("_001_NOM.HDF.gz");
filepattern = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2G_FDI_???") + QString("_001_NOM.HDF");
}
else if(whichgeo == eGeoSatellite::FY2E && type == "HRV")
else if(whichgeo == eGeoSatellite::FY2H && type == "HRV")
{
filepatterngz = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2E_FDI_VIS1KM") + QString("_001_NOM.HDF.gz");
filepattern = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2E_FDI_VIS1KM") + QString("_001_NOM.HDF");
filepatterngz = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2H_FDI_VIS1KM") + QString("_001_NOM.HDF.gz");
filepattern = QString("Z_SATE_C_BABJ_") + filetiming + QString("_O_FY2H_FDI_VIS1KM") + QString("_001_NOM.HDF");
}
else if(whichgeo == eGeoSatellite::FY2G && type == "HRV")
{
Expand Down
20 changes: 10 additions & 10 deletions core/formimage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
}
}
}
else if(sl->getKindofImage() == "HRV" && (sl->getGeoSatellite() == eGeoSatellite::FY2E || sl->getGeoSatellite() == eGeoSatellite::FY2G ))
else if(sl->getKindofImage() == "HRV" && (sl->getGeoSatellite() == eGeoSatellite::FY2H || sl->getGeoSatellite() == eGeoSatellite::FY2G ))
{
pixelsHRV = new quint16[npixHRV];
memcpy(pixelsHRV, imageptrs->ptrHRV[0], 9152 * 9152 * sizeof(quint16));
Expand Down Expand Up @@ -2059,7 +2059,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
memcpy(pixelsRed + i * 464 * 2816, imageptrs->ptrRed[i], 464 * 2816 * sizeof(quint16));
}
}
else if(sl->getKindofImage() == "VIS_IR" && (sl->getGeoSatellite() == eGeoSatellite::FY2E || sl->getGeoSatellite() == eGeoSatellite::FY2G ))
else if(sl->getKindofImage() == "VIS_IR" && (sl->getGeoSatellite() == eGeoSatellite::FY2H || sl->getGeoSatellite() == eGeoSatellite::FY2G ))
{
pixelsRed = new quint16[npix];
memcpy(pixelsRed, imageptrs->ptrRed[0], npix * sizeof(quint16));
Expand Down Expand Up @@ -2136,7 +2136,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
}
}
}
else if(sl->getKindofImage() == "HRV" && (sl->getGeoSatellite() == eGeoSatellite::FY2E || sl->getGeoSatellite() == eGeoSatellite::FY2G ))
else if(sl->getKindofImage() == "HRV" && (sl->getGeoSatellite() == eGeoSatellite::FY2H || sl->getGeoSatellite() == eGeoSatellite::FY2G ))
{
imageptrs->CLAHE(pixelsHRV, 9152, 9152, 0, 255, 16, 16, 256, opts.clahecliplimit);
}
Expand All @@ -2150,7 +2150,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
{
ret = imageptrs->CLAHE(pixelsRed, 2784, 464*6, 0, 1023, 16, 16, 256, opts.clahecliplimit);
}
else if(sl->getGeoSatellite() == eGeoSatellite::FY2E || sl->getGeoSatellite() == eGeoSatellite::FY2G)
else if(sl->getGeoSatellite() == eGeoSatellite::FY2H || sl->getGeoSatellite() == eGeoSatellite::FY2G)
imageptrs->CLAHE(pixelsRed, 2288, 2288, 0, 255, 16, 16, 256, opts.clahecliplimit);
else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17)
imageptrs->CLAHE(pixelsRed, 5424, 5424, 0, 1023, 16, 16, 256, opts.clahecliplimit);
Expand Down Expand Up @@ -2272,7 +2272,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
}
}
}
else if(sl->getGeoSatellite() == eGeoSatellite::FY2E || sl->getGeoSatellite() == eGeoSatellite::FY2G)
else if(sl->getGeoSatellite() == eGeoSatellite::FY2H || sl->getGeoSatellite() == eGeoSatellite::FY2G)
{
for (int line = 0; line < 9152; line++)
{
Expand Down Expand Up @@ -2379,9 +2379,9 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
}
}
}
else if(sl->getGeoSatellite() == eGeoSatellite::FY2E || sl->getGeoSatellite() == eGeoSatellite::FY2G)
else if(sl->getGeoSatellite() == eGeoSatellite::FY2H || sl->getGeoSatellite() == eGeoSatellite::FY2G)
{
qDebug() << "recalculate CLAHE ; VIS_IR and FY2E/G move to ptrImageGeostationary";
qDebug() << "recalculate CLAHE ; VIS_IR and FY2H/G move to ptrImageGeostationary";

for (int line = 0; line < 2288; line++)
{
Expand Down Expand Up @@ -3324,7 +3324,7 @@ void FormImage::OverlayGeostationaryHRV(QPainter *paint, SegmentListGeostationar

if(ret == 0)
{
if(sl->getGeoSatellite() != eGeoSatellite::FY2E && sl->getGeoSatellite() != eGeoSatellite::FY2G)
if(sl->getGeoSatellite() != eGeoSatellite::FY2H && sl->getGeoSatellite() != eGeoSatellite::FY2G)
{
if (row > 11136 - sl->LowerNorthLineActual ) //LOWER
{
Expand Down Expand Up @@ -3383,7 +3383,7 @@ void FormImage::OverlayGeostationaryHRV(QPainter *paint, SegmentListGeostationar

if(ret == 0)
{
if(sl->getGeoSatellite() != eGeoSatellite::FY2E && sl->getGeoSatellite() != eGeoSatellite::FY2G)
if(sl->getGeoSatellite() != eGeoSatellite::FY2H && sl->getGeoSatellite() != eGeoSatellite::FY2G)
{
if (row > 11136 - sl->LowerNorthLineActual ) //LOWER
{
Expand Down Expand Up @@ -3443,7 +3443,7 @@ void FormImage::OverlayGeostationaryHRV(QPainter *paint, SegmentListGeostationar

if(ret == 0)
{
if(sl->getGeoSatellite() != eGeoSatellite::FY2E && sl->getGeoSatellite() != eGeoSatellite::FY2G)
if(sl->getGeoSatellite() != eGeoSatellite::FY2H && sl->getGeoSatellite() != eGeoSatellite::FY2G)
{
if (row > 11136 - sl->LowerNorthLineActual ) //LOWER
{
Expand Down
8 changes: 4 additions & 4 deletions core/formtoolbox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,7 @@ void FormToolbox::on_btnGeoColor_clicked()
ui->pbProgress->setMaximum(3+3+3);
else if(geoindex == (int)eGeoSatellite::GOMS2)
ui->pbProgress->setMaximum(6+6+6);
else if(geoindex == (int)eGeoSatellite::FY2E || geoindex == (int)eGeoSatellite::FY2G )
else if(geoindex == (int)eGeoSatellite::FY2H || geoindex == (int)eGeoSatellite::FY2G )
ui->pbProgress->setMaximum(100);
else if(geoindex == (int)eGeoSatellite::H8)
ui->pbProgress->setMaximum(10+10+10);
Expand Down Expand Up @@ -2230,7 +2230,7 @@ void FormToolbox::on_btnHRV_clicked()
ui->pbProgress->setMaximum(0);
}

if(geoindex == (int)eGeoSatellite::FY2E || geoindex == (int)eGeoSatellite::FY2G)
if(geoindex == (int)eGeoSatellite::FY2H || geoindex == (int)eGeoSatellite::FY2G)
{
ui->pbProgress->setMaximum(100);
}
Expand All @@ -2245,7 +2245,7 @@ void FormToolbox::on_btnHRV_clicked()
else
onButtonColorHRV("HRV");
}
if (geoindex == (int)eGeoSatellite::FY2E || geoindex == (int)eGeoSatellite::FY2G)
if (geoindex == (int)eGeoSatellite::FY2H || geoindex == (int)eGeoSatellite::FY2G)
{
onButtonColorHRV("HRV");
}
Expand Down Expand Up @@ -2330,7 +2330,7 @@ void FormToolbox::onButtonColorHRV(QString type)
inversevector[ui->comboGeo11->currentIndex()-1] = ui->chkInverseGeo11->isChecked();
}
}
else if (geoindex == (int)eGeoSatellite::FY2E || geoindex == (int)eGeoSatellite::FY2G)
else if (geoindex == (int)eGeoSatellite::FY2H || geoindex == (int)eGeoSatellite::FY2G)
{
if(ui->comboGeo1->currentIndex() > 0)
{
Expand Down
2 changes: 1 addition & 1 deletion core/globals.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ enum class eGeoSatellite {
MET_9 = 2,
MET_8 = 3,
GOMS2 = 4,
FY2E = 5,
FY2H = 5,
FY2G = 6,
GOES_15 = 7,
GOES_16 = 8,
Expand Down
2 changes: 1 addition & 1 deletion core/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <QMutex>

#define APPVERSION "1.4.6"
#define APPVERSION "1.4.7"

using namespace std;

Expand Down
2 changes: 1 addition & 1 deletion core/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ void MainWindow::on_actionAbout_triggered()
"<br>OLCI EFR/ERR and SLSTR from Sentinel-3A/-3B"
"<br><br><b>Geostationary satellites :</b>"
"<br>XRIT from Meteosat-11, Meteosat-10, Meteosat-8"
"<br>Electro L2, FengYun 2E, FengYun 2G"
"<br>Electro L2, FengYun 2H, FengYun 2G"
"<br>GOES-16, GOES-17 and Himawari-8"
"<ul>"
"<li>Made by Hugo Van Ruyskensvelde.</li>"
Expand Down
8 changes: 4 additions & 4 deletions core/options.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -970,14 +970,14 @@ void Options::CreateGeoSatelliteIni()
geosatellites[4].spectrumvalueslist << "VIS 0.9" << "IR 3.8" << "IR 8.0" << "IR 9.7" << "IR 10.7" << "IR 11.9";

//Data Channel 12
geosatellites[5].fullname = "FengYun 2E";
geosatellites[5].shortname = "FY2E";
geosatellites[5].longitude = 86.5;
geosatellites[5].fullname = "FengYun 2H";
geosatellites[5].shortname = "FY2H";
geosatellites[5].longitude = 79.0;
geosatellites[5].longitudelimit1 = 0.0;
geosatellites[5].longitudelimit2 = 0.0;
geosatellites[5].protocol = "HDF";
geosatellites[5].rss = false;
geosatellites[5].searchstring = "FY2E_FDI";
geosatellites[5].searchstring = "FY2H_FDI";
geosatellites[5].indexsearchstring = 31;
geosatellites[5].imagewidth = 2288;
geosatellites[5].imageheight = 2288;
Expand Down
2 changes: 1 addition & 1 deletion core/poi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void Poi::Initialize()

strlComboGeo1 = POIsettings.value("/GeoConfig/strlComboGeo1").value<QStringList>();

// MET_11, MET_10, MET_9, MET_8, GOMS2, FY2E, FY2G, GOES_15, GOES_16, GOES_17, H8
// MET_11, MET_10, MET_9, MET_8, GOMS2, FY2H, FY2G, GOES_15, GOES_16, GOES_17, H8
if(strlComboGeo1.count() != opts.geosatellites.count())
{
strlComboGeo1.clear();
Expand Down
20 changes: 10 additions & 10 deletions core/segmentlistgeostationary.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ eGeoSatellite SegmentListGeostationary::getGeoSatellite()
return eGeoSatellite::MET_8;
else if(str_GeoSatellite == "GOMS2")
return eGeoSatellite::GOMS2;
else if(str_GeoSatellite == "FY2E")
return eGeoSatellite::FY2E;
else if(str_GeoSatellite == "FY2H")
return eGeoSatellite::FY2H;
else if(str_GeoSatellite == "FY2G")
return eGeoSatellite::FY2G;
else if(str_GeoSatellite == "GOES_15")
Expand Down Expand Up @@ -243,9 +243,9 @@ void SegmentListGeostationary::setGeoSatellite(int geoindex, QString strgeo)
{
this->m_GeoSatellite = eGeoSatellite::GOMS2;
}
else if(strgeo == "FY2E")
else if(strgeo == "FY2H")
{
this->m_GeoSatellite = eGeoSatellite::FY2E;
this->m_GeoSatellite = eGeoSatellite::FY2H;
}
else if(strgeo == "FY2G")
{
Expand Down Expand Up @@ -502,7 +502,7 @@ void SegmentListGeostationary::InsertPresent( QVector<QString> spectrumvector, Q
{
isPresentRed[filesequence] = true;
}
else if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G)
else if(m_GeoSatellite == eGeoSatellite::FY2H || m_GeoSatellite == eGeoSatellite::FY2G)
{
if(filespectrum == "VIS1KM")
isPresentHRV[filesequence] = true;
Expand Down Expand Up @@ -2550,7 +2550,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()

if (this->getKindofImage() == "VIS_IR Color")
{
if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G || m_GeoSatellite == eGeoSatellite::GOES_16 || m_GeoSatellite == eGeoSatellite::GOES_17)
if(m_GeoSatellite == eGeoSatellite::FY2H || m_GeoSatellite == eGeoSatellite::FY2G || m_GeoSatellite == eGeoSatellite::GOES_16 || m_GeoSatellite == eGeoSatellite::GOES_17)
{
return true;
}
Expand Down Expand Up @@ -2634,7 +2634,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
pbCounter++;
}
}
else if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G)
else if(m_GeoSatellite == eGeoSatellite::FY2H || m_GeoSatellite == eGeoSatellite::FY2G)
{
if (isPresentRed[0] && issegmentcomposedRed[0] == true)
pbCounter++;
Expand Down Expand Up @@ -2669,7 +2669,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
pbCounter++;
}
}
else if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G)
else if(m_GeoSatellite == eGeoSatellite::FY2H || m_GeoSatellite == eGeoSatellite::FY2G)
{
if (isPresentHRV[0] && issegmentcomposedHRV[0] == true)
pbCounter++;
Expand Down Expand Up @@ -2760,7 +2760,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
return false;
}
}
else if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G || m_GeoSatellite == eGeoSatellite::GOES_16 || m_GeoSatellite == eGeoSatellite::GOES_17)
else if(m_GeoSatellite == eGeoSatellite::FY2H || m_GeoSatellite == eGeoSatellite::FY2G || m_GeoSatellite == eGeoSatellite::GOES_16 || m_GeoSatellite == eGeoSatellite::GOES_17)
{
if (isPresentRed[0] && issegmentcomposedRed[0] == false)
return false;
Expand Down Expand Up @@ -2792,7 +2792,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
return false;
}
}
else if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G)
else if(m_GeoSatellite == eGeoSatellite::FY2H || m_GeoSatellite == eGeoSatellite::FY2G)
{
if (isPresentHRV[0] && issegmentcomposedHRV[0] == false)
return false;
Expand Down

0 comments on commit 1a1f80c

Please sign in to comment.