VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix radiometer autoscaling

This commit is contained in:
Jon Beniston 2021-10-12 13:38:37 +01:00
parent ec9d59315d
commit c35cc2181b
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
plugins/channelrx/radioastronomy/radioastronomygui.cpp
View File

@ -474,11 +474,8 @@ void RadioAstronomyGUI::addToPowerSeries(FFTMeasurement *fft, bool skipCalcs)
{
if (m_settings.m_powerAutoscale)
{
double max = m_powerMax + (m_powerMax-m_powerMin)*0.2; // Add 20% space for markers
double range = max - m_powerMin;
blockApplySettings(true);
ui->powerRange->setValue(range);
ui->powerReference->setValue(max);
powerAutoscaleY(false);
blockApplySettings(false);
}
}
@ -764,19 +761,39 @@ void RadioAstronomyGUI::on_powerAutoscale_toggled(bool checked)
applySettings();
}
void RadioAstronomyGUI::powerAutoscaleY(bool adjustAxis)
{
double min = m_powerMin;
double max = m_powerMax;
double range = max - min;
// Round to 1 or 2 decimal places
if (range > 1.0)
{
min = std::floor(min * 10.0) / 10.0;
max = std::ceil(max * 10.0) / 10.0;
}
else
{
min = std::floor(min * 100.0) / 100.0;
max = std::ceil(max * 100.0) / 100.0;
}
range = max - min;
max += range * 0.2; // Add 20% space for markers
range = max - min;
range = std::max(0.1, range); // Don't be smaller than minimum value we can set in GUI
if (adjustAxis) {
m_powerYAxis->setRange(min, max);
}
ui->powerRange->setValue(range); // Call before setting reference, so number of decimals are adjusted
ui->powerReference->setValue(max);
}
// Scale Y axis according to min and max values
void RadioAstronomyGUI::on_powerAutoscaleY_clicked()
{
if (m_powerYAxis)
{
double min = m_powerMin;
double max = m_powerMax + (m_powerMax-m_powerMin)*0.2; // Add 20% space for markers
double range = m_powerMax - m_powerMin;
range = std::max(0.1, range); // Don't be smaller than minimum value we can set in GUI
m_powerYAxis->setRange(min, max);
ui->powerRange->setValue(range); // Call before setting reference, so number of decimals are adjusted
ui->powerReference->setValue(max);
if (m_powerYAxis) {
powerAutoscaleY(true);
}
}
@ -2857,9 +2874,6 @@ void RadioAstronomyGUI::on_powerYUnits_currentIndexChanged(int index)
ui->powerColourScaleMinUnits->setText(text);
ui->powerColourScaleMaxUnits->setText(text);
}
if (m_settings.m_powerColourAutoscale && (ui->powerChartSelect->currentIndex() == 4)) {
powerColourAutoscale();
}
applySettings();
plotPowerChart();
}
@ -3025,6 +3039,9 @@ void RadioAstronomyGUI::plot2DChart()
for (int i = 0; i < m_fftMeasurements.size(); i++) {
update2DImage(m_fftMeasurements[i], i < m_fftMeasurements.size() - 1);
}
if (m_settings.m_powerColourAutoscale) {
powerColourAutoscale();
}
connect(m_2DChart, SIGNAL(plotAreaChanged(QRectF)), this, SLOT(plotAreaChanged(QRectF)));

1
plugins/channelrx/radioastronomy/radioastronomygui.h
View File

@ -392,6 +392,7 @@ private:
void updatePowerSelect();
void spectrumAutoscale();
void powerAutoscale();
void powerAutoscaleY(bool adjustAxis);
void calcSpectrumMarkerDelta();
void calcPowerMarkerDelta();
void calcPowerPeakDelta();