Histogram matching for AVHRR( MetopA/B, NOAA19, GAC, HRP )

hvanruys · Dec 30, 2017 · 983421f · 983421f
1 parent 9b92192
commit 983421f
Show file tree

Hide file tree

Showing 14 changed files with 1,094 additions and 1,138 deletions.
diff --git a/core/formimage.cpp b/core/formimage.cpp
@@ -397,10 +397,10 @@ void FormImage::displayImage(eImageType channel)
 
 void FormImage::slotMakeImage()
 {
-    this->ComposeImage();
+    this->MakeImage();
 }
 
-void FormImage::ComposeImage()
+void FormImage::MakeImage()
 {
 
     if(opts.buttonMetop || opts.buttonNoaa || opts.buttonHRP || opts.buttonGAC)
@@ -3389,12 +3389,12 @@ void FormImage::OverlayOLCI(QPainter *paint)
             QPolygon copycoastline = segm->coastline.translated(0, heightinsegment);
             paint->drawPoints(copycoastline);
 
-            if(opts.gridonolciimage)
-            {
-                paint->setPen(QColor(opts.projectionoverlaylonlatcolor));
-                QPolygon copylatlonline = segm->latlonline.translated(0, heightinsegment);
-                paint->drawPoints(copylatlonline);
-            }
+//            if(opts.gridonolciimage)
+//            {
+//                paint->setPen(QColor(opts.projectionoverlaylonlatcolor));
+//                QPolygon copylatlonline = segm->latlonline.translated(0, heightinsegment);
+//                paint->drawPoints(copylatlonline);
+//            }
 
             heightinsegment += segm->GetNbrOfLines();
             ++segsel;
@@ -3560,17 +3560,6 @@ void FormImage::slotRepaintProjectionImage()
     this->displayImage(this->channelshown);
 }
 
-void FormImage::setHistogramMethod(int histogrammethod, bool normalized)
-{
-    segs->seglolciefr->setHistogramMethod(histogrammethod, normalized);
-    segs->seglolcierr->setHistogramMethod(histogrammethod, normalized);
-}
-
-void FormImage::setHistogramMethodSLSTR(int histogrammethod)
-{
-    segs->seglslstr->setHistogramMethod(histogrammethod);
-}
-
 bool FormImage::SaveAsPNG48bits(bool mapto65535)
 {
     QString filestr;

diff --git a/core/formimage.h b/core/formimage.h
@@ -22,14 +22,12 @@ class FormImage : public QWidget
 public:
     explicit FormImage(QWidget *parent = 0, SatelliteList *satlist=0, AVHRRSatellite *seglist=0);
     QLabel *returnimageLabelptr();
-    void ComposeImage();
+    void MakeImage();
     bool ShowVIIRSMImage();
     bool ShowVIIRSDNBImage();
     bool ShowOLCIefrImage(int histogrammethod, bool normalized);
     bool ShowOLCIerrImage(int histogrammethod, bool normalized);
     bool ShowSLSTRImage(int histogrammethod);
-    void setHistogramMethod(int histogrammethod, bool normalized);
-    void setHistogramMethodSLSTR(int histogrammethod);
     QSize getPictureSize() const;
     void recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool> inversevector);
     void recalculateCLAHEAvhrr(QVector<QString> spectrumvector, QVector<bool> inversevector);

diff --git a/core/formmapcyl.h b/core/formmapcyl.h
@@ -27,7 +27,6 @@ class FormMapCyl : public QWidget
     explicit FormMapCyl(QWidget *parent = 0, MapFieldCyl *p_mapcyl = 0, Globe *p_globe = 0, FormToolbox *p_formtoolbox = 0, SatelliteList *satlist=0, AVHRRSatellite *seglist=0 );
 
     void setCylOrGlobe(int ind);
-    bool ComposeImage();
 
 private:
     Ui::FormMapCyl *ui;

diff --git a/core/formtoolbox.cpp b/core/formtoolbox.cpp
@@ -374,13 +374,14 @@ FormToolbox::FormToolbox(QWidget *parent, FormImage *p_formimage, FormGeostation
     ui->cmbHistogramSLSTR->setCurrentIndex(CMB_HISTO_NONE_95);
     ui->cmbHistogramGeo->addItems(lsthistogram);
     ui->cmbHistogramGeo->setCurrentIndex(CMB_HISTO_NONE_95);
+    ui->cmbHistogramAVHRR->addItems(lsthistogram);
+    ui->cmbHistogramAVHRR->setCurrentIndex(CMB_HISTO_NONE_95);
 
     lsthistogram.clear();
     lsthistogram << "None 95%" << "None 100%" << "Equalize" << "Equalize Projection";
     ui->cmbHistogramProj->addItems(lsthistogram);
     ui->cmbHistogramProj->setCurrentIndex(CMB_HISTO_NONE_95);
 
-    ui->rdbGridOnOLCIimage->setChecked(opts.gridonolciimage);
     ui->rbNadir->setChecked(true);
     setAllWhatsThis();
 
@@ -5116,12 +5117,16 @@ void FormToolbox::fitCurve()
 
 void FormToolbox::on_rdbOLCINormalized_toggled(bool checked)
 {
-    formimage->setHistogramMethod(ui->cmbHistogram->currentIndex(), checked);
+    segs->seglolciefr->setHistogramMethod(ui->cmbHistogram->currentIndex(), checked);
+    segs->seglolcierr->setHistogramMethod(ui->cmbHistogram->currentIndex(), checked);
+
 }
 
 void FormToolbox::on_cmbHistogram_activated(int index)
 {
-    formimage->setHistogramMethod(ui->cmbHistogram->currentIndex(), ui->rdbOLCINormalized->isChecked());
+    segs->seglolciefr->setHistogramMethod(ui->cmbHistogram->currentIndex(), ui->rdbOLCINormalized->isChecked());
+    segs->seglolcierr->setHistogramMethod(ui->cmbHistogram->currentIndex(), ui->rdbOLCINormalized->isChecked());
+
 
     if(opts.buttonOLCIefr)
     {
@@ -5152,9 +5157,26 @@ void FormToolbox::on_cmbHistogram_activated(int index)
 
 }
 
+
+void FormToolbox::on_cmbHistogramAVHRR_activated(int index)
+{
+    //metopcount + noaacount + hrpcount + gaccount + metopAhrptcount + metopBhrptcount + noaa19hrptcount + M01hrptcount + M02hrptcount
+    segs->seglmetop->setHistogramMethod(ui->cmbHistogramAVHRR->currentIndex());
+    segs->seglgac->setHistogramMethod(ui->cmbHistogramAVHRR->currentIndex());
+    segs->seglhrp->setHistogramMethod(ui->cmbHistogramAVHRR->currentIndex());
+    segs->seglnoaa->setHistogramMethod(ui->cmbHistogramAVHRR->currentIndex());
+    segs->seglmetopAhrpt->setHistogramMethod(ui->cmbHistogramAVHRR->currentIndex());
+    segs->seglmetopBhrpt->setHistogramMethod(ui->cmbHistogramAVHRR->currentIndex());
+    segs->seglnoaa19hrpt->setHistogramMethod(ui->cmbHistogramAVHRR->currentIndex());
+    segs->seglM01hrpt->setHistogramMethod(ui->cmbHistogramAVHRR->currentIndex());
+    segs->seglM02hrpt->setHistogramMethod(ui->cmbHistogramAVHRR->currentIndex());
+
+    formimage->MakeImage();
+}
+
 void FormToolbox::on_cmbHistogramSLSTR_activated(int index)
 {
-    formimage->setHistogramMethodSLSTR(ui->cmbHistogramSLSTR->currentIndex());
+    segs->seglslstr->setHistogramMethod(ui->cmbHistogramSLSTR->currentIndex());
 
     if(opts.buttonSLSTR)
     {
@@ -5438,3 +5460,8 @@ void FormToolbox::on_comboGeo16_currentIndexChanged(int index)
     poi.strlComboGeo16.replace(this->geoindex, QString("%1").arg(index));
 }
 
+
+void FormToolbox::on_cmbHistogramGeo_activated(int index)
+{
+
+}
diff --git a/core/formtoolbox.h b/core/formtoolbox.h
@@ -276,6 +276,8 @@ private slots:
     void on_comboGeo15_currentIndexChanged(int index);
     void on_comboGeo16_currentIndexChanged(int index);
 
+    void on_cmbHistogramAVHRR_activated(int index);
+    void on_cmbHistogramGeo_activated(int index);
 };