Skip to content

Commit

Permalink
Merge pull request #97 from dpaulat/feature/radar-site-labels
Browse files Browse the repository at this point in the history
Radar Site Labels
  • Loading branch information
dpaulat authored Nov 21, 2023
2 parents 40a13e8 + 6ab2bfb commit 6e4501f
Show file tree
Hide file tree
Showing 9 changed files with 268 additions and 16 deletions.
6 changes: 4 additions & 2 deletions scwx-qt/scwx-qt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ set(HDR_MAP source/scwx/qt/map/alert_layer.hpp
source/scwx/qt/map/overlay_layer.hpp
source/scwx/qt/map/placefile_layer.hpp
source/scwx/qt/map/radar_product_layer.hpp
source/scwx/qt/map/radar_range_layer.hpp)
source/scwx/qt/map/radar_range_layer.hpp
source/scwx/qt/map/radar_site_layer.hpp)
set(SRC_MAP source/scwx/qt/map/alert_layer.cpp
source/scwx/qt/map/color_table_layer.cpp
source/scwx/qt/map/draw_layer.cpp
Expand All @@ -114,7 +115,8 @@ set(SRC_MAP source/scwx/qt/map/alert_layer.cpp
source/scwx/qt/map/overlay_layer.cpp
source/scwx/qt/map/placefile_layer.cpp
source/scwx/qt/map/radar_product_layer.cpp
source/scwx/qt/map/radar_range_layer.cpp)
source/scwx/qt/map/radar_range_layer.cpp
source/scwx/qt/map/radar_site_layer.cpp)
set(HDR_MODEL source/scwx/qt/model/alert_model.hpp
source/scwx/qt/model/alert_proxy_model.hpp
source/scwx/qt/model/imgui_context_model.hpp
Expand Down
12 changes: 12 additions & 0 deletions scwx-qt/source/scwx/qt/main/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,18 @@ void MainWindowImpl::ConnectAnimationSignals()
&map::MapWidget::WidgetPainted,
timelineManager_.get(),
[=, this]() { timelineManager_->ReceiveMapWidgetPainted(i); });
connect(maps_[i],
&map::MapWidget::RadarSiteRequested,
this,
[this](const std::string& id)
{
for (map::MapWidget* map : maps_)
{
map->SelectRadarSite(id);
}

UpdateRadarSite();
});
}
}

Expand Down
20 changes: 17 additions & 3 deletions scwx-qt/source/scwx/qt/map/map_widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <scwx/qt/map/placefile_layer.hpp>
#include <scwx/qt/map/radar_product_layer.hpp>
#include <scwx/qt/map/radar_range_layer.hpp>
#include <scwx/qt/map/radar_site_layer.hpp>
#include <scwx/qt/model/imgui_context_model.hpp>
#include <scwx/qt/model/layer_model.hpp>
#include <scwx/qt/settings/general_settings.hpp>
Expand Down Expand Up @@ -164,6 +165,8 @@ class MapWidgetImpl : public QObject
std::shared_ptr<QMapLibreGL::Map> map_;
std::list<std::string> layerList_;

std::vector<std::shared_ptr<GenericLayer>> genericLayers_ {};

QStringList styleLayers_;
types::LayerVector customLayers_;

Expand All @@ -186,6 +189,7 @@ class MapWidgetImpl : public QObject
std::shared_ptr<OverlayLayer> overlayLayer_;
std::shared_ptr<PlacefileLayer> placefileLayer_;
std::shared_ptr<ColorTableLayer> colorTableLayer_;
std::shared_ptr<RadarSiteLayer> radarSiteLayer_ {nullptr};

std::list<std::shared_ptr<PlacefileLayer>> placefileLayers_ {};

Expand Down Expand Up @@ -800,6 +804,7 @@ void MapWidgetImpl::AddLayers()
map_->removeLayer(id.c_str());
}
layerList_.clear();
genericLayers_.clear();
placefileLayers_.clear();

// Update custom layer list from model
Expand Down Expand Up @@ -890,6 +895,16 @@ void MapWidgetImpl::AddLayer(types::LayerType type,
}
break;

// Create the radar site layer
case types::InformationLayer::RadarSite:
radarSiteLayer_ = std::make_shared<RadarSiteLayer>(context_);
AddLayer(layerName, radarSiteLayer_, before);
connect(radarSiteLayer_.get(),
&RadarSiteLayer::RadarSiteSelected,
widget_,
&MapWidget::RadarSiteRequested);
break;

default:
break;
}
Expand Down Expand Up @@ -953,6 +968,7 @@ void MapWidgetImpl::AddLayer(const std::string& id,
map_->addCustomLayer(id.c_str(), std::move(pHost), before.c_str());

layerList_.push_back(id);
genericLayers_.push_back(layer);
}
catch (const std::exception&)
{
Expand Down Expand Up @@ -1198,10 +1214,8 @@ void MapWidgetImpl::RunMousePicking()
util::maplibre::LatLongToScreenCoordinate(coordinate);

// For each layer in reverse
// TODO: All Generic Layers, not just Placefile Layers
bool itemPicked = false;
for (auto it = placefileLayers_.rbegin(); it != placefileLayers_.rend();
++it)
for (auto it = genericLayers_.rbegin(); it != genericLayers_.rend(); ++it)
{
// Run mouse picking for each layer
if ((*it)->RunMousePicking(
Expand Down
1 change: 1 addition & 0 deletions scwx-qt/source/scwx/qt/map/map_widget.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ private slots:
double bearing,
double pitch);
void MapStyleChanged(const std::string& styleName);
void RadarSiteRequested(const std::string& id);
void RadarSiteUpdated(std::shared_ptr<config::RadarSite> radarSite);
void RadarSweepUpdated();
void RadarSweepNotUpdated(types::NoUpdateReason reason);
Expand Down
173 changes: 173 additions & 0 deletions scwx-qt/source/scwx/qt/map/radar_site_layer.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,173 @@
#include <scwx/qt/map/radar_site_layer.hpp>
#include <scwx/qt/config/radar_site.hpp>
#include <scwx/qt/util/maplibre.hpp>
#include <scwx/qt/util/tooltip.hpp>
#include <scwx/common/geographic.hpp>
#include <scwx/util/logger.hpp>

// #include <GeographicLib/Geodesic.hpp>
#include <imgui.h>
#include <mbgl/util/constants.hpp>

namespace scwx
{
namespace qt
{
namespace map
{

static const std::string logPrefix_ = "scwx::qt::map::radar_site_layer";
static const auto logger_ = scwx::util::Logger::Create(logPrefix_);

class RadarSiteLayer::Impl
{
public:
explicit Impl(RadarSiteLayer* self) : self_ {self} {}
~Impl() = default;

void RenderRadarSite(const QMapLibreGL::CustomLayerRenderParameters& params,
std::shared_ptr<config::RadarSite>& radarSite);

RadarSiteLayer* self_;

std::vector<std::shared_ptr<config::RadarSite>> radarSites_ {};

glm::vec2 mapScreenCoordLocation_ {};
float mapScale_ {1.0f};
float mapBearingCos_ {1.0f};
float mapBearingSin_ {0.0f};
float halfWidth_ {};
float halfHeight_ {};

std::string hoverText_ {};
};

RadarSiteLayer::RadarSiteLayer(std::shared_ptr<MapContext> context) :
DrawLayer(context), p(std::make_unique<Impl>(this))
{
}

RadarSiteLayer::~RadarSiteLayer() = default;

void RadarSiteLayer::Initialize()
{
logger_->debug("Initialize()");

p->radarSites_ = config::RadarSite::GetAll();
}

void RadarSiteLayer::Render(
const QMapLibreGL::CustomLayerRenderParameters& params)
{
gl::OpenGLFunctions& gl = context()->gl();

context()->set_render_parameters(params);

// Update map screen coordinate and scale information
p->mapScreenCoordLocation_ = util::maplibre::LatLongToScreenCoordinate(
{params.latitude, params.longitude});
p->mapScale_ = std::pow(2.0, params.zoom) * mbgl::util::tileSize_D /
mbgl::util::DEGREES_MAX;
p->mapBearingCos_ = cosf(params.bearing * common::kDegreesToRadians);
p->mapBearingSin_ = sinf(params.bearing * common::kDegreesToRadians);
p->halfWidth_ = params.width * 0.5f;
p->halfHeight_ = params.height * 0.5f;

p->hoverText_.clear();

// Radar site ImGui windows shouldn't have padding
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2 {0.0f, 0.0f});

for (auto& radarSite : p->radarSites_)
{
p->RenderRadarSite(params, radarSite);
}

ImGui::PopStyleVar();

SCWX_GL_CHECK_ERROR();
}

void RadarSiteLayer::Impl::RenderRadarSite(
const QMapLibreGL::CustomLayerRenderParameters& params,
std::shared_ptr<config::RadarSite>& radarSite)
{
const std::string windowName = fmt::format("radar-site-{}", radarSite->id());

const auto screenCoordinates =
(util::maplibre::LatLongToScreenCoordinate(
{radarSite->latitude(), radarSite->longitude()}) -
mapScreenCoordLocation_) *
mapScale_;

// Rotate text according to map rotation
float rotatedX = screenCoordinates.x;
float rotatedY = screenCoordinates.y;
if (params.bearing != 0.0)
{
rotatedX = screenCoordinates.x * mapBearingCos_ -
screenCoordinates.y * mapBearingSin_;
rotatedY = screenCoordinates.x * mapBearingSin_ +
screenCoordinates.y * mapBearingCos_;
}

// Convert screen to ImGui coordinates
float x = rotatedX + halfWidth_;
float y = params.height - (rotatedY + halfHeight_);

// Setup window to hold text
ImGui::SetNextWindowPos(
ImVec2 {x, y}, ImGuiCond_Always, ImVec2 {0.5f, 0.5f});
if (ImGui::Begin(windowName.c_str(),
nullptr,
ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
ImGuiWindowFlags_AlwaysAutoResize))
{
// Render text
if (ImGui::Button(radarSite->id().c_str()))
{
Q_EMIT self_->RadarSiteSelected(radarSite->id());
}

// Store hover text for mouse picking pass
if (ImGui::IsItemHovered())
{
hoverText_ =
fmt::format("{} ({})\n{}\n{}, {}",
radarSite->id(),
radarSite->type_name(),
radarSite->location_name(),
common::GetLatitudeString(radarSite->latitude()),
common::GetLongitudeString(radarSite->longitude()));
}

// End window
ImGui::End();
}
}

void RadarSiteLayer::Deinitialize()
{
logger_->debug("Deinitialize()");

p->radarSites_.clear();
}

bool RadarSiteLayer::RunMousePicking(
const QMapLibreGL::CustomLayerRenderParameters& /* params */,
const QPointF& /* mouseLocalPos */,
const QPointF& mouseGlobalPos,
const glm::vec2& /* mouseCoords */)
{
if (!p->hoverText_.empty())
{
util::tooltip::Show(p->hoverText_, mouseGlobalPos);
return true;
}

return false;
}

} // namespace map
} // namespace qt
} // namespace scwx
40 changes: 40 additions & 0 deletions scwx-qt/source/scwx/qt/map/radar_site_layer.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#pragma once

#include <scwx/qt/map/draw_layer.hpp>

namespace scwx
{
namespace qt
{
namespace map
{

class RadarSiteLayer : public DrawLayer
{
Q_OBJECT
Q_DISABLE_COPY_MOVE(RadarSiteLayer)

public:
explicit RadarSiteLayer(std::shared_ptr<MapContext> context);
~RadarSiteLayer();

void Initialize() override final;
void Render(const QMapLibreGL::CustomLayerRenderParameters&) override final;
void Deinitialize() override final;

bool RunMousePicking(const QMapLibreGL::CustomLayerRenderParameters& params,
const QPointF& mouseLocalPos,
const QPointF& mouseGlobalPos,
const glm::vec2& mouseCoords) override final;

signals:
void RadarSiteSelected(const std::string& id);

private:
class Impl;
std::unique_ptr<Impl> p;
};

} // namespace map
} // namespace qt
} // namespace scwx
Loading

0 comments on commit 6e4501f

Please sign in to comment.