Skip to content

Commit

Permalink
Added two more Himawari-8 channels (B01 and B02)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hvanruys
hvanruys committed Sep 13, 2018
1 parent c89488b commit fc5b938
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 94 deletions.
76 changes: 0 additions & 76 deletions core/formgeostationary.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,82 +21,6 @@
</property>
</widget>
</item>
<item>
<widget class="QScrollArea" name="scrollArea">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="scrollAreaWidgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1005</width>
<height>257</height>
</rect>
</property>
<widget class="QPushButton" name="pushButton">
<property name="geometry">
<rect>
<x>40</x>
<y>20</y>
<width>89</width>
<height>25</height>
</rect>
</property>
<property name="text">
<string>PushButton</string>
</property>
</widget>
<widget class="QLineEdit" name="lineEdit">
<property name="geometry">
<rect>
<x>170</x>
<y>20</y>
<width>113</width>
<height>25</height>
</rect>
</property>
</widget>
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
<x>20</x>
<y>70</y>
<width>136</width>
<height>125</height>
</rect>
</property>
<property name="title">
<string>GroupBox</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="radioButton">
<property name="text">
<string>RadioButton</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_2">
<property name="text">
<string>RadioButton</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton_3">
<property name="text">
<string>RadioButton</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
<resources/>
Expand Down
46 changes: 34 additions & 12 deletions core/formtoolbox.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2395,64 +2395,84 @@ void FormToolbox::onButtonColorHRV(QString type)
{
if(ui->comboGeo1->currentIndex() > 0)
{
spectrumvector[ui->comboGeo1->currentIndex()-1] = "VIS";
spectrumvector[ui->comboGeo1->currentIndex()-1] = "B01";
inversevector[ui->comboGeo1->currentIndex()-1] = ui->chkInverseGeo1->isChecked();
}
if(ui->comboGeo2->currentIndex() > 0)
{
spectrumvector[ui->comboGeo2->currentIndex()-1] = "B04";
spectrumvector[ui->comboGeo2->currentIndex()-1] = "B02";
inversevector[ui->comboGeo2->currentIndex()-1] = ui->chkInverseGeo2->isChecked();
}
if(ui->comboGeo3->currentIndex() > 0)
{
spectrumvector[ui->comboGeo3->currentIndex()-1] = "B05";
spectrumvector[ui->comboGeo3->currentIndex()-1] = "VIS";
inversevector[ui->comboGeo3->currentIndex()-1] = ui->chkInverseGeo3->isChecked();
}
if(ui->comboGeo4->currentIndex() > 0)
{
spectrumvector[ui->comboGeo4->currentIndex()-1] = "IR4";
spectrumvector[ui->comboGeo4->currentIndex()-1] = "B04";
inversevector[ui->comboGeo4->currentIndex()-1] = ui->chkInverseGeo4->isChecked();
}
if(ui->comboGeo5->currentIndex() > 0)
{
spectrumvector[ui->comboGeo5->currentIndex()-1] = "IR3";
spectrumvector[ui->comboGeo5->currentIndex()-1] = "B05";
inversevector[ui->comboGeo5->currentIndex()-1] = ui->chkInverseGeo5->isChecked();
}
if(ui->comboGeo6->currentIndex() > 0)
{
spectrumvector[ui->comboGeo6->currentIndex()-1] = "B09";
spectrumvector[ui->comboGeo6->currentIndex()-1] = "B06";
inversevector[ui->comboGeo6->currentIndex()-1] = ui->chkInverseGeo6->isChecked();
}
if(ui->comboGeo7->currentIndex() > 0)
{
spectrumvector[ui->comboGeo7->currentIndex()-1] = "B10";
spectrumvector[ui->comboGeo7->currentIndex()-1] = "IR4";
inversevector[ui->comboGeo7->currentIndex()-1] = ui->chkInverseGeo7->isChecked();
}
if(ui->comboGeo8->currentIndex() > 0)
{
spectrumvector[ui->comboGeo8->currentIndex()-1] = "B11";
spectrumvector[ui->comboGeo8->currentIndex()-1] = "IR3";
inversevector[ui->comboGeo8->currentIndex()-1] = ui->chkInverseGeo8->isChecked();
}
if(ui->comboGeo9->currentIndex() > 0)
{
spectrumvector[ui->comboGeo9->currentIndex()-1] = "IR1";
spectrumvector[ui->comboGeo9->currentIndex()-1] = "B09";
inversevector[ui->comboGeo9->currentIndex()-1] = ui->chkInverseGeo9->isChecked();
}
if(ui->comboGeo10->currentIndex() > 0)
{
spectrumvector[ui->comboGeo10->currentIndex()-1] = "B14";
spectrumvector[ui->comboGeo10->currentIndex()-1] = "B10";
inversevector[ui->comboGeo10->currentIndex()-1] = ui->chkInverseGeo10->isChecked();
}
if(ui->comboGeo11->currentIndex() > 0)
{
spectrumvector[ui->comboGeo11->currentIndex()-1] = "IR2";
spectrumvector[ui->comboGeo11->currentIndex()-1] = "B11";
inversevector[ui->comboGeo11->currentIndex()-1] = ui->chkInverseGeo11->isChecked();
}
if(ui->comboGeo12->currentIndex() > 0)
{
spectrumvector[ui->comboGeo12->currentIndex()-1] = "B16";
spectrumvector[ui->comboGeo12->currentIndex()-1] = "B12";
inversevector[ui->comboGeo12->currentIndex()-1] = ui->chkInverseGeo12->isChecked();
}
if(ui->comboGeo13->currentIndex() > 0)
{
spectrumvector[ui->comboGeo13->currentIndex()-1] = "IR1";
inversevector[ui->comboGeo13->currentIndex()-1] = ui->chkInverseGeo13->isChecked();
}
if(ui->comboGeo14->currentIndex() > 0)
{
spectrumvector[ui->comboGeo14->currentIndex()-1] = "B14";
inversevector[ui->comboGeo14->currentIndex()-1] = ui->chkInverseGeo14->isChecked();
}
if(ui->comboGeo15->currentIndex() > 0)
{
spectrumvector[ui->comboGeo15->currentIndex()-1] = "IR2";
inversevector[ui->comboGeo15->currentIndex()-1] = ui->chkInverseGeo15->isChecked();
}
if(ui->comboGeo16->currentIndex() > 0)
{
spectrumvector[ui->comboGeo16->currentIndex()-1] = "B16";
inversevector[ui->comboGeo16->currentIndex()-1] = ui->chkInverseGeo16->isChecked();
}
}
else if(geoindex == (int)eGeoSatellite::GOES_16 )
{
Expand Down Expand Up @@ -2538,6 +2558,8 @@ void FormToolbox::onButtonColorHRV(QString type)
}
}

qDebug() << "spectrumvektor = " << spectrumvector << " ; inversevector = " << inversevector;

emit switchstackedwidget(3);
emit getgeosatchannel(type, spectrumvector, inversevector, ui->cmbHistogramGeo->currentIndex(), ui->rdbPseudoColor->isChecked());
}
Expand Down
10 changes: 8 additions & 2 deletions core/formtoolbox.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>506</width>
<width>535</width>
<height>1264</height>
</rect>
</property>
Expand All @@ -31,9 +31,15 @@
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="tabPosition">
<enum>QTabWidget::West</enum>
</property>
<property name="currentIndex">
<number>3</number>
</property>
<property name="elideMode">
<enum>Qt::ElideNone</enum>
</property>
<property name="tabBarAutoHide">
<bool>false</bool>
</property>
Expand Down Expand Up @@ -5525,7 +5531,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>430</width>
<width>432</width>
<height>529</height>
</rect>
</property>
Expand Down
2 changes: 1 addition & 1 deletion core/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ MainWindow::MainWindow(QWidget *parent) :
formephem = new FormEphem(this, satlist, seglist);
ui->stackedWidget->addWidget(formephem); // index 0

formtoolbox = NULL;
//formtoolbox = NULL;

formgeostationary = new FormGeostationary(this, satlist, seglist);
ui->stackedWidget->addWidget(formgeostationary); // index 1
Expand Down
6 changes: 3 additions & 3 deletions core/options.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,7 @@ void Options::CreateGeoSatelliteIni()
geosatellites[8].spectrumvalueslist << "0.47" << "0.64" << "0.86" << "1.37" << "1.61" << "2.24" << "3.89" << "6.17" << "6.93" << "7.34" << "8.44" << "9.61" << "10.33" << "11.2"
<< "12.3" << "13.3";

//E1B-TPG-1
//E1B-TPG-1 E1H-TPG-2
geosatellites[9].fullname = "Himawari 8";
geosatellites[9].shortname = "H8";
geosatellites[9].longitude = 140.7;
Expand Down Expand Up @@ -1254,8 +1254,8 @@ void Options::CreateGeoSatelliteIni()
geosatellites[9].lfachrv = 0.;


geosatellites[9].spectrumlist << "VIS" << "B04" << "B05" << "B06" << "IR4" << "IR3" << "B09" << "B10" << "B11" << "B12" << "IR1" << "B14" << "IR2" << "B16";
geosatellites[9].spectrumvalueslist << "0.64" << "0.86" << "1.6" << "2.3" << "3.9" << "6.2" << "6.9" << "7.3" << "8.6" << "9.6" << "10.4" << "11.2" << "12.4" << "13.3";
geosatellites[9].spectrumlist << "B01" << "B02" << "VIS" << "B04" << "B05" << "B06" << "IR4" << "IR3" << "B09" << "B10" << "B11" << "B12" << "IR1" << "B14" << "IR2" << "B16";
geosatellites[9].spectrumvalueslist << "0.46" << "0.51" << "0.64" << "0.86" << "1.6" << "2.3" << "3.9" << "6.2" << "6.9" << "7.3" << "8.6" << "9.6" << "10.4" << "11.2" << "12.4" << "13.3";

settingsgeo.beginWriteArray("geos");
for (int i = 0; i < this->geosatellites.size(); ++i) {
Expand Down

0 comments on commit fc5b938

Please sign in to comment.