kopia lustrzana https://github.com/f4exb/sdrangel
Fix linux warnings
rodzic
bce51d09d7
commit
df8451dbde
|
@ -444,6 +444,7 @@ void AISGUI::sendToMap(const QString &name, const QString &label,
|
|||
swgMapItem->setImage(new QString(QString("qrc:///ais/map/%1").arg(image)));
|
||||
}
|
||||
swgMapItem->setModel(new QString(model));
|
||||
swgMapItem->setModelAltitudeOffset(modelOffset);
|
||||
swgMapItem->setLabel(new QString(label));
|
||||
swgMapItem->setLabelAltitudeOffset(labelOffset);
|
||||
swgMapItem->setFixedPosition(false);
|
||||
|
@ -974,9 +975,6 @@ void AISGUI::vessels_customContextMenuRequested(QPoint pos)
|
|||
// Find on Map
|
||||
if (!latitudeV.isNull())
|
||||
{
|
||||
float latitude = latitudeV.toFloat();
|
||||
float longitude = longitudeV.toFloat();
|
||||
|
||||
tableContextMenu->addSeparator();
|
||||
|
||||
QAction* findMapFeatureAction = new QAction(QString("Find MMSI %1 on map").arg(mmsi), tableContextMenu);
|
||||
|
|
|
@ -92,7 +92,7 @@ private:
|
|||
void leaveEvent(QEvent*);
|
||||
void enterEvent(QEvent*);
|
||||
|
||||
void AISGUI::sendToMap(const QString &name, const QString &label,
|
||||
void sendToMap(const QString &name, const QString &label,
|
||||
const QString &image, const QString &text,
|
||||
const QString &model, float modelOffset, float labelOffset,
|
||||
float latitude, float longitude, QDateTime positionDateTime,
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
#include "cesiuminterface.h"
|
||||
|
||||
CesiumInterface::CesiumInterface(const MapSettings *settings, QObject *parent) :
|
||||
m_czml(settings),
|
||||
MapWebSocketServer(parent)
|
||||
MapWebSocketServer(parent),
|
||||
m_czml(settings)
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -202,7 +202,8 @@ void CesiumInterface::removeAllCZMLEntities()
|
|||
|
||||
void CesiumInterface::initCZML()
|
||||
{
|
||||
czml(m_czml.init());
|
||||
QJsonObject obj = m_czml.init();
|
||||
czml(obj);
|
||||
}
|
||||
|
||||
// Send and process CZML
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "util/units.h"
|
||||
|
||||
CZML::CZML(const MapSettings *settings, QObject *parent) :
|
||||
CZML::CZML(const MapSettings *settings) :
|
||||
m_settings(settings)
|
||||
{
|
||||
}
|
||||
|
@ -194,6 +194,8 @@ QQuaternion CZML::orientation(double longitude, double latitude, double altitude
|
|||
|
||||
QJsonObject CZML::update(MapItem *mapItem, bool isTarget, bool isSelected)
|
||||
{
|
||||
(void) isTarget;
|
||||
|
||||
// Don't currently use CLIP_TO_GROUND in Cesium due to Jitter bug
|
||||
// https://github.com/CesiumGS/cesium/issues/4049
|
||||
// Instead we implement our own clipping code in map3d.html
|
||||
|
|
|
@ -38,7 +38,7 @@ private:
|
|||
QHash<QString, bool> m_hasMoved;
|
||||
|
||||
public:
|
||||
CZML(const MapSettings *settings, QObject *parent = nullptr);
|
||||
CZML(const MapSettings *settings);
|
||||
QJsonObject init();
|
||||
QJsonObject update(MapItem *mapItem, bool isTarget, bool isSelected);
|
||||
|
||||
|
|
|
@ -264,6 +264,8 @@ void MapModel::update(const PipeEndPoint *sourcePipe, SWGSDRangel::SWGMapItem *s
|
|||
// Slot called on dataChanged signal, to update 3D map
|
||||
void MapModel::update3DMap(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
|
||||
{
|
||||
(void) roles;
|
||||
|
||||
CesiumInterface *cesium = m_gui->cesium();
|
||||
if (cesium)
|
||||
{
|
||||
|
|
Ładowanie…
Reference in New Issue