flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15: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);
}
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
protected:
// no bug, Qt expects columns rows
QGenericMatrix<Columns, Rows, double> m_matrix; //!< backing data
@@ -217,12 +223,6 @@ namespace BlackMisc
//! \copydoc CValueObject::unmarshallFromDbus
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
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();
break;
case IndexUnit:
this->m_unit.fromQVariant(variant);
this->m_unit.convertFromQVariant(variant);
break;
case IndexValueRounded0DigitsWithUnit:
case IndexValueRounded1DigitsWithUnit: