VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-31 13:00:26 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1459 from srcejon/fix_1422

Browse Source 
APT Demod: Update to latest aptdec.
This commit is contained in:
Edouard Griffiths 2022-10-01 06:08:44 +02:00 committed by GitHub
commit 3e54c92a7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/channelrx/demodapt/aptdemodgui.cpp
View File

@ -374,6 +374,11 @@ void APTDemodGUI::on_channels_currentIndexChanged(int index)
{ {
m_settings.m_channels = (APTDemodSettings::ChannelSelection)index; m_settings.m_channels = (APTDemodSettings::ChannelSelection)index;
} }
else if (index == (int)APTDemodSettings::VISIBLE)
{
m_settings.m_channels = APTDemodSettings::VISIBLE;
m_settings.m_precipitationOverlay = false;
}
else if (index == (int)APTDemodSettings::TEMPERATURE) else if (index == (int)APTDemodSettings::TEMPERATURE)
{ {
m_settings.m_channels = APTDemodSettings::TEMPERATURE; m_settings.m_channels = APTDemodSettings::TEMPERATURE;
@ -810,6 +815,7 @@ void APTDemodGUI::displayPalettes()
ui->channels->addItem("A"); ui->channels->addItem("A");
ui->channels->addItem("B"); ui->channels->addItem("B");
ui->channels->addItem("Temperature"); ui->channels->addItem("Temperature");
ui->channels->addItem("Visible");
for (auto palette : m_settings.m_palettes) for (auto palette : m_settings.m_palettes)
{ {
QFileInfo fi(palette); QFileInfo fi(palette);

31
plugins/channelrx/demodapt/aptdemodimageworker.cpp
View File

@ -202,9 +202,7 @@ void APTDemodImageWorker::applySettings(const APTDemodSettings& settings, bool f
void APTDemodImageWorker::resetDecoder() void APTDemodImageWorker::resetDecoder()
{ {
m_image.nrow = 0; m_image.nrow = 0;
m_image.zenith = 0;
m_tempImage.nrow = 0; m_tempImage.nrow = 0;
m_tempImage.zenith = 0;
m_greyImage = QImage(APT_IMG_WIDTH, APT_MAX_HEIGHT, QImage::Format_Grayscale8); m_greyImage = QImage(APT_IMG_WIDTH, APT_MAX_HEIGHT, QImage::Format_Grayscale8);
m_greyImage.fill(0); m_greyImage.fill(0);
m_colourImage = QImage(APT_IMG_WIDTH, APT_MAX_HEIGHT, QImage::Format_RGB888); m_colourImage = QImage(APT_IMG_WIDTH, APT_MAX_HEIGHT, QImage::Format_RGB888);
@ -462,12 +460,12 @@ QRgb APTDemodImageWorker::findNearest(const QImage &image, double latitude, doub
int yEndPostCrop; int yEndPostCrop;
if (m_settings.m_northToSouth) if (m_settings.m_northToSouth)
{ {
yStartPostCrop = abs(m_tempImage.zenith); yStartPostCrop = 0;
yEndPostCrop = yStartPostCrop + image.height(); yEndPostCrop = yStartPostCrop + image.height();
} }
else else
{ {
yStartPostCrop = m_image.nrow - m_tempImage.nrow - abs(m_tempImage.zenith); yStartPostCrop = m_image.nrow - m_tempImage.nrow;
yEndPostCrop = yStartPostCrop + image.height(); yEndPostCrop = yStartPostCrop + image.height();
} }
@ -532,9 +530,9 @@ void APTDemodImageWorker::calcBoundingBox(double &east, double &south, double &w
{ {
int start; int start;
if (m_settings.m_northToSouth) { if (m_settings.m_northToSouth) {
start = abs(m_tempImage.zenith); start = 0;
} else { } else {
start = m_image.nrow - m_tempImage.nrow - abs(m_tempImage.zenith); start = m_image.nrow - m_tempImage.nrow;
} }
int stop = start + image.height(); int stop = start + image.height();
@ -773,7 +771,7 @@ QImage APTDemodImageWorker::processImage(QStringList& imageTypes, APTDemodSettin
// Crop noise due to low elevation at top and bottom of image // Crop noise due to low elevation at top and bottom of image
if (m_settings.m_cropNoise) { if (m_settings.m_cropNoise) {
m_tempImage.zenith -= apt_cropNoise(&m_tempImage); apt_cropNoise(&m_tempImage);
} }
// Denoise filter // Denoise filter
@ -837,7 +835,19 @@ QImage APTDemodImageWorker::processImage(QStringList& imageTypes, APTDemodSettin
} }
return extractImage(m_colourImage, channels); return extractImage(m_colourImage, channels);
} }
else if (channels == APTDemodSettings::TEMPERATURE) if (channels == APTDemodSettings::VISIBLE)
{
// Visible calibration
int satnum = 15;
if (m_satelliteName == "NOAA 18") {
satnum = 18;
} else if (m_satelliteName == "NOAA 19") {
satnum = 19;
}
apt_calibrate_visible(satnum, &m_tempImage, APT_CHA_OFFSET, APT_CH_WIDTH);
}
if (channels == APTDemodSettings::TEMPERATURE)
{ {
// Temperature calibration // Temperature calibration
int satnum = 15; int satnum = 15;
@ -846,7 +856,7 @@ QImage APTDemodImageWorker::processImage(QStringList& imageTypes, APTDemodSettin
} else if (m_satelliteName == "NOAA 19") { } else if (m_satelliteName == "NOAA 19") {
satnum = 19; satnum = 19;
} }
apt_temperature(satnum, &m_tempImage, APT_CHB_OFFSET, APT_CH_WIDTH); apt_calibrate_thermal(satnum, &m_tempImage, APT_CHB_OFFSET, APT_CH_WIDTH);
// Apply colour palette // Apply colour palette
for (int r = 0; r < m_tempImage.nrow; r++) for (int r = 0; r < m_tempImage.nrow; r++)
@ -912,7 +922,7 @@ QImage APTDemodImageWorker::extractImage(QImage image, APTDemodSettings::Channel
{ {
if (channels == APTDemodSettings::BOTH_CHANNELS) { if (channels == APTDemodSettings::BOTH_CHANNELS) {
return image.copy(0, 0, APT_IMG_WIDTH, m_tempImage.nrow); return image.copy(0, 0, APT_IMG_WIDTH, m_tempImage.nrow);
} else if (channels == APTDemodSettings::CHANNEL_A) { } else if ((channels == APTDemodSettings::CHANNEL_A) || (channels == APTDemodSettings::VISIBLE)) {
return image.copy(APT_CHA_OFFSET, 0, APT_CH_WIDTH, m_tempImage.nrow); return image.copy(APT_CHA_OFFSET, 0, APT_CH_WIDTH, m_tempImage.nrow);
} else { } else {
return image.copy(APT_CHB_OFFSET, 0, APT_CH_WIDTH, m_tempImage.nrow); return image.copy(APT_CHB_OFFSET, 0, APT_CH_WIDTH, m_tempImage.nrow);
@ -997,7 +1007,6 @@ void APTDemodImageWorker::saveImageToDisk()
void APTDemodImageWorker::copyImage(apt_image_t *dst, apt_image_t *src) void APTDemodImageWorker::copyImage(apt_image_t *dst, apt_image_t *src)
{ {
dst->nrow = src->nrow; dst->nrow = src->nrow;
dst->zenith = src->zenith;
dst->chA = src->chA; dst->chA = src->chA;
dst->chB = src->chB; dst->chB = src->chB;

2
plugins/channelrx/demodapt/aptdemodsettings.h
View File

@ -36,7 +36,7 @@ struct APTDemodSettings
bool m_histogramEqualise; bool m_histogramEqualise;
bool m_precipitationOverlay; bool m_precipitationOverlay;
bool m_flip; bool m_flip;
enum ChannelSelection {BOTH_CHANNELS, CHANNEL_A, CHANNEL_B, TEMPERATURE, PALETTE} m_channels; enum ChannelSelection {BOTH_CHANNELS, CHANNEL_A, CHANNEL_B, TEMPERATURE, VISIBLE, PALETTE} m_channels;
bool m_decodeEnabled; bool m_decodeEnabled;
bool m_satelliteTrackerControl; //! Whether Sat Tracker can set direction of pass bool m_satelliteTrackerControl; //! Whether Sat Tracker can set direction of pass
QString m_satelliteName; //!< All, NOAA 15, NOAA 18 or NOAA 19 QString m_satelliteName; //!< All, NOAA 15, NOAA 18 or NOAA 19