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

refs #247 Fixed mistakes.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-11-12 19:10:51 +00:00
parent 57b2a6b588
commit a2c0a893c0
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/mathmatrixbase.h
View File

@@ -204,6 +204,12 @@ namespace BlackMisc
return this->getElement(row, column); return this->getElement(row, column);
} }
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
protected: protected:
// no bug, Qt expects columns rows // no bug, Qt expects columns rows
QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data
@@ -217,12 +223,6 @@ namespace BlackMisc
//! \copydoc CValueObject::unmarshallFromDbus //! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override; virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::convertToQString //! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override; virtual QString convertToQString(bool i18n = false) const override;

2
src/blackmisc/pqphysicalquantity.cpp
View File

@@ -332,7 +332,7 @@ namespace BlackMisc
this->m_value = variant.toDouble(); this->m_value = variant.toDouble();
break; break;
case IndexUnit: case IndexUnit:
this->m_unit.fromQVariant(variant); this->m_unit.convertFromQVariant(variant);
break; break;
case IndexValueRounded0DigitsWithUnit: case IndexValueRounded0DigitsWithUnit:
case IndexValueRounded1DigitsWithUnit: case IndexValueRounded1DigitsWithUnit:

4
src/blacksim/fscommon/aircraftcfgentrieslist.cpp
View File

@@ -103,8 +103,8 @@ namespace BlackSim
qDBusRegisterMetaType<BlackMisc::CSequence<CAircraftCfgEntries>>(); qDBusRegisterMetaType<BlackMisc::CSequence<CAircraftCfgEntries>>();
qRegisterMetaType<BlackMisc::CCollection<CAircraftCfgEntries>>(); qRegisterMetaType<BlackMisc::CCollection<CAircraftCfgEntries>>();
qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftCfgEntries>>(); qDBusRegisterMetaType<BlackMisc::CCollection<CAircraftCfgEntries>>();
qRegisterMetaType<CAircraftCfgEntries>(); qRegisterMetaType<CAircraftCfgEntriesList>();
qDBusRegisterMetaType<CAircraftCfgEntries>(); qDBusRegisterMetaType<CAircraftCfgEntriesList>();
} }
} // namespace } // namespace

2
src/blacksim/fscommon/aircraftmapping.cpp
View File

@@ -142,7 +142,7 @@ namespace BlackSim
{ {
if (index.isMyself()) if (index.isMyself())
{ {
this->setPropertyByIndex(variant, index); this->convertFromQVariant(variant);
return; return;
} }
ColumnIndex i = index.frontCasted<ColumnIndex>(); ColumnIndex i = index.frontCasted<ColumnIndex>();