mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 17:40:05 +00:00
Refactor Alert Dock Widget to its own class
This commit is contained in:
Dan Paulat
parent
1c5e0d51b7
commit
f8021b00bf
6 changed files with 323 additions and 132 deletions
|
|
@ -7,9 +7,8 @@
|
|||
#include <scwx/qt/manager/settings_manager.hpp>
|
||||
#include <scwx/qt/manager/text_event_manager.hpp>
|
||||
#include <scwx/qt/map/map_widget.hpp>
|
||||
#include <scwx/qt/model/alert_model.hpp>
|
||||
#include <scwx/qt/model/radar_product_model.hpp>
|
||||
#include <scwx/qt/types/qt_types.hpp>
|
||||
#include <scwx/qt/ui/alert_dock_widget.hpp>
|
||||
#include <scwx/qt/ui/flow_layout.hpp>
|
||||
#include <scwx/qt/ui/level2_products_widget.hpp>
|
||||
#include <scwx/qt/ui/level2_settings_widget.hpp>
|
||||
|
|
@ -22,7 +21,6 @@
|
|||
|
||||
#include <QFileDialog>
|
||||
#include <QMessageBox>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QSplitter>
|
||||
#include <QStandardPaths>
|
||||
#include <QToolButton>
|
||||
|
|
@ -48,9 +46,8 @@ public:
|
|||
activeMap_ {nullptr},
|
||||
level2ProductsWidget_ {nullptr},
|
||||
level2SettingsWidget_ {nullptr},
|
||||
alertDockWidget_ {nullptr},
|
||||
radarSiteDialog_ {nullptr},
|
||||
alertModel_ {std::make_unique<model::AlertModel>()},
|
||||
alertProxyModel_ {std::make_unique<QSortFilterProxyModel>()},
|
||||
radarProductModel_ {nullptr},
|
||||
maps_ {},
|
||||
elevationCuts_ {},
|
||||
|
|
@ -79,15 +76,11 @@ public:
|
|||
settings_.setApiKey(QString {mapboxApiKey.c_str()});
|
||||
settings_.setCacheDatabasePath(QString {cacheDbPath.c_str()});
|
||||
settings_.setCacheDatabaseMaximumSize(20 * 1024 * 1024);
|
||||
|
||||
alertProxyModel_->setSourceModel(alertModel_.get());
|
||||
alertProxyModel_->setSortRole(types::SortRole);
|
||||
alertProxyModel_->setFilterCaseSensitivity(Qt::CaseInsensitive);
|
||||
alertProxyModel_->setFilterKeyColumn(-1);
|
||||
}
|
||||
~MainWindowImpl() = default;
|
||||
|
||||
void ConfigureMapLayout();
|
||||
void ConnectAlertSignals();
|
||||
void ConnectMapSignals();
|
||||
void ConnectOtherSignals();
|
||||
void HandleFocusChange(QWidget* focused);
|
||||
|
|
@ -114,10 +107,9 @@ public:
|
|||
|
||||
ui::Level3ProductsWidget* level3ProductsWidget_;
|
||||
|
||||
ui::AlertDockWidget* alertDockWidget_;
|
||||
ui::RadarSiteDialog* radarSiteDialog_;
|
||||
|
||||
std::unique_ptr<model::AlertModel> alertModel_;
|
||||
std::unique_ptr<QSortFilterProxyModel> alertProxyModel_;
|
||||
std::unique_ptr<model::RadarProductModel> radarProductModel_;
|
||||
|
||||
std::vector<map::MapWidget*> maps_;
|
||||
|
|
@ -148,6 +140,11 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||
ui->vcpValueLabel->setVisible(false);
|
||||
ui->vcpDescriptionLabel->setVisible(false);
|
||||
|
||||
// Configure Alert Dock
|
||||
p->alertDockWidget_ = new ui::AlertDockWidget(this);
|
||||
p->alertDockWidget_->setVisible(false);
|
||||
addDockWidget(Qt::BottomDockWidgetArea, p->alertDockWidget_);
|
||||
|
||||
// Configure Menu
|
||||
ui->menuView->insertAction(ui->actionRadarToolbox,
|
||||
ui->radarToolboxDock->toggleViewAction());
|
||||
|
|
@ -161,8 +158,8 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||
ui->actionResourceExplorer->setVisible(false);
|
||||
|
||||
ui->menuView->insertAction(ui->actionAlerts,
|
||||
ui->alertDock->toggleViewAction());
|
||||
ui->alertDock->toggleViewAction()->setText(tr("&Alerts"));
|
||||
p->alertDockWidget_->toggleViewAction());
|
||||
p->alertDockWidget_->toggleViewAction()->setText(tr("&Alerts"));
|
||||
ui->actionAlerts->setVisible(false);
|
||||
|
||||
// Configure Resource Explorer Dock
|
||||
|
|
@ -171,13 +168,6 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||
p->radarProductModel_ = std::make_unique<model::RadarProductModel>();
|
||||
ui->resourceTreeView->setModel(p->radarProductModel_->model());
|
||||
|
||||
// Configure Alert Dock
|
||||
ui->alertDock->setVisible(false);
|
||||
|
||||
ui->alertView->setModel(p->alertProxyModel_.get());
|
||||
|
||||
ui->alertSettings->addAction(ui->actionActiveAlerts);
|
||||
|
||||
// Configure Map
|
||||
p->ConfigureMapLayout();
|
||||
|
||||
|
|
@ -475,19 +465,10 @@ void MainWindowImpl::ConnectOtherSignals()
|
|||
&ui::Level2SettingsWidget::ElevationSelected,
|
||||
mainWindow_,
|
||||
[&](float elevation) { SelectElevation(activeMap_, elevation); });
|
||||
connect(mainWindow_->ui->alertFilter,
|
||||
&QLineEdit::textChanged,
|
||||
alertProxyModel_.get(),
|
||||
&QSortFilterProxyModel::setFilterWildcard);
|
||||
connect(mainWindow_,
|
||||
&MainWindow::ActiveMapMoved,
|
||||
alertModel_.get(),
|
||||
&model::AlertModel::HandleMapUpdate,
|
||||
Qt::QueuedConnection);
|
||||
connect(&manager::TextEventManager::Instance(),
|
||||
&manager::TextEventManager::AlertUpdated,
|
||||
alertModel_.get(),
|
||||
&model::AlertModel::HandleAlert,
|
||||
alertDockWidget_,
|
||||
&ui::AlertDockWidget::HandleMapUpdate,
|
||||
Qt::QueuedConnection);
|
||||
connect(mainWindow_,
|
||||
&MainWindow::ActiveMapMoved,
|
||||
|
|
|
|||
|
|
@ -307,95 +307,6 @@
|
|||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QDockWidget" name="alertDock">
|
||||
<property name="windowTitle">
|
||||
<string>Alerts</string>
|
||||
</property>
|
||||
<attribute name="dockWidgetArea">
|
||||
<number>8</number>
|
||||
</attribute>
|
||||
<widget class="QWidget" name="radarDockContents">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_5">
|
||||
<item>
|
||||
<widget class="QTreeView" name="alertView">
|
||||
<property name="alternatingRowColors">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="indentation">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="sortingEnabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QFrame" name="frame_2">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="alertFilter">
|
||||
<property name="placeholderText">
|
||||
<string>Filter</string>
|
||||
</property>
|
||||
<property name="clearButtonEnabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="alertSettings">
|
||||
<property name="toolTip">
|
||||
<string>Settings</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../../../scwx-qt.qrc">
|
||||
<normaloff>:/res/icons/font-awesome-6/sliders-solid.svg</normaloff>:/res/icons/font-awesome-6/sliders-solid.svg</iconset>
|
||||
</property>
|
||||
<property name="popupMode">
|
||||
<enum>QToolButton::InstantPopup</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<action name="actionExit">
|
||||
<property name="text">
|
||||
<string>E&xit</string>
|
||||
|
|
@ -431,14 +342,6 @@
|
|||
<string>&Alerts</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionActiveAlerts">
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>&Active Alerts</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources>
|
||||
<include location="../../../../scwx-qt.qrc"/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue