mirror of https://github.com/f4exb/sdrangel.git
Compare commits
No commits in common. "5e321e3ead9b06f8d4fb0f7f4501518964511389" and "dac9b9a5b392ccf4d0bf265e5a0ce5911e7201b9" have entirely different histories.
5e321e3ead
...
dac9b9a5b3
|
@ -31,7 +31,6 @@ 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);
|
||||
}
|
||||
|
||||
|
|
|
@ -2507,20 +2507,17 @@ 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()
|
||||
|
|
|
@ -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,6 +44,7 @@ MapIBPBeaconDialog::MapIBPBeaconDialog(MapGUI *gui, QWidget* parent) :
|
|||
ui->beacons->setItem(row, IBP_BEACON_COL_DISTANCE, new QTableWidgetItem(""));
|
||||
}
|
||||
resizeTable();
|
||||
updateTable(QTime::currentTime());
|
||||
}
|
||||
|
||||
MapIBPBeaconDialog::~MapIBPBeaconDialog()
|
||||
|
@ -125,17 +126,3 @@ 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();
|
||||
}
|
||||
|
|
|
@ -43,8 +43,6 @@ 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;
|
||||
|
|
|
@ -29,7 +29,6 @@ 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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue