mirror of https://github.com/f4exb/sdrangel.git
Compare commits
7 Commits
c24c2f3924
...
7563d33980
Author | SHA1 | Date |
---|---|---|
dforsi | 7563d33980 | |
Daniele Forsi | b4ec43e4aa | |
Daniele Forsi | f4b2dfc0a9 | |
Daniele Forsi | f72574d1ad | |
Daniele Forsi | 230c461204 | |
Edouard Griffiths | dac9b9a5b3 | |
Daniele Forsi | 90e917f666 |
|
@ -456,7 +456,7 @@ elseif(ANDROID)
|
||||||
set(LIBDSDCC_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/dsdcc/lib/libdsdcc.so" CACHE INTERNAL "")
|
set(LIBDSDCC_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/dsdcc/lib/libdsdcc.so" CACHE INTERNAL "")
|
||||||
|
|
||||||
set(FFMPEG_FOUND ON CACHE INTERNAL "")
|
set(FFMPEG_FOUND ON CACHE INTERNAL "")
|
||||||
set(FFMEG_SKIP_CHECK ON CACHE INTERNAL "")
|
set(FFMPEG_SKIP_CHECK ON CACHE INTERNAL "")
|
||||||
set(FFMPEG_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
|
set(FFMPEG_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
|
||||||
set(FFMPEG_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/bin" CACHE INTERNAL "")
|
set(FFMPEG_LIBRARIES "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/bin" CACHE INTERNAL "")
|
||||||
set(AVCODEC_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
|
set(AVCODEC_INCLUDE_DIRS "${EXTERNAL_LIBRARY_FOLDER}/${ANDROID_ABI}/ffmpeg/include" CACHE INTERNAL "")
|
||||||
|
|
|
@ -234,7 +234,7 @@ if(NOT SERVER_MODE)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
add_subdirectory(demoddatv)
|
add_subdirectory(demoddatv)
|
||||||
else()
|
else()
|
||||||
if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMEG_SKIP_CHECK)
|
if(((AVUTIL_VERSION VERSION_GREATER "55.27.99") AND (AVCODEC_VERSION VERSION_GREATER "57.48.101")) OR FFMPEG_EXTERNAL OR FFMPEG_SKIP_CHECK)
|
||||||
message(STATUS "Include demoddatv")
|
message(STATUS "Include demoddatv")
|
||||||
add_subdirectory(demoddatv)
|
add_subdirectory(demoddatv)
|
||||||
else()
|
else()
|
||||||
|
|
|
@ -2507,17 +2507,20 @@ void MapGUI::on_displaySettings_clicked()
|
||||||
void MapGUI::on_beacons_clicked()
|
void MapGUI::on_beacons_clicked()
|
||||||
{
|
{
|
||||||
m_beaconDialog.show();
|
m_beaconDialog.show();
|
||||||
|
m_beaconDialog.raise();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MapGUI::on_ibpBeacons_clicked()
|
void MapGUI::on_ibpBeacons_clicked()
|
||||||
{
|
{
|
||||||
m_ibpBeaconDialog.show();
|
m_ibpBeaconDialog.show();
|
||||||
|
m_ibpBeaconDialog.raise();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MapGUI::on_radiotime_clicked()
|
void MapGUI::on_radiotime_clicked()
|
||||||
{
|
{
|
||||||
m_radioTimeDialog.updateTable();
|
m_radioTimeDialog.updateTable();
|
||||||
m_radioTimeDialog.show();
|
m_radioTimeDialog.show();
|
||||||
|
m_radioTimeDialog.raise();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString MapGUI::getDataDir()
|
QString MapGUI::getDataDir()
|
||||||
|
|
|
@ -32,7 +32,6 @@ MapIBPBeaconDialog::MapIBPBeaconDialog(MapGUI *gui, QWidget* parent) :
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
connect(&m_timer, &QTimer::timeout, this, &MapIBPBeaconDialog::updateTime);
|
connect(&m_timer, &QTimer::timeout, this, &MapIBPBeaconDialog::updateTime);
|
||||||
m_timer.setInterval(1000);
|
m_timer.setInterval(1000);
|
||||||
m_timer.start();
|
|
||||||
ui->beacons->setRowCount(IBPBeacon::m_frequencies.size());
|
ui->beacons->setRowCount(IBPBeacon::m_frequencies.size());
|
||||||
for (int row = 0; row < IBPBeacon::m_frequencies.size(); row++)
|
for (int row = 0; row < IBPBeacon::m_frequencies.size(); row++)
|
||||||
{
|
{
|
||||||
|
@ -44,7 +43,6 @@ MapIBPBeaconDialog::MapIBPBeaconDialog(MapGUI *gui, QWidget* parent) :
|
||||||
ui->beacons->setItem(row, IBP_BEACON_COL_DISTANCE, new QTableWidgetItem(""));
|
ui->beacons->setItem(row, IBP_BEACON_COL_DISTANCE, new QTableWidgetItem(""));
|
||||||
}
|
}
|
||||||
resizeTable();
|
resizeTable();
|
||||||
updateTable(QTime::currentTime());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
MapIBPBeaconDialog::~MapIBPBeaconDialog()
|
MapIBPBeaconDialog::~MapIBPBeaconDialog()
|
||||||
|
@ -126,3 +124,17 @@ void MapIBPBeaconDialog::updateTime()
|
||||||
updateTable(t);
|
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,6 +43,8 @@ private slots:
|
||||||
void accept();
|
void accept();
|
||||||
void on_beacons_cellDoubleClicked(int row, int column);
|
void on_beacons_cellDoubleClicked(int row, int column);
|
||||||
void updateTime();
|
void updateTime();
|
||||||
|
void showEvent(QShowEvent *event);
|
||||||
|
void hideEvent(QHideEvent *event);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MapGUI *m_gui;
|
MapGUI *m_gui;
|
||||||
|
|
Loading…
Reference in New Issue