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

Removed redundant speed formatter, use existing CSpeedKtsFormatter

Browse Source 
CAircraftSpeedFormatter renamed to CSpeedKtsFormatter in same step
This commit is contained in:
Klaus Basan
2016-12-30 01:59:14 +01:00
committed by Mathew Sutcliffe
parent 46d805830d
commit c94584a19f
4 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackgui/models/windlayerlistmodel.cpp
View File

@@ -7,8 +7,8 @@
* contained in the LICENSE file.
*/
#include "blackgui/models/windlayerlistmodel.h"
#include "blackgui/models/columnformatters.h"
#include "windlayerlistmodel.h"
#include "columnformatters.h"
#include <Qt>
#include <QtGlobal>
@@ -21,37 +21,13 @@ namespace BlackGui
{
namespace Models
{
//! Speed
class CSpeedFormatter : public CPhysiqalQuantiyFormatter<BlackMisc::PhysicalQuantities::CSpeedUnit, BlackMisc::PhysicalQuantities::CSpeed>
{
public:
//! Constructor
CSpeedFormatter(int alignment = alignRightVCenter(), bool withUnit = true, bool i18n = true) : CPhysiqalQuantiyFormatter(BlackMisc::PhysicalQuantities::CSpeedUnit::kts(), 0, alignment, withUnit, i18n) {}
//! \copydoc CDefaultFormatter::displayRole
virtual CVariant displayRole(const CVariant &dataCVariant) const override
{
// special treatment for some cases
BlackMisc::PhysicalQuantities::CSpeed s = dataCVariant.value<BlackMisc::PhysicalQuantities::CSpeed>();
if (!s.isNull() && (s.isPositiveWithEpsilonConsidered() || s.isZeroEpsilonConsidered()))
{
return CPhysiqalQuantiyFormatter::displayRole(dataCVariant);
}
else
{
return "";
}
}
};
CWindLayerListModel::CWindLayerListModel(QObject *parent) :
CListModelBase("WindLayerListModel", parent)
{
this->m_columns.addColumn(CColumn("level", CWindLayer::IndexLevel, new CAltitudeFormatter()));
this->m_columns.addColumn(CColumn("direction", CWindLayer::IndexDirection, new CAngleDegreeFormatter()));
this->m_columns.addColumn(CColumn("speed", CWindLayer::IndexSpeed, new CSpeedFormatter()));
this->m_columns.addColumn(CColumn("gust speed", CWindLayer::IndexGustSpeed, new CSpeedFormatter()));
this->m_columns.addColumn(CColumn("speed", CWindLayer::IndexSpeed, new CSpeedKtsFormatter()));
this->m_columns.addColumn(CColumn("gust speed", CWindLayer::IndexGustSpeed, new CSpeedKtsFormatter()));
// default sort order
this->setSortColumnByPropertyIndex(CWindLayer::IndexLevel);