mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #1792 from dforsi/fix/sorting 

Fix sorting of numeric columns
pull/1795/head
Edouard Griffiths 2023-08-27 20:51:31 +02:00 zatwierdzone przez GitHub
rodzic ac3c64b9d0 6126a819c1
commit 2724530148
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 16 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
plugins/feature/map/mapbeacondialog.cpp
Wyświetl plik

@ -67,9 +67,13 @@ void MapBeaconDialog::updateTable()
ui->beacons->setItem(row, BEACON_COL_MGM, new QTableWidgetItem(beacon->m_mgm));
azEl.setTarget(beacon->m_latitude, beacon->m_longitude, beacon->m_altitude);
azEl.calculate();
ui->beacons->setItem(row, BEACON_COL_AZIMUTH, new QTableWidgetItem(QString("%1").arg(round(azEl.getAzimuth()))));
QTableWidgetItem *azymuth = new QTableWidgetItem();
azymuth->setData(Qt::DisplayRole, round(azEl.getAzimuth()));
ui->beacons->setItem(row, BEACON_COL_AZIMUTH, azymuth);
ui->beacons->item(row, BEACON_COL_AZIMUTH)->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
ui->beacons->setItem(row, BEACON_COL_ELEVATION, new QTableWidgetItem(QString("%1").arg(round(azEl.getElevation()))));
QTableWidgetItem *elevation = new QTableWidgetItem();
elevation->setData(Qt::DisplayRole, round(azEl.getElevation()));
ui->beacons->setItem(row, BEACON_COL_ELEVATION, elevation);
ui->beacons->item(row, BEACON_COL_ELEVATION)->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
int km = round(azEl.getDistance()/1000);
QTableWidgetItem *dist = new QTableWidgetItem();

14
plugins/feature/map/mapradiotimedialog.cpp
Wyświetl plik

@ -49,18 +49,24 @@ void MapRadioTimeDialog::updateTable()
{
ui->transmitters->setItem(row, TRANSMITTER_COL_CALLSIGN, new QTableWidgetItem(transmitters[i].m_callsign));
QTableWidgetItem *freq = new QTableWidgetItem();
freq->setText(QString("%1").arg(transmitters[i].m_frequency/1000.0));
freq->setData(Qt::DisplayRole, transmitters[i].m_frequency/1000.0);
freq->setData(Qt::UserRole, transmitters[i].m_frequency);
ui->transmitters->setItem(row, TRANSMITTER_COL_FREQUENCY, freq);
ui->transmitters->item(row, TRANSMITTER_COL_FREQUENCY)->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
ui->transmitters->setItem(row, TRANSMITTER_COL_LOCATION, new QTableWidgetItem(QString("%1,%2").arg(transmitters[i].m_latitude).arg(transmitters[i].m_longitude)));
ui->transmitters->setItem(row, TRANSMITTER_COL_POWER, new QTableWidgetItem(QString("%1").arg(transmitters[i].m_power)));
QTableWidgetItem *power = new QTableWidgetItem();
power->setData(Qt::DisplayRole, transmitters[i].m_power);
ui->transmitters->setItem(row, TRANSMITTER_COL_POWER, power);
ui->transmitters->item(row, TRANSMITTER_COL_POWER)->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
azEl.setTarget(transmitters[i].m_latitude, transmitters[i].m_longitude, 1.0);
azEl.calculate();
ui->transmitters->setItem(row, TRANSMITTER_COL_AZIMUTH, new QTableWidgetItem(QString("%1").arg(round(azEl.getAzimuth()))));
QTableWidgetItem *azymuth = new QTableWidgetItem();
azymuth->setData(Qt::DisplayRole, round(azEl.getAzimuth()));
ui->transmitters->setItem(row, TRANSMITTER_COL_AZIMUTH, azymuth);
ui->transmitters->item(row, TRANSMITTER_COL_AZIMUTH)->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
ui->transmitters->setItem(row, TRANSMITTER_COL_ELEVATION, new QTableWidgetItem(QString("%1").arg(round(azEl.getElevation()))));
QTableWidgetItem *elevation = new QTableWidgetItem();
elevation->setData(Qt::DisplayRole, round(azEl.getElevation()));
ui->transmitters->setItem(row, TRANSMITTER_COL_ELEVATION, elevation);
ui->transmitters->item(row, TRANSMITTER_COL_ELEVATION)->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter);
int km = round(azEl.getDistance()/1000);
QTableWidgetItem *dist = new QTableWidgetItem();