blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 01:20:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do initial work to get layer rendering

Browse source
This commit is contained in:
AdenKoperczak 2024-10-04 16:43:40 -04:00
parent f5d867cf1a
commit 0a0989e5f4
4 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scwx-qt/scwx-qt.cmake
View file

@ -95,6 +95,7 @@ set(HDR_MANAGER source/scwx/qt/manager/alert_manager.hpp
source/scwx/qt/manager/log_manager.hpp source/scwx/qt/manager/log_manager.hpp
source/scwx/qt/manager/media_manager.hpp source/scwx/qt/manager/media_manager.hpp
source/scwx/qt/manager/placefile_manager.hpp source/scwx/qt/manager/placefile_manager.hpp
source/scwx/qt/manager/poi_manager.hpp
source/scwx/qt/manager/position_manager.hpp source/scwx/qt/manager/position_manager.hpp
source/scwx/qt/manager/radar_product_manager.hpp source/scwx/qt/manager/radar_product_manager.hpp
source/scwx/qt/manager/radar_product_manager_notifier.hpp source/scwx/qt/manager/radar_product_manager_notifier.hpp
@ -111,6 +112,7 @@ set(SRC_MANAGER source/scwx/qt/manager/alert_manager.cpp
source/scwx/qt/manager/log_manager.cpp source/scwx/qt/manager/log_manager.cpp
source/scwx/qt/manager/media_manager.cpp source/scwx/qt/manager/media_manager.cpp
source/scwx/qt/manager/placefile_manager.cpp source/scwx/qt/manager/placefile_manager.cpp
source/scwx/qt/manager/poi_manager.cpp
source/scwx/qt/manager/position_manager.cpp source/scwx/qt/manager/position_manager.cpp
source/scwx/qt/manager/radar_product_manager.cpp source/scwx/qt/manager/radar_product_manager.cpp
source/scwx/qt/manager/radar_product_manager_notifier.cpp source/scwx/qt/manager/radar_product_manager_notifier.cpp
@ -132,6 +134,7 @@ set(HDR_MAP source/scwx/qt/map/alert_layer.hpp
source/scwx/qt/map/overlay_layer.hpp source/scwx/qt/map/overlay_layer.hpp
source/scwx/qt/map/overlay_product_layer.hpp source/scwx/qt/map/overlay_product_layer.hpp
source/scwx/qt/map/placefile_layer.hpp source/scwx/qt/map/placefile_layer.hpp
source/scwx/qt/map/poi_layer.hpp
source/scwx/qt/map/radar_product_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) source/scwx/qt/map/radar_site_layer.hpp)
@ -146,6 +149,7 @@ set(SRC_MAP source/scwx/qt/map/alert_layer.cpp
source/scwx/qt/map/overlay_layer.cpp source/scwx/qt/map/overlay_layer.cpp
source/scwx/qt/map/overlay_product_layer.cpp source/scwx/qt/map/overlay_product_layer.cpp
source/scwx/qt/map/placefile_layer.cpp source/scwx/qt/map/placefile_layer.cpp
source/scwx/qt/map/poi_layer.cpp
source/scwx/qt/map/radar_product_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) source/scwx/qt/map/radar_site_layer.cpp)
@ -215,6 +219,7 @@ set(HDR_TYPES source/scwx/qt/types/alert_types.hpp
source/scwx/qt/types/location_types.hpp source/scwx/qt/types/location_types.hpp
source/scwx/qt/types/map_types.hpp source/scwx/qt/types/map_types.hpp
source/scwx/qt/types/media_types.hpp source/scwx/qt/types/media_types.hpp
source/scwx/qt/types/poi_types.hpp
source/scwx/qt/types/qt_types.hpp source/scwx/qt/types/qt_types.hpp
source/scwx/qt/types/radar_product_record.hpp source/scwx/qt/types/radar_product_record.hpp
source/scwx/qt/types/text_event_key.hpp source/scwx/qt/types/text_event_key.hpp

3
scwx-qt/source/scwx/qt/main/main_window.cpp
View file

@ -6,6 +6,7 @@
#include <scwx/qt/manager/alert_manager.hpp> #include <scwx/qt/manager/alert_manager.hpp>
#include <scwx/qt/manager/hotkey_manager.hpp> #include <scwx/qt/manager/hotkey_manager.hpp>
#include <scwx/qt/manager/placefile_manager.hpp> #include <scwx/qt/manager/placefile_manager.hpp>
#include <scwx/qt/manager/poi_manager.hpp>
#include <scwx/qt/manager/position_manager.hpp> #include <scwx/qt/manager/position_manager.hpp>
#include <scwx/qt/manager/radar_product_manager.hpp> #include <scwx/qt/manager/radar_product_manager.hpp>
#include <scwx/qt/manager/text_event_manager.hpp> #include <scwx/qt/manager/text_event_manager.hpp>
@ -91,6 +92,7 @@ public:
updateDialog_ {nullptr}, updateDialog_ {nullptr},
alertManager_ {manager::AlertManager::Instance()}, alertManager_ {manager::AlertManager::Instance()},
placefileManager_ {manager::PlacefileManager::Instance()}, placefileManager_ {manager::PlacefileManager::Instance()},
poiManager_ {manager::POIManager::Instance()},
positionManager_ {manager::PositionManager::Instance()}, positionManager_ {manager::PositionManager::Instance()},
textEventManager_ {manager::TextEventManager::Instance()}, textEventManager_ {manager::TextEventManager::Instance()},
timelineManager_ {manager::TimelineManager::Instance()}, timelineManager_ {manager::TimelineManager::Instance()},
@ -217,6 +219,7 @@ public:
std::shared_ptr<manager::HotkeyManager> hotkeyManager_ { std::shared_ptr<manager::HotkeyManager> hotkeyManager_ {
manager::HotkeyManager::Instance()}; manager::HotkeyManager::Instance()};
std::shared_ptr<manager::PlacefileManager> placefileManager_; std::shared_ptr<manager::PlacefileManager> placefileManager_;
std::shared_ptr<manager::POIManager> poiManager_;
std::shared_ptr<manager::PositionManager> positionManager_; std::shared_ptr<manager::PositionManager> positionManager_;
std::shared_ptr<manager::TextEventManager> textEventManager_; std::shared_ptr<manager::TextEventManager> textEventManager_;
std::shared_ptr<manager::TimelineManager> timelineManager_; std::shared_ptr<manager::TimelineManager> timelineManager_;

9
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -12,6 +12,7 @@
#include <scwx/qt/map/overlay_layer.hpp> #include <scwx/qt/map/overlay_layer.hpp>
#include <scwx/qt/map/overlay_product_layer.hpp> #include <scwx/qt/map/overlay_product_layer.hpp>
#include <scwx/qt/map/placefile_layer.hpp> #include <scwx/qt/map/placefile_layer.hpp>
#include <scwx/qt/map/poi_layer.hpp>
#include <scwx/qt/map/radar_product_layer.hpp> #include <scwx/qt/map/radar_product_layer.hpp>
#include <scwx/qt/map/radar_range_layer.hpp> #include <scwx/qt/map/radar_range_layer.hpp>
#include <scwx/qt/map/radar_site_layer.hpp> #include <scwx/qt/map/radar_site_layer.hpp>
@ -81,6 +82,7 @@ public:
radarProductLayer_ {nullptr}, radarProductLayer_ {nullptr},
overlayLayer_ {nullptr}, overlayLayer_ {nullptr},
placefileLayer_ {nullptr}, placefileLayer_ {nullptr},
poiLayer_ {nullptr},
colorTableLayer_ {nullptr}, colorTableLayer_ {nullptr},
autoRefreshEnabled_ {true}, autoRefreshEnabled_ {true},
autoUpdateEnabled_ {true}, autoUpdateEnabled_ {true},
@ -223,6 +225,7 @@ public:
std::shared_ptr<OverlayLayer> overlayLayer_; std::shared_ptr<OverlayLayer> overlayLayer_;
std::shared_ptr<OverlayProductLayer> overlayProductLayer_ {nullptr}; std::shared_ptr<OverlayProductLayer> overlayProductLayer_ {nullptr};
std::shared_ptr<PlacefileLayer> placefileLayer_; std::shared_ptr<PlacefileLayer> placefileLayer_;
std::shared_ptr<POILayer> poiLayer_;
std::shared_ptr<ColorTableLayer> colorTableLayer_; std::shared_ptr<ColorTableLayer> colorTableLayer_;
std::shared_ptr<RadarSiteLayer> radarSiteLayer_ {nullptr}; std::shared_ptr<RadarSiteLayer> radarSiteLayer_ {nullptr};
@ -1232,6 +1235,12 @@ void MapWidgetImpl::AddLayer(types::LayerType type,
{ widget_->RadarSiteRequested(id); }); { widget_->RadarSiteRequested(id); });
break; break;
// Create the radar site layer
case types::InformationLayer::POILayer:
poiLayer_ = std::make_shared<POILayer>(context_);
AddLayer(layerName, poiLayer_, before);
break;
default: default:
break; break;
} }

1
scwx-qt/source/scwx/qt/model/layer_model.cpp
View file

@ -43,6 +43,7 @@ static const std::vector<types::LayerInfo> kDefaultLayers_ {
types::InformationLayer::RadarSite, types::InformationLayer::RadarSite,
false, false,
{false, false, false, false}}, {false, false, false, false}},
{types::LayerType::Information, types::InformationLayer::POILayer, true},
{types::LayerType::Data, types::DataLayer::RadarRange, true}, {types::LayerType::Data, types::DataLayer::RadarRange, true},
{types::LayerType::Alert, awips::Phenomenon::Tornado, true}, {types::LayerType::Alert, awips::Phenomenon::Tornado, true},
{types::LayerType::Alert, awips::Phenomenon::SnowSquall, true}, {types::LayerType::Alert, awips::Phenomenon::SnowSquall, true},