VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-31 04:50:29 -04:00
Code Issues Projects Releases Wiki Activity

Add missing image and fix Linux compilation warnings

Browse Source
This commit is contained in:
Jon Beniston 2022-02-04 21:33:04 +00:00
parent fd70ffcfdc
commit 09eff20a8e
5 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/img/Map_plugin_display_settings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 53 KiB

4
plugins/channelrx/demodadsb/adsbdemodreport.h
View File

@ -64,9 +64,9 @@ public:
) : ) :
Message(), Message(),
m_data(data), m_data(data),
m_dateTime(dateTime),
m_preambleCorrelation(preambleCorrelation), m_preambleCorrelation(preambleCorrelation),
m_correlationOnes(correlationOnes), m_correlationOnes(correlationOnes)
m_dateTime(dateTime)
{ {
} }
}; };

11
plugins/feature/map/mapsettingsdialog.cpp
View File

@ -122,11 +122,16 @@ MapSettingsDialog::MapSettingsDialog(MapSettings *settings, QWidget* parent) :
ui->eciCamera->setCurrentIndex((int)m_settings->m_eciCamera); ui->eciCamera->setCurrentIndex((int)m_settings->m_eciCamera);
ui->antiAliasing->setCurrentIndex(ui->antiAliasing->findText(m_settings->m_antiAliasing)); ui->antiAliasing->setCurrentIndex(ui->antiAliasing->findText(m_settings->m_antiAliasing));
QHashIterator<QString, MapSettings::MapItemSettings *> itr(m_settings->m_itemSettings); // Sort groups in table alphabetically
QList<MapSettings::MapItemSettings *> itemSettings = m_settings->m_itemSettings.values();
std::sort(itemSettings.begin(), itemSettings.end(),
[](const MapSettings::MapItemSettings* a, const MapSettings::MapItemSettings* b) -> bool {
return a->m_group < b->m_group;
});
QListIterator<MapSettings::MapItemSettings *> itr(itemSettings);
while (itr.hasNext()) while (itr.hasNext())
{ {
itr.next(); MapSettings::MapItemSettings *itemSettings = itr.next();
MapSettings::MapItemSettings *itemSettings = itr.value();
// Add row to table with header // Add row to table with header
int row = ui->mapItemSettings->rowCount(); int row = ui->mapItemSettings->rowCount();

21
plugins/feature/map/mapsettingsdialog.ui
View File

@ -16,7 +16,7 @@
</font> </font>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Select a Location</string> <string>Map Display Settings</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
@ -366,6 +366,12 @@
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="maptilerAPIKeyLabel"> <widget class="QLabel" name="maptilerAPIKeyLabel">
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Maptiler API Key</string> <string>Maptiler API Key</string>
</property> </property>
@ -380,6 +386,12 @@
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="mapBoxAPIKeyLabel"> <widget class="QLabel" name="mapBoxAPIKeyLabel">
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Mapbox API Key</string> <string>Mapbox API Key</string>
</property> </property>
@ -394,6 +406,12 @@
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="cesiumIonAPIKeyLabel"> <widget class="QLabel" name="cesiumIonAPIKeyLabel">
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="text"> <property name="text">
<string>Cesium Ion API Key</string> <string>Cesium Ion API Key</string>
</property> </property>
@ -462,6 +480,7 @@
<tabstop>buildings</tabstop> <tabstop>buildings</tabstop>
<tabstop>sunLightEnabled</tabstop> <tabstop>sunLightEnabled</tabstop>
<tabstop>eciCamera</tabstop> <tabstop>eciCamera</tabstop>
<tabstop>antiAliasing</tabstop>
<tabstop>thunderforestAPIKey</tabstop> <tabstop>thunderforestAPIKey</tabstop>
<tabstop>maptilerAPIKey</tabstop> <tabstop>maptilerAPIKey</tabstop>
<tabstop>mapBoxAPIKey</tabstop> <tabstop>mapBoxAPIKey</tabstop>

8
plugins/feature/map/webserver.cpp
View File

@ -147,11 +147,19 @@ void WebServer::readClient()
// See if we can find the file in our resources // See if we can find the file in our resources
QResource res(path); QResource res(path);
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
if (res.isValid() && (res.uncompressedSize() > 0)) if (res.isValid() && (res.uncompressedSize() > 0))
{ {
QByteArray data = res.uncompressedData(); QByteArray data = res.uncompressedData();
sendFile(socket, data, mimeType, path); sendFile(socket, data, mimeType, path);
} }
#else
if (res.isValid() && (res.size() > 0))
{
QByteArray data = QByteArray::fromRawData((const char *)res.data(), res.size());
sendFile(socket, data, mimeType, path);
}
#endif
else else
{ {
// See if we can find a file // See if we can find a file