Skip to content

Commit

Permalink
Change Meteosat-11 as prime FES satellite ( 20 feb 2018 )
Browse files Browse the repository at this point in the history
  • Loading branch information
@hvanruys
hvanruys committed Feb 20, 2018
1 parent d6e5d36 commit e4948b4
Show file tree
Hide file tree
Showing 28 changed files with 2,351 additions and 155 deletions.
20 changes: 11 additions & 9 deletions core/avhrrsatellite.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ void AVHRRSatellite::AddSegmentsToList(QFileInfoList fileinfolist)
segmentlistmapgeo[i].insert( strdate, hashspectrum );
}
}
qDebug() << opts.geosatellites.at(i).shortname << " " << fileInfo.fileName() << " " << strdate << " " << strspectrum << " " << QString("%1").arg(filenbr);
//qDebug() << opts.geosatellites.at(i).shortname << " " << fileInfo.fileName() << " " << strdate << " " << strspectrum << " " << QString("%1").arg(filenbr);
}
}

Expand Down Expand Up @@ -1303,7 +1303,7 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
delete segmetop;

}
if (fileinfo.fileName().mid( 0, 6) == "avhrr_" && fileinfo.fileName().mid( 22, 6) == "noaa19")
else if (fileinfo.fileName().mid( 0, 6) == "avhrr_" && fileinfo.fileName().mid( 22, 6) == "noaa19")
{
qDebug() << "from UDP segment Noaa19 added filename = " << fileinfo.fileName();
QFile file(thefilepath);
Expand All @@ -1319,7 +1319,7 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
delete segnoaa;

}
if (fileinfo.fileName().mid( 0, 8) == "AVHR_HRP" && fileinfo.fileName().mid( 67, 4) == ".bz2")
else if (fileinfo.fileName().mid( 0, 8) == "AVHR_HRP" && fileinfo.fileName().mid( 67, 4) == ".bz2")
{
qDebug() << "from UDP segment HRP added filename = " << fileinfo.fileName();
QFile file(thefilepath);
Expand All @@ -1335,7 +1335,7 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
delete seghrp;

}
if (fileinfo.fileName().mid( 0, 8) == "AVHR_GAC")
else if (fileinfo.fileName().mid( 0, 8) == "AVHR_GAC")
{
qDebug() << "from UDP segment GAC added filename = " << fileinfo.fileName();
QFile file(thefilepath);
Expand All @@ -1351,7 +1351,7 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
delete seggac;

}
if (fileinfo.fileName().mid( 0, 8) == "SVMC_npp")
else if (fileinfo.fileName().mid( 0, 8) == "SVMC_npp")
{
qDebug() << "from UDP segment NPP M added filename filename = " << fileinfo.fileName();
QFile file(thefilepath);
Expand All @@ -1367,7 +1367,7 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
delete segviirsm;

}
if (fileinfo.fileName().mid( 0, 10) == "SVDNBC_npp")
else if (fileinfo.fileName().mid( 0, 10) == "SVDNBC_npp")
{
qDebug() << "from UDP segment NPP DNB added filename filename = " << fileinfo.fileName();
QFile file(thefilepath);
Expand All @@ -1383,7 +1383,7 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
delete segviirsdnb;

}
if (fileinfo.fileName().mid( 0, 12) == "S3A_OL_1_EFR")
else if (fileinfo.fileName().mid( 0, 12) == "S3A_OL_1_EFR")
{
qDebug() << "from UDP segment S3A EFR added filename filename = " << fileinfo.fileName();
segolciefr = new SegmentOLCI(SEG_OLCIEFR, fileinfo, satlist);
Expand All @@ -1398,7 +1398,7 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
delete segolciefr;

}
if (fileinfo.fileName().mid( 0, 12) == "S3A_OL_1_ERR")
else if (fileinfo.fileName().mid( 0, 12) == "S3A_OL_1_ERR")
{
qDebug() << "from UDP segment S3A ERR added filename filename = " << fileinfo.fileName();
segolcierr = new SegmentOLCI(SEG_OLCIERR, fileinfo, satlist);
Expand All @@ -1413,13 +1413,15 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
delete segolcierr;

}
if (fileinfo.fileName().mid( 0, 9) == "H-000-MSG" && fileinfo.fileName().mid( 13, 3) == "MSG")
else if (fileinfo.fileName().mid( 0, 9) == "H-000-MSG" && fileinfo.fileName().mid( 13, 3) == "MSG")
{
QFile file(thefilepath);

int filesequence = fileinfo.fileName().mid(36, 6).toInt()-1;
QString strspectrum = fileinfo.fileName().mid(26, 6);
QString strdate = fileinfo.fileName().mid(46, 12);
qDebug() << "from UDP segment MSG filename = " << fileinfo.fileName();


//Q_ASSERT( filesequence > 7);
}
Expand Down
38 changes: 29 additions & 9 deletions core/core.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ DEFINES += LIBARCHIVE_STATIC
DEFINES += HDF5_DISABLE_VERSION_CHECK=1
DEFINES += OPENGL30


SOURCES += main.cpp \
mainwindow.cpp \
options.cpp \
Expand Down Expand Up @@ -85,7 +86,10 @@ SOURCES += main.cpp \
segmentdatahub.cpp \
segmentlistdatahub.cpp \
msgdataaccess.cpp \
msgfileaccess.cpp
msgfileaccess.cpp \
internal.cpp \
misc_util.cpp \
nav_util.cpp

HEADERS += mainwindow.h \
options.h \
Expand Down Expand Up @@ -158,11 +162,10 @@ HEADERS += mainwindow.h \
segmentlistdatahub.h \
productlist.h \
msgdataaccess.h \
msgfileaccess.h

#QMAKE_CXXFLAGS += -std=c++0x -Wno-trigraphs
unix:QMAKE_CXXFLAGS += -Wno-trigraphs
#win32:QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT
msgfileaccess.h \
nav_util.h \
internal.h \
misc_util.h

FORMS += mainwindow.ui \
dialogpreferences.ui \
Expand All @@ -175,20 +178,37 @@ RESOURCES += \
EUMETCastView.qrc \
shaders.qrc

unix:INCLUDEPATH += /home/hugo/TAR_LIBS/libarchive-master/libarchive /usr/include/GL /usr/include/freetype2 /usr/local/hdf5/include ../bz2 ../zlib128-dll/include ../meteosatlib ../QSgp4
#QMAKE_CXXFLAGS += -std=c++0x -Wno-trigraphs
unix:QMAKE_CXXFLAGS += -Wno-trigraphs
unix:QMAKE_LFLAGS += -no-pie
#win32:QMAKE_LFLAGS += /NODEFAULTLIB:MSVCRT

#/home/hugo/TAR_LIBS/libarchive-master/libarchive
unix:INCLUDEPATH += /usr/include/GL /usr/include/freetype2 /usr/local/hdf5/include ../bz2 ../zlib128-dll/include ../meteosatlib ../QSgp4
win32:INCLUDEPATH += "C:/msys64/mingw64/include" ../bz2 ../meteosatlib ../QSgp4
#else:win32:INCLUDEPATH += "C:/Users/Windows7/libarchive-3.2.2-new/libarchive-3.2.2/libarchive" \
# ../bz2 ../zlib128-dll/include ../meteosatlib ../QSgp4 \
# "C:/Program Files/netCDF 4.4.1/include" "C:/Program Files/HDF_Group/HDF5/1.8.16/include"



CONFIG(release, debug|release) {
#This is a release build
unix:LIBS += -lpthread -lz -lfreeimage
unix:LIBS += -L$$_PRO_FILE_PWD_/../libs/linux_gplusplus/release -lmeteosat -lDISE -lJPEG -lWT -lT4 -lCOMP -lqsgp4 -lbz2 -lhdf5_serial -larchive
unix:LIBS += -L/usr/lib/x86_64-linux-gnu/ -lnetcdf
#-L/usr/local/hdf5/lib -lhdf5
win32:LIBS += -L$$PWD/../../libs/win64_mingw64/release -lmeteosat -lDISE -lWT -lT4 -lJPEG -lCOMP -lqsgp4 -lbz2
win32:LIBS += -L"C:/msys64/mingw64/lib/" -lszip -lz -lhdf5.dll -lnetcdf.dll -larchive.dll -lfreeimage.dll

}
else
{
#This is a debug build
unix:LIBS += -lpthread -lz -lfreeimage
unix:LIBS += -L$$_PRO_FILE_PWD_/../libs/linux_gplusplus/debug -lmeteosat -lDISE -lJPEG -lWT -lT4 -lCOMP -lqsgp4 -lbz2 -lhdf5_serial -larchive
unix:LIBS += -L/usr/lib/x86_64-linux-gnu/ -lnetcdf
win32:LIBS += -L$$PWD/../../libs/win64_mingw64/release -lmeteosat -lDISE -lWT -lT4 -lJPEG -lCOMP -lqsgp4 -lbz2
win32:LIBS += -L"C:/msys64/mingw64/lib/" -lszip -lz -lhdf5.dll -lnetcdf.dll -larchive.dll -lfreeimage.dll
}

#CONFIG(release, debug|release) {
#This is a release build
Expand Down
2 changes: 2 additions & 0 deletions core/formephem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,9 @@ void FormEphem::processPendingDatagrams()
datagram.resize(udpSocket->pendingDatagramSize());
udpSocket->readDatagram(datagram.data(), datagram.size());
if (opts.udpmessages && weatherok && resourceok)
{
emit signalDatagram(datagram.data());
}
}
}

Expand Down
Loading

0 comments on commit e4948b4

Please sign in to comment.