VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 01:18:38 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2068 from dforsi/feature/map-feature

Browse Source 
Feature/map feature
This commit is contained in:
Edouard Griffiths 2024-04-25 00:23:12 +02:00 committed by GitHub
commit 5e321e3ead
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/feature/map/mapbeacondialog.cpp
View File

@ -31,6 +31,7 @@ MapBeaconDialog::MapBeaconDialog(MapGUI *gui, QWidget* parent) :
ui(new Ui::MapBeaconDialog)
{
ui->setupUi(this);
setAttribute(Qt::WA_QuitOnClose, false);
connect(&m_dlm, &HttpDownloadManager::downloadComplete, this, &MapBeaconDialog::downloadFinished);
}

3
plugins/feature/map/mapgui.cpp
View File

@ -2507,17 +2507,20 @@ void MapGUI::on_displaySettings_clicked()
void MapGUI::on_beacons_clicked()
{
m_beaconDialog.show();
m_beaconDialog.raise();
}
void MapGUI::on_ibpBeacons_clicked()
{
m_ibpBeaconDialog.show();
m_ibpBeaconDialog.raise();
}
void MapGUI::on_radiotime_clicked()
{
m_radioTimeDialog.updateTable();
m_radioTimeDialog.show();
m_radioTimeDialog.raise();
}
QString MapGUI::getDataDir()

17
plugins/feature/map/mapibpbeacondialog.cpp
View File

@ -30,9 +30,9 @@ MapIBPBeaconDialog::MapIBPBeaconDialog(MapGUI *gui, QWidget* parent) :
ui(new Ui::MapIBPBeaconDialog)
{
ui->setupUi(this);
setAttribute(Qt::WA_QuitOnClose, false);
connect(&m_timer, &QTimer::timeout, this, &MapIBPBeaconDialog::updateTime);
m_timer.setInterval(1000);
m_timer.start();
ui->beacons->setRowCount(IBPBeacon::m_frequencies.size());
for (int row = 0; row < IBPBeacon::m_frequencies.size(); row++)
{
@ -44,7 +44,6 @@ MapIBPBeaconDialog::MapIBPBeaconDialog(MapGUI *gui, QWidget* parent) :
ui->beacons->setItem(row, IBP_BEACON_COL_DISTANCE, new QTableWidgetItem(""));
}
resizeTable();
updateTable(QTime::currentTime());
}
MapIBPBeaconDialog::~MapIBPBeaconDialog()
@ -126,3 +125,17 @@ void MapIBPBeaconDialog::updateTime()
updateTable(t);
}
}
void MapIBPBeaconDialog::showEvent(QShowEvent *event)
{
(void) event;
updateTable(QTime::currentTime());
updateTime();
m_timer.start();
}
void MapIBPBeaconDialog::hideEvent(QHideEvent *event)
{
(void) event;
m_timer.stop();
}

2
plugins/feature/map/mapibpbeacondialog.h
View File

@ -43,6 +43,8 @@ private slots:
void accept();
void on_beacons_cellDoubleClicked(int row, int column);
void updateTime();
void showEvent(QShowEvent *event);
void hideEvent(QHideEvent *event);
private:
MapGUI *m_gui;

1
plugins/feature/map/mapradiotimedialog.cpp
View File

@ -29,6 +29,7 @@ MapRadioTimeDialog::MapRadioTimeDialog(MapGUI *gui, QWidget* parent) :
ui(new Ui::MapRadioTimeDialog)
{
ui->setupUi(this);
setAttribute(Qt::WA_QuitOnClose, false);
// Don't call updateTable until m_gui->getAzEl() will return valid location
}