flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 01:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T225, use coordinate dialog in weather component

Browse Source 
Remark: There was a redundant, also unfinished code in weather UI component for coordinate entry. This is now encapsulated in coordinate form/dialog.
This commit is contained in:
Klaus Basan
2018-01-18 14:42:55 +01:00
parent a764ea7534
commit 0916c90038
4 changed files with 89 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackgui/components/weathercomponent.h
View File

@@ -12,7 +12,8 @@
#ifndef BLACKGUI_WEATHERCOMPONENT_H
#define BLACKGUI_WEATHERCOMPONENT_H
#include "blackgui/components/enablefordockwidgetinfoarea.h"
#include "enablefordockwidgetinfoarea.h"
#include "coordinatedialog.h"
#include "blackgui/blackguiexport.h"
#include "blackcore/actionbind.h"
#include "blackmisc/geo/coordinategeodetic.h"
@@ -35,6 +36,7 @@ namespace Ui { class CWeatherComponent; }
namespace BlackGui
{
class CDockWidgetInfoArea;
namespace Components
{
//! Weather component
@@ -55,30 +57,30 @@ namespace BlackGui
//! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
private slots:
void ps_infoAreaTabBarChanged(int index);
private:
void toggleUseOwnAircraftPosition(bool checked);
void infoAreaTabBarChanged(int index);
void toggleUseOwnAircraftPosition(bool useOwnAircraftPosition);
void toggleWeatherActivation();
void showCoordinateDialog();
void setWeatherScenario(int index);
void setCavok();
void updateWeatherInformation();
void weatherGridReceived(const BlackMisc::Weather::CWeatherGrid &weatherGrid, const BlackMisc::CIdentifier &identifier);
void setupConnections();
void setupInputValidators();
void setupCompleter();
void setWeatherGrid(const BlackMisc::Weather::CWeatherGrid &weatherGrid);
void requestWeatherGrid(const BlackMisc::Geo::CCoordinateGeodetic &position);
QScopedPointer<Ui::CWeatherComponent> ui;
QScopedPointer<CCoordinateDialog> m_coordinateDialog { new CCoordinateDialog(this) };
QVector<BlackMisc::Weather::CWeatherScenario> m_weatherScenarios;
QTimer m_weatherUpdateTimer { this };
BlackMisc::Geo::CCoordinateGeodetic m_lastOwnAircraftPosition;
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TSelectedWeatherScenario> m_weatherScenarioSetting { this };
BlackCore::CActionBindings m_hotkeyBindings;
BlackCore::CActionBindings m_hotkeyBindings; //!< allow binding of hotkey
bool m_isWeatherActivated = false;
};
} // namespace