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

Merge pull request #281 from AdenKoperczak/location_markers

Browse source 
Add Location Markers (Part 1)
This commit is contained in:
Dan Paulat 2024-10-17 21:26:52 -05:00 • committed by GitHub
commit 1843f387ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 1343 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
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/hotkey_manager.hpp>
#include <scwx/qt/manager/placefile_manager.hpp>
#include <scwx/qt/manager/marker_manager.hpp>
#include <scwx/qt/manager/position_manager.hpp>
#include <scwx/qt/manager/radar_product_manager.hpp>
#include <scwx/qt/manager/text_event_manager.hpp>
@ -30,6 +31,7 @@
#include <scwx/qt/ui/level2_settings_widget.hpp>
#include <scwx/qt/ui/level3_products_widget.hpp>
#include <scwx/qt/ui/placefile_dialog.hpp>
#include <scwx/qt/ui/marker_dialog.hpp>
#include <scwx/qt/ui/radar_site_dialog.hpp>
#include <scwx/qt/ui/settings_dialog.hpp>
#include <scwx/qt/ui/update_dialog.hpp>
@ -86,11 +88,13 @@ public:
imGuiDebugDialog_ {nullptr},
layerDialog_ {nullptr},
placefileDialog_ {nullptr},
markerDialog_ {nullptr},
radarSiteDialog_ {nullptr},
settingsDialog_ {nullptr},
updateDialog_ {nullptr},
alertManager_ {manager::AlertManager::Instance()},
placefileManager_ {manager::PlacefileManager::Instance()},
markerManager_ {manager::MarkerManager::Instance()},
positionManager_ {manager::PositionManager::Instance()},
textEventManager_ {manager::TextEventManager::Instance()},
timelineManager_ {manager::TimelineManager::Instance()},
@ -203,6 +207,7 @@ public:
ui::ImGuiDebugDialog* imGuiDebugDialog_;
ui::LayerDialog* layerDialog_;
ui::PlacefileDialog* placefileDialog_;
ui::MarkerDialog* markerDialog_;
ui::RadarSiteDialog* radarSiteDialog_;
ui::SettingsDialog* settingsDialog_;
ui::UpdateDialog* updateDialog_;
@ -217,6 +222,7 @@ public:
std::shared_ptr<manager::HotkeyManager> hotkeyManager_ {
manager::HotkeyManager::Instance()};
std::shared_ptr<manager::PlacefileManager> placefileManager_;
std::shared_ptr<manager::MarkerManager> markerManager_;
std::shared_ptr<manager::PositionManager> positionManager_;
std::shared_ptr<manager::TextEventManager> textEventManager_;
std::shared_ptr<manager::TimelineManager> timelineManager_;
@ -303,6 +309,9 @@ MainWindow::MainWindow(QWidget* parent) :
// Placefile Manager Dialog
p->placefileDialog_ = new ui::PlacefileDialog(this);
// Marker Manager Dialog
p->markerDialog_ = new ui::MarkerDialog(this);
// Layer Dialog
p->layerDialog_ = new ui::LayerDialog(this);
@ -610,6 +619,11 @@ void MainWindow::on_actionPlacefileManager_triggered()
p->placefileDialog_->show();
}
void MainWindow::on_actionMarkerManager_triggered()
{
p->markerDialog_->show();
}
void MainWindow::on_actionLayerManager_triggered()
{
p->layerDialog_->show();

1
scwx-qt/source/scwx/qt/main/main_window.hpp
View file

@ -44,6 +44,7 @@ private slots:
void on_actionRadarRange_triggered(bool checked);
void on_actionRadarSites_triggered(bool checked);
void on_actionPlacefileManager_triggered();
void on_actionMarkerManager_triggered();
void on_actionLayerManager_triggered();
void on_actionImGuiDebug_triggered();
void on_actionDumpLayerList_triggered();

16
scwx-qt/source/scwx/qt/main/main_window.ui
View file

@ -39,7 +39,7 @@
<x>0</x>
<y>0</y>
<width>1024</width>
<height>33</height>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@ -104,6 +104,7 @@
</property>
<addaction name="actionPlacefileManager"/>
<addaction name="actionLayerManager"/>
<addaction name="actionMarkerManager"/>
</widget>
<addaction name="menuFile"/>
<addaction name="menuView"/>
@ -152,8 +153,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>190</width>
<height>686</height>
<width>205</width>
<height>701</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
@ -487,6 +488,15 @@
<string>&amp;GPS Info</string>
</property>
</action>
<action name="actionMarkerManager">
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/house-solid.svg</normaloff>:/res/icons/font-awesome-6/house-solid.svg</iconset>
</property>
<property name="text">
<string>Location &amp;Marker Manager</string>
</property>
</action>
</widget>
<resources>
<include location="../../../../scwx-qt.qrc"/>