Skip to content

Commit

Permalink
Support for Metop-C
Browse files Browse the repository at this point in the history
  • Loading branch information
@hvanruys
hvanruys committed Mar 29, 2019
1 parent 6d9309a commit 5a3f2ca
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 35 deletions.
5 changes: 3 additions & 2 deletions core/avhrrsatellite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -698,11 +698,12 @@ void AVHRRSatellite::ReadDirectories(QDate seldate, int hoursbefore)

if(metopTle)
{
bool ok1 = false, ok2 = false;
bool ok1 = false, ok2 = false, ok3 = false;
Satellite metop_sat;
ok1 = satlist->GetSatellite(29499, &metop_sat);
ok2 = satlist->GetSatellite(38771, &metop_sat);
if (ok1 == false || ok2 == false)
ok3 = satlist->GetSatellite(43689, &metop_sat);
if (ok1 == false || ok2 == false || ok3 == false)
{
QApplication::restoreOverrideCursor();
QMessageBox msgBox;
Expand Down
2 changes: 1 addition & 1 deletion core/formgeostationary.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ void FormGeostationary::PopulateTreeGeo(int geoindex)
filenbr = citfile.key();
QFileInfo fileinfo = citfile.value();

qDebug() << "strdate = " << strdate << " strspectrum = " << strspectrum << " filenbr = " << filenbr << " info = " << fileinfo.completeBaseName();
//qDebug() << "strdate = " << strdate << " strspectrum = " << strspectrum << " filenbr = " << filenbr << " info = " << fileinfo.completeBaseName();

if(opts.geosatellites.at(geoindex).spectrumhrv.length() > 0)
{
Expand Down
31 changes: 2 additions & 29 deletions core/formtoolbox.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<enum>QTabWidget::West</enum>
</property>
<property name="currentIndex">
<number>3</number>
<number>0</number>
</property>
<property name="elideMode">
<enum>Qt::ElideNone</enum>
Expand Down Expand Up @@ -188,15 +188,6 @@
</color>
</brush>
</colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="128">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
Expand Down Expand Up @@ -334,15 +325,6 @@
</color>
</brush>
</colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="128">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
Expand Down Expand Up @@ -480,15 +462,6 @@
</color>
</brush>
</colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="128">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
Expand Down Expand Up @@ -3742,7 +3715,7 @@
<enum>QFrame::Raised</enum>
</property>
<property name="text">
<string>Geostationary satellite images</string>
<string>Geostationary satellite images </string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
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.5"
#define APPVERSION "1.4.6"

using namespace std;

Expand Down
4 changes: 2 additions & 2 deletions core/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,13 @@ void MainWindow::on_actionAbout_triggered()
"<center><b>Version " + QApplication::applicationVersion() + "</b></center>"
"<p>supports the following satellites</p>"
"<br><b>Polar satellites :</b>"
"<br>AVHHR images from Metop-A, Metop-B and NOAA-19"
"<br>AVHHR images from Metop-A/-B/-C and NOAA-19"
"<br>VIIRS images from SUOMI NPP and NOAA-20 (M-Band and Day/Night Band)"
"<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>GOES-15, GOES-16 and Himawari-8"
"<br>GOES-16, GOES-17 and Himawari-8"
"<ul>"
"<li>Made by Hugo Van Ruyskensvelde.</li>"
"</HTML>";
Expand Down
4 changes: 4 additions & 0 deletions core/segmenthrp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ SegmentHRP::SegmentHRP(QFile *filesegment, SatelliteList *satl, QObject *parent)
ok = satlist->GetSatellite(29499, &sat);
else if(fileInfo.fileName().mid(0,15) == "AVHR_HRP_00_M01") // Metop-B
ok = satlist->GetSatellite(38771, &sat);
else if(fileInfo.fileName().mid(0,15) == "AVHR_HRP_00_M03") // Metop-C
ok = satlist->GetSatellite(43689, &sat);

line1 = sat.line1;
line2 = sat.line2;
Expand Down Expand Up @@ -341,6 +343,8 @@ bool SegmentHRP::inspectMPHRrecord(QByteArray mphr_record)
ok = satlist->GetSatellite(29499, &metop_sat);
else if(fileInfo.fileName().mid(0,15) == "AVHR_HRP_00_M01") // Metop-B
ok = satlist->GetSatellite(38771, &metop_sat);
else if(fileInfo.fileName().mid(0,15) == "AVHR_HRP_00_M03") // Metop-C
ok = satlist->GetSatellite(43689, &metop_sat);

this->earth_views_per_scanline = 2048;

Expand Down
2 changes: 2 additions & 0 deletions core/segmentmetop.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ SegmentMetop::SegmentMetop(QFile *filesegment, SatelliteList *satl, QObject *par
ok = satlist->GetSatellite(29499, &metop_sat);
else if(fileInfo.fileName().mid(0,15) == "AVHR_xxx_1B_M01") // Metop-B
ok = satlist->GetSatellite(38771, &metop_sat);
else if(fileInfo.fileName().mid(0,15) == "AVHR_xxx_1B_M03") // Metop-C
ok = satlist->GetSatellite(43689, &metop_sat);

if(!ok)
{
Expand Down

0 comments on commit 5a3f2ca

Please sign in to comment.