Change display system to QGraphicsView + processing FCI L1c data

hvanruys · Jul 15, 2023 · c061a2f · c061a2f
1 parent 42b535c
commit c061a2f
Show file tree

Hide file tree

Showing 23 changed files with 5,833 additions and 5,269 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -62,9 +62,6 @@ set(PROJECT_SOURCES_CPP
     segmentlistviirsm.cpp
     poi.cpp
     equirectangular.cpp
-    infrascales.cpp
-    infrawidget.cpp
-    forminfrascales.cpp
     qcustomplot.cpp
     segmentlistolci.cpp
     segmentolci.cpp

diff --git a/core/avhrrsatellite.cpp b/core/avhrrsatellite.cpp
diff --git a/core/avhrrsatellite.h b/core/avhrrsatellite.h
@@ -147,7 +147,8 @@ class AVHRRSatellite  : public QObject
 
     QList<SegmentListGeostationary *> seglgeo;
     QList<QMap<QString, QMap<QString, QMap< int, QFileInfo > > > > segmentlistmapgeo;
-    QMap<QString, QMap<int, QMap< int, QFileInfo > > > segmentlistmapgeomtgi1;
+    QMap<int, QMap< int, QFileInfo > > segmentlistmapgeomtgi1;
+    QDate selectiondate;
 
 
 private:
@@ -156,8 +157,8 @@ class AVHRRSatellite  : public QObject
                      QDate seldate, int hoursbefore);
     void RemoveFromList(QList<Segment*> *sl);
     void CreateListfromXML(QDomDocument document);
-    void getFilenameParameters(int geosatindex, QString filename, QString &strspectrum, QString &strdate, int &filenbr);
-    void getFilenameParametersMTGI1(QString filename, QString &strdate, int &filenbr, int &seqnbr);
+    void getFilenameParameters(int geosatindex, QString filename, QString *strspectrum, QString *strdate, int *filenbr);
+    void getFilenameParametersMTGI1(QString filename, QString *strdate, int *filenbr, int *seqnbr);
 
     DatahubAccessManager hubmanager;
     QDate xmlselectdate;

diff --git a/core/formgeostationary.cpp b/core/formgeostationary.cpp
diff --git a/core/formgeostationary.h b/core/formgeostationary.h
@@ -3,14 +3,16 @@
 
 #include <QWidget>
 #include <QTreeWidget>
+#include "formmapcyl.h"
 #include "satellite.h"
 #include "avhrrsatellite.h"
-#include "msgfileaccess.h"
-#include "msgdataaccess.h"
-#include "formtoolbox.h"
+//#include "msgfileaccess.h"
+//#include "msgdataaccess.h"
 #include "formimage.h"
+//#include "formtoolbox.h"
 
 class FormImage;
+class FormToolbox;
 
 namespace Ui {
 class FormGeostationary;
@@ -32,19 +34,21 @@ class FormGeostationary : public QWidget
     SegmentListGeostationary *setActiveSegmentList(int geoindex);
     SegmentListGeostationary *getActiveSegmentList();
     int getTabWidgetGeoIndex();
-    //void ComposeGeoRGBRecipe(bandstorage &bs);
-
+    void getTimeFromFilenbr(int filenbr, QString *strtime);
     ~FormGeostationary();
 
 private:
     QStringList getGeostationarySegments(int geoindex, const QString imagetype, const QString filepath, QVector<QString> spectrumvector, QString filepattern);
+    QStringList getGeostationarySegmentsMTG(int geoindex, const QString imagetype, const QString filepath, int filenbr);
     void PopulateTreeGeo(int geoindex);
-    void PopulateTreeGeoMTGI1();
+    void PopulateTreeGeoMTGI1(int geoindex);
 
     void CreateGeoImageXRIT(SegmentListGeostationary *sl, QString type, QString tex, QVector<QString> spectrumvector, QVector<bool> inversevector, int histogrammethod);
     void CreateGeoImageHDF(SegmentListGeostationary *sl, QString type, QString tex, QVector<QString> spectrumvector, QVector<bool> inversevector);
     void CreateGeoImagenetCDF(SegmentListGeostationary *sl, QString type, QString tex, QVector<QString> spectrumvector, QVector<bool> inversevector, int histogrammethod, bool pseudocolor);
-
+    void CreateGeoImagenetCDFMTG(SegmentListGeostationary *sl, QString type, QString tex, QVector<QString> spectrumvector, QVector<bool> inversevector, int histogrammethod, bool pseudocolor);
+    void CreateGeoImageMSG(QString type, QVector<QString> spectrumvector, QVector<bool> inversevector, int histogrammethod, bool pseudocolor, QString tex, int geoindex);
+    void CreateGeoImageMTG(QString type, QVector<QString> spectrumvector, QVector<bool> inversevector,int histogrammethod, bool pseudocolor, QString tex, int geoindex);
     Ui::FormGeostationary *ui;
     AVHRRSatellite *segs;
     SatelliteList *sats;