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

refs #212, MS review, https://dev.vatsim-germany.org/issues/212#note-6

Browse Source
This commit is contained in:
Klaus Basan
2014-04-30 01:02:36 +02:00
parent b4615e8b75
commit 464c17085c
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/blackgui/mainwindow_menus.cpp
View File

@@ -85,8 +85,8 @@ void MainWindow::audioIconContextMenu(const QPoint &position)
this->m_contextMenuAudio->addAction("Toogle mute"); this->m_contextMenuAudio->addAction("Toogle mute");
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
// #if defined required? seems to be redundant // QSysInfo::WindowsVersion only available on Win platforms
if (QSysInfo::WindowsVersion && QSysInfo::WV_NT_based) if (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)
{ {
this->m_contextMenuAudio->addAction("Mixer"); this->m_contextMenuAudio->addAction("Mixer");
} }

2
src/blackgui/userlistmodel.h
View File

@@ -25,7 +25,7 @@ namespace BlackGui
}; };
//! \brief Constructor //! \brief Constructor
CUserListModel(UserMode userMode, QObject *parent = nullptr); explicit CUserListModel(UserMode userMode, QObject *parent = nullptr);
//! \brief Destructor //! \brief Destructor
virtual ~CUserListModel() {} virtual ~CUserListModel() {}

2
src/blackgui/viewbase.h
View File

@@ -19,7 +19,7 @@ namespace BlackGui
protected: protected:
//! Constructor //! Constructor
CViewBase(QWidget *parent) : QTableView(parent) CViewBase(QWidget *parent, ModelClass *model = nullptr) : QTableView(parent), m_model(model)
{ {
this->setSortingEnabled(true); this->setSortingEnabled(true);
this->horizontalHeader()->setStretchLastSection(true); this->horizontalHeader()->setStretchLastSection(true);

16
src/blackmisc/avaltitude.cpp
View File

@@ -163,31 +163,29 @@ namespace BlackMisc
if (v.contains("FL", Qt::CaseInsensitive)) if (v.contains("FL", Qt::CaseInsensitive))
{ {
v = v.replace("FL", "", Qt::CaseInsensitive).trimmed(); v = v.replace("FL", "", Qt::CaseInsensitive).trimmed();
this->m_datum = FlightLevel;
bool ok = false; bool ok = false;
double dv = v.toDouble(&ok) * 100.0; double dv = v.toDouble(&ok) * 100.0;
CLength l(ok ? dv : 0.0, CAltitude a(ok ? dv : 0.0, FlightLevel,
ok ? CLengthUnit::ft() : CLengthUnit::nullUnit()); ok ? CLengthUnit::ft() : CLengthUnit::nullUnit());
this->set(l); *this = a;
return; return;
} }
// normal altitude, AGL/MSL // normal altitude, AGL/MSL
ReferenceDatum rd = MeanSeaLevel;
if (v.contains("MSL", Qt::CaseInsensitive)) if (v.contains("MSL", Qt::CaseInsensitive))
{ {
v = v.replace("MSL", "", Qt::CaseInsensitive).trimmed(); v = v.replace("MSL", "", Qt::CaseInsensitive).trimmed();
this->m_datum = MeanSeaLevel; rd = MeanSeaLevel;
} }
else if (v.contains("AGL")) else if (v.contains("AGL"))
{ {
v = v.replace("AGL", "", Qt::CaseInsensitive).trimmed(); v = v.replace("AGL", "", Qt::CaseInsensitive).trimmed();
this->m_datum = AboveGround; rd = AboveGround;
} }
else
this->m_datum = MeanSeaLevel;
CLength l = BlackMisc::PhysicalQuantities::CPqString::parse<CLength>(v); CLength l = BlackMisc::PhysicalQuantities::CPqString::parse<CLength>(v);
this->set(l); *this = CAltitude(l, rd);
} }
/* /*