refs #814, allow to disable aircraft parts updates, mostly for testing

* added flag in setup
* and UI
* plus some formatting in driver classes, removed unused member
This commit is contained in:
Klaus Basan
2016-11-29 01:14:47 +01:00
parent 8f779fff35
commit df2073e5e6
7 changed files with 94 additions and 51 deletions

View File

@@ -34,6 +34,11 @@ namespace BlackMisc
return isRenderingEnabled() && (isMaxAircraftRestricted() || isMaxDistanceRestricted());
}
bool CInterpolationAndRenderingSetup::isAircraftPartsEnabled() const
{
return this->m_enabledAircraftParts;
}
int CInterpolationAndRenderingSetup::getMaxRenderedAircraft() const
{
return (m_maxRenderedAircraft <= InfiniteAircraft()) ? m_maxRenderedAircraft : InfiniteAircraft();
@@ -79,6 +84,13 @@ namespace BlackMisc
return true;
}
bool CInterpolationAndRenderingSetup::setEnabledAircraftParts(bool enabled)
{
if (this->m_enabledAircraftParts == enabled) { return false; }
m_enabledAircraftParts = enabled;
return true;
}
void CInterpolationAndRenderingSetup::clearMaxRenderedDistance()
{
this->setMaxRenderedDistance(CLength(0.0, CLengthUnit::nullUnit()));
@@ -154,6 +166,8 @@ namespace BlackMisc
return CVariant::fromValue(m_maxRenderedAircraft);
case IndexMaxRenderedDistance:
return CVariant::fromValue(m_maxRenderedDistance);
case IndexEnabledAircraftParts:
return CVariant::fromValue(m_enabledAircraftParts);
default:
return CValueObject::propertyByIndex(index);
}
@@ -184,6 +198,9 @@ namespace BlackMisc
case IndexMaxRenderedDistance:
this->m_maxRenderedDistance = variant.value<CLength>();
break;
case IndexEnabledAircraftParts:
this->m_enabledAircraftParts = variant.toBool();
break;
default:
CValueObject::setPropertyByIndex(index, variant);
break;

View File

@@ -34,7 +34,8 @@ namespace BlackMisc
IndexSimulatorDebugMessages,
IndexForceFullInterpolation,
IndexMaxRenderedAircraft,
IndexMaxRenderedDistance
IndexMaxRenderedDistance,
IndexEnabledAircraftParts
};
//! Constructor.
@@ -70,6 +71,9 @@ namespace BlackMisc
//! Max. distance for rendering
bool setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance);
//! Set enabled aircraft parts
bool setEnabledAircraftParts(bool enabled);
//! Disable
void clearMaxRenderedDistance();
@@ -79,6 +83,9 @@ namespace BlackMisc
//! Rendering enabled, but restricted
bool isRenderingRestricted() const;
//! Aircraft parts enabled
bool isAircraftPartsEnabled() const;
//! Max.distance for rendering
BlackMisc::PhysicalQuantities::CLength getMaxRenderedDistance() const { return m_maxRenderedDistance; }
@@ -107,9 +114,10 @@ namespace BlackMisc
void setPropertyByIndex(const BlackMisc::CPropertyIndex &index, const CVariant &variant);
private:
bool m_interpolatorDebugMessage = false; //! Debug messages in interpolator
bool m_simulatorDebugMessages = false; //! Debug messages of simulator (aka plugin)
bool m_forceFullInterpolation = false; //! always do a full interpolation, even if aircraft is not moving
bool m_interpolatorDebugMessage = false; //! Debug messages in interpolator
bool m_simulatorDebugMessages = false; //! Debug messages of simulator (aka plugin)
bool m_forceFullInterpolation = false; //! always do a full interpolation, even if aircraft is not moving
bool m_enabledAircraftParts = true; //! Update aircraft parts
int m_maxRenderedAircraft = InfiniteAircraft(); //!< max.rendered aircraft
BlackMisc::PhysicalQuantities::CLength m_maxRenderedDistance { 0.0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit()}; //!< max.distance for rendering
@@ -118,6 +126,7 @@ namespace BlackMisc
BLACK_METAMEMBER(interpolatorDebugMessage),
BLACK_METAMEMBER(simulatorDebugMessages),
BLACK_METAMEMBER(forceFullInterpolation),
BLACK_METAMEMBER(enabledAircraftParts),
BLACK_METAMEMBER(maxRenderedAircraft),
BLACK_METAMEMBER(maxRenderedDistance)
);