Solved some problems with IR_039 sun reflection calculations.

Added Summer and Winter Day microphysics RGB.
hvanruys · Jul 4, 2018 · cbcdee2 · cbcdee2
1 parent 2d6d5f3
commit cbcdee2
Show file tree

Hide file tree

Showing 11 changed files with 1,356 additions and 415 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/core/formimage.cpp b/core/formimage.cpp
@@ -2997,6 +2997,57 @@ void FormImage::recalculateCLAHE1(QVector<QString> spectrumvector, QVector<bool>
     QApplication::restoreOverrideCursor();
 }
 
+void FormImage::CLAHERGBRecipe(float cliplimit)
+{
+    QRgb *row_col;
+    quint16 red, green, blue;
+    int npix = 3712 * 3712;
+    quint16 *pixelsRed = new quint16[npix];
+    quint16 *pixelsGreen = new quint16[npix];
+    quint16 *pixelsBlue = new quint16[npix];
+
+    qDebug() << "ptrimageGeostationary width = " << imageptrs->ptrimageGeostationary->width();
+    if(imageptrs->ptrimageGeostationary->width() != 3712)
+        return;
+
+    for (int line = 0; line < 3712; line++)
+    {
+        for (int pixelx = 0; pixelx < 3712; pixelx++)
+        {
+            int i_image = line * 3712 + pixelx;
+            pixelsRed[i_image] = imageptrs->ptrimageRGBRecipeRed[i_image];
+            pixelsGreen[i_image] = imageptrs->ptrimageRGBRecipeGreen[i_image];
+            pixelsBlue[i_image] = imageptrs->ptrimageRGBRecipeBlue[i_image];
+        }
+    }
+
+    imageptrs->CLAHE(pixelsRed, 3712, 3712, 0, 255, 16, 16, 256, cliplimit);
+    imageptrs->CLAHE(pixelsGreen, 3712, 3712, 0, 255, 16, 16, 256, cliplimit);
+    imageptrs->CLAHE(pixelsBlue, 3712, 3712, 0, 255, 16, 16, 256, cliplimit);
+
+
+    for (int line = 0; line < 3712; line++)
+    {
+        row_col = (QRgb*)imageptrs->ptrimageGeostationary->scanLine(line);
+        for (int pixelx = 0; pixelx < 3712; pixelx++)
+        {
+            int i_image = line * 3712 + pixelx;
+
+            red = pixelsRed[i_image];
+            green = pixelsGreen[i_image];
+            blue = pixelsBlue[i_image];
+
+            row_col[pixelx] = qRgb((int)red, (int)green, (int)blue);
+        }
+    }
+
+
+    delete [] pixelsRed;
+    delete [] pixelsGreen;
+    delete [] pixelsBlue;
+}
+
+
 void FormImage::CLAHEprojection()
 {
     quint16 *pixelsRed;

diff --git a/core/formimage.h b/core/formimage.h
@@ -75,6 +75,7 @@ class FormImage : public QWidget
     void UpdateProjection();
     bool SaveAsPNG48bits(bool mapto65535);
     void setupGeoOverlay(int geoindex);
+    void CLAHERGBRecipe(float cliplimit);
 
     int metopcount;
     int noaacount;

diff --git a/core/formtoolbox.cpp b/core/formtoolbox.cpp
@@ -260,6 +260,9 @@ FormToolbox::FormToolbox(QWidget *parent, FormImage *p_formimage, FormGeostation
     ui->lblCLAHE->setText(QString("%1").arg(double(opts.clahecliplimit), 0, 'f', 1));
     ui->sliCLAHE->setSliderPosition(opts.clahecliplimit * 10);
 
+    ui->lblCLAHE_RGBRecipe->setText(QString("%1").arg(1.8, 0, 'f', 1));
+    ui->sliCLAHE_RGBRecipe->setSliderPosition(18);
+
     ui->sbCentreBand->blockSignals(true);
 
     ui->sbCentreBand->setMinimum(opts.dnbsblowerlimit);
@@ -4040,6 +4043,11 @@ void FormToolbox::on_sliCLAHE_sliderMoved(int position)
     ui->lblCLAHE->setText(QString("%1").arg(double(opts.clahecliplimit), 0, 'f', 1));
 }
 
+void FormToolbox::on_sliCLAHE_RGBRecipe_sliderMoved(int position)
+{
+    ui->lblCLAHE_RGBRecipe->setText(QString("%1").arg(float(position)/10, 0, 'f', 1));
+}
+
 void FormToolbox::createFilenamestring(QString sat, QString d, QVector<QString> spectrum)
 {
     QString outstring;
@@ -5519,3 +5527,15 @@ void FormToolbox::on_cmbHistogramGeo_activated(int index)
 
 }
 
+
+void FormToolbox::on_btnCLAHE_RGBRecipe_clicked()
+{
+        QApplication::setOverrideCursor(Qt::WaitCursor);
+        this->setToolboxButtons(false);
+        QApplication::processEvents();
+        qDebug() << QString("ui->sliCLAHE_RGBRecipe value = %1").arg((float)ui->sliCLAHE_RGBRecipe->value()/10.0);
+        formimage->CLAHERGBRecipe((float)ui->sliCLAHE_RGBRecipe->value()/10.0);
+        formimage->slotUpdateGeosat();
+        QApplication::restoreOverrideCursor();
+
+}
diff --git a/core/formtoolbox.h b/core/formtoolbox.h
@@ -228,6 +228,7 @@ private slots:
     void on_btnTextureOLCI_clicked();
     void on_btnTextureSLSTR_clicked();
     void on_sliCLAHE_sliderMoved(int position);
+    void on_sliCLAHE_RGBRecipe_sliderMoved(int position);
 
     void on_cbProjResolutions_currentIndexChanged(int index);
 
@@ -279,6 +280,7 @@ private slots:
     void on_cmbHistogramAVHRR_activated(int index);
     void on_cmbHistogramGeo_activated(int index);
     void on_btnRecipes_clicked();
+    void on_btnCLAHE_RGBRecipe_clicked();
 };
 
 

diff --git a/core/formtoolbox.ui b/core/formtoolbox.ui
@@ -5171,6 +5171,68 @@
               </item>
              </layout>
             </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_104">
+              <item>
+               <widget class="QPushButton" name="btnCLAHE_RGBRecipe">
+                <property name="toolTip">
+                 <string>Contrast Limited Adaptive Histogram Equalization</string>
+                </property>
+                <property name="text">
+                 <string>CLAHE</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_64">
+                <property name="text">
+                 <string>Clip Limit : </string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="lblCLAHE_RGBRecipe">
+                <property name="minimumSize">
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>20</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>TextLabel</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QSlider" name="sliCLAHE_RGBRecipe">
+                <property name="minimum">
+                 <number>10</number>
+                </property>
+                <property name="maximum">
+                 <number>100</number>
+                </property>
+                <property name="singleStep">
+                 <number>1</number>
+                </property>
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="tickPosition">
+                 <enum>QSlider::TicksAbove</enum>
+                </property>
+                <property name="tickInterval">
+                 <number>10</number>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
            </layout>
           </item>
          </layout>

diff --git a/core/main.cpp b/core/main.cpp
@@ -12,7 +12,7 @@
 
 #include <QMutex>
 
-#define APPVERSION "1.3.9"
+#define APPVERSION "1.4.0"
 
 using namespace std;