VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-06-15 04:52:33 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1473 from srcejon/fix_1472

Browse Source 
Sat tracker: Fix #1472 and #1471
This commit is contained in:
Edouard Griffiths 2022-10-10 13:27:53 +02:00 committed by GitHub
commit 77cb80af90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -601,6 +601,7 @@ double RadioAstronomyGUI::beamFillingFactor() const
void RadioAstronomyGUI::powerMeasurementReceived(FFTMeasurement *fft, bool skipCalcs) void RadioAstronomyGUI::powerMeasurementReceived(FFTMeasurement *fft, bool skipCalcs)
{ {
ui->powerTable->setSortingEnabled(false);
int row = ui->powerTable->rowCount(); int row = ui->powerTable->rowCount();
ui->powerTable->setRowCount(row + 1); ui->powerTable->setRowCount(row + 1);
@ -660,6 +661,8 @@ void RadioAstronomyGUI::powerMeasurementReceived(FFTMeasurement *fft, bool skipC
ui->powerTable->setItem(row, POWER_COL_SENSOR_1, sensor1Item); ui->powerTable->setItem(row, POWER_COL_SENSOR_1, sensor1Item);
ui->powerTable->setItem(row, POWER_COL_SENSOR_2, sensor2Item); ui->powerTable->setItem(row, POWER_COL_SENSOR_2, sensor2Item);
ui->powerTable->setSortingEnabled(true);
QDateTime dateTime = fft->m_dateTime; QDateTime dateTime = fft->m_dateTime;
dateItem->setData(Qt::DisplayRole, dateTime.date()); dateItem->setData(Qt::DisplayRole, dateTime.date());
timeItem->setData(Qt::DisplayRole, dateTime.time()); timeItem->setData(Qt::DisplayRole, dateTime.time());

2
plugins/feature/satellitetracker/readme.md
View File

@ -99,7 +99,7 @@ On the Settings tab, you can set:
* A command/script to be executed on LOS. This applies to all satellites. It is also possible to set a per-satellite command in the SDRangel Control dialog. * A command/script to be executed on LOS. This applies to all satellites. It is also possible to set a per-satellite command in the SDRangel Control dialog.
* The Doppler correction period in seconds, which controls how frequently Doppler correction is applied. Which channels have Doppler correction applied is set on a per-channel basis in the SDRangel Control dialog. * The Doppler correction period in seconds, which controls how frequently Doppler correction is applied. Which channels have Doppler correction applied is set on a per-channel basis in the SDRangel Control dialog.
For commands, scripts and speech, the following variables can be sustituted: ${aos}, ${los}, ${elevation}, ${aosAzimuth}, ${losAzimuth}, ${northToSouth}, ${latitude}, ${longitude}, ${altitude}, ${azimuth}, ${elevation}, ${range}, ${rangeRate}, ${speed} and ${period}. For commands, scripts and speech, the following variables can be substituted: `${name}`, `${duration}`, `${aos}`, `${los}`, `${elevation}`, `${aosAzimuth}`, `${losAzimuth}`, `${northToSouth}`, `${latitude}`, `${longitude}`, `${altitude}`, `${azimuth}`, `${elevation}`, `${range}`, `${rangeRate}`, `${speed}` and `${period}`.
![Satellite tracker settings dialog](../../../doc/img/SatelliteTracker_plugin_settingsdialog2.png) ![Satellite tracker settings dialog](../../../doc/img/SatelliteTracker_plugin_settingsdialog2.png)

2
plugins/feature/satellitetracker/satellitetrackergui.cpp
View File

@ -1115,6 +1115,7 @@ void SatelliteTrackerGUI::updateTable(SatelliteState *satState)
if (matches.size() == 0) if (matches.size() == 0)
{ {
// Add a new row // Add a new row
ui->satTable->setSortingEnabled(false);
int row = ui->satTable->rowCount(); int row = ui->satTable->rowCount();
ui->satTable->setRowCount(row + 1); ui->satTable->setRowCount(row + 1);
for (int i = 0; i < SAT_COL_COLUMNS; i++) for (int i = 0; i < SAT_COL_COLUMNS; i++)
@ -1128,6 +1129,7 @@ void SatelliteTrackerGUI::updateTable(SatelliteState *satState)
items[i]->setToolTip(ui->satTable->horizontalHeaderItem(i)->toolTip()); items[i]->setToolTip(ui->satTable->horizontalHeaderItem(i)->toolTip());
ui->satTable->setItem(row, i, items[i]); ui->satTable->setItem(row, i, items[i]);
} }
ui->satTable->setSortingEnabled(true);
// Static columns // Static columns
items[SAT_COL_NAME]->setText(satState->m_name); items[SAT_COL_NAME]->setText(satState->m_name);
if (m_satellites.contains(satState->m_name)) if (m_satellites.contains(satState->m_name))