X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fprops%2Fprops.hxx;h=595e013d868585b93d4860c26830a1bef1bf37db;hb=2acac617fcf27b49a9396e9c040c8b4b437529f1;hp=6a0f1f93785c541cf79b3308706837203535fd57;hpb=5330dc34bcde0b3d01490fdbc05af4435a0d111c;p=simgear.git diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx index 6a0f1f93..595e013d 100644 --- a/simgear/props/props.hxx +++ b/simgear/props/props.hxx @@ -20,25 +20,61 @@ #include #include #include +#include -#include - -#if PROPS_STANDALONE -#else #include -#include +#if PROPS_STANDALONE +// taken from: boost/utility/enable_if.hpp +#ifndef SG_LOG +# define SG_GENERAL 0 +# define SG_ALERT 0 +# define SG_WARN 1 +# define SG_LOG(type, level, message) (type) ? (std::cerr < + struct enable_if_c { + typedef T type; + }; + + template + struct enable_if_c {}; + template + struct enable_if : public enable_if_c {}; -#include + template + struct disable_if_c { + typedef T type; + }; + + template + struct disable_if_c {}; + + template + struct disable_if : public disable_if_c {}; +} +#else +# include +# include + +# include +# include +# include +#endif #include #include // XXX This whole file should be in the simgear namespace, but I don't // have the guts yet... +using namespace std; + namespace simgear { + + class PropertyInterpolationMgr; + template std::istream& readFrom(std::istream& stream, T& result) { @@ -246,15 +282,14 @@ class SGRawBase : public SGRawExtended /** * Abstract base class for a raw value. * - *

The property manager is implemented in two layers. The {@link - * SGPropertyNode} is the highest and most abstract layer, - * representing an LValue/RValue pair: it records the position of the - * property in the property tree and contains facilities for - * navigation to other nodes. It is guaranteed to be persistent: the - * {@link SGPropertyNode} will not change during a session, even if - * the property is bound and unbound multiple times.

+ * The property manager is implemented in two layers. The SGPropertyNode is the + * highest and most abstract layer, representing an LValue/RValue pair: it + * records the position of the property in the property tree and contains + * facilities for navigation to other nodes. It is guaranteed to be persistent: + * the SGPropertyNode will not change during a session, even if the property is + * bound and unbound multiple times. * - *

When the property value is not managed internally in the + * When the property value is not managed internally in the * SGPropertyNode, the SGPropertyNode will contain a reference to an * SGRawValue (this class), which provides an abstract way to get, * set, and clone the underlying value. The SGRawValue may change @@ -262,13 +297,12 @@ class SGRawBase : public SGRawExtended * unbound to various data source, but the abstract SGPropertyNode * layer insulates the application from those changes. * - *

The SGPropertyNode class always keeps a *copy* of a raw value, - * not the original one passed to it; if you override a derived class - * but do not replace the {@link #clone} method, strange things will - * happen.

+ * The SGPropertyNode class always keeps a *copy* of a raw value, not the + * original one passed to it; if you override a derived class but do not replace + * the {@link SGRaw::clone clone()} method, strange things will happen. * - *

All derived SGRawValue classes must implement {@link #getValue}, - * {@link #setValue}, and {@link #clone} for the appropriate type.

+ * All derived SGRawValue classes must implement getValue(), setValue(), and + * {@link SGRaw::clone clone()} for the appropriate type. * * @see SGPropertyNode * @see SGRawValuePointer @@ -690,9 +724,15 @@ class SGPropertyChangeListener { public: virtual ~SGPropertyChangeListener (); - virtual void valueChanged (SGPropertyNode * node); - virtual void childAdded (SGPropertyNode * parent, SGPropertyNode * child); - virtual void childRemoved (SGPropertyNode * parent, SGPropertyNode * child); + + /// Called if value of \a node has changed. + virtual void valueChanged(SGPropertyNode * node); + + /// Called if \a child has been added to the given \a parent. + virtual void childAdded(SGPropertyNode * parent, SGPropertyNode * child); + + /// Called if \a child has been removed from its \a parent. + virtual void childRemoved(SGPropertyNode * parent, SGPropertyNode * child); protected: friend class SGPropertyNode; @@ -725,6 +765,7 @@ public: * whether the property should normally be saved and restored.

*/ enum Attribute { + NO_ATTR = 0, READ = 1, WRITE = 2, ARCHIVE = 4, @@ -904,36 +945,46 @@ public: simgear::PropertyList getChildren (const std::string& name) const { return getChildren(name.c_str()); } + /** + * Remove child by pointer (if it is a child of this node). + * + * @return true, if the node was deleted. + */ + bool removeChild(SGPropertyNode* node); + + // TODO do we need the removeXXX methods to return the deleted nodes? /** * Remove child by position. */ - SGPropertyNode_ptr removeChild (int pos, bool keep = true); + SGPropertyNode_ptr removeChild(int pos); /** * Remove a child node */ - SGPropertyNode_ptr removeChild (const char * name, int index = 0, - bool keep = true); + SGPropertyNode_ptr removeChild(const char * name, int index = 0); /** * Remove a child node */ - SGPropertyNode_ptr removeChild (const std::string& name, int index = 0, - bool keep = true) - { return removeChild(name.c_str(), index, keep); } + SGPropertyNode_ptr removeChild(const std::string& name, int index = 0) + { return removeChild(name.c_str(), index); } /** * Remove all children with the specified name. */ - simgear::PropertyList removeChildren (const char * name, bool keep = true); + simgear::PropertyList removeChildren(const char * name); /** * Remove all children with the specified name. */ - simgear::PropertyList removeChildren (const std::string& name, - bool keep = true) - { return removeChildren(name.c_str(), keep); } + simgear::PropertyList removeChildren(const std::string& name) + { return removeChildren(name.c_str()); } + + /** + * Remove all children (does not change the value of the node) + */ + void removeAllChildren(); // // Alias support. @@ -1162,6 +1213,18 @@ public: T getValue(typename boost::disable_if_c::Internal> ::type* dummy = 0) const; + /** + * Get a list of values from all children with the given name + */ + template // TODO use C++11 or traits + std::vector getChildValues(const std::string& name) const; + + /** + * Get a list of values from all children with the given name + */ + template + std::vector getChildValues(const std::string& name) const; + /** * Set a bool value for this node. */ @@ -1225,6 +1288,61 @@ public: return setValue(&val[0]); } + /** + * Set relative node to given value and afterwards make read only. + * + * @param relative_path Path to node + * @param value Value to set + * + * @return whether value could be set + */ + template + bool setValueReadOnly(const std::string& relative_path, const T& value) + { + SGPropertyNode* node = getNode(relative_path, true); + bool ret = node->setValue(value); + node->setAttributes(READ); + return ret; + } + +#if !PROPS_STANDALONE + /** + * Interpolate current value to target value within given time. + * + * @param type Type of interpolation ("numeric", "color", etc.) + * @param target Node containing target value + * @param duration Duration of interpolation (in seconds) + * @param easing Easing function (http://easings.net/) + */ + bool interpolate( const std::string& type, + const SGPropertyNode& target, + double duration = 0.6, + const std::string& easing = "swing" ); + + /** + * Interpolate current value to a series of values within given durations. + * + * @param type Type of interpolation ("numeric", "color", etc.) + * @param values Nodes containing intermediate and target values + * @param deltas Durations for each interpolation step (in seconds) + * @param easing Easing function (http://easings.net/) + */ + bool interpolate( const std::string& type, + const simgear::PropertyList& values, + const double_list& deltas, + const std::string& easing = "swing" ); + + /** + * Set the interpolation manager used by the interpolate methods. + */ + static void setInterpolationMgr(simgear::PropertyInterpolationMgr* mgr); + + /** + * Get the interpolation manager + */ + static simgear::PropertyInterpolationMgr* getInterpolationMgr(); +#endif + /** * Print the value of the property to a stream. */ @@ -1585,12 +1703,14 @@ public: /** * Trigger a child-added and value-changed event for every child (Unlimited - * depth) and the node itself. + * depth). + * + * @param fire_self Whether to trigger the events also for the node itself. * * It can be used to simulating the creation of a property tree, eg. for * (re)initializing a subsystem which is controlled through the property tree. */ - void fireCreatedRecursive(); + void fireCreatedRecursive(bool fire_self = false); /** * Fire a child-removed event to all listeners. @@ -1629,6 +1749,8 @@ protected: void fireChildAdded (SGPropertyNode * parent, SGPropertyNode * child); void fireChildRemoved (SGPropertyNode * parent, SGPropertyNode * child); + SGPropertyNode_ptr eraseChild(simgear::PropertyList::iterator child); + /** * Protected constructor for making new nodes on demand. */ @@ -1636,6 +1758,8 @@ protected: template SGPropertyNode (Itr begin, Itr end, int index, SGPropertyNode * parent); + static simgear::PropertyInterpolationMgr* _interpolation_mgr; + private: // Get the raw value @@ -1677,7 +1801,6 @@ private: /// counted pointer SGPropertyNode * _parent; simgear::PropertyList _children; - simgear::PropertyList _removedChildren; mutable std::string _buffer; simgear::props::Type _type; bool _tied; @@ -1705,7 +1828,7 @@ private: SGPropertyNode * getChildImpl (Itr begin, Itr end, int index = 0, bool create = false); // very internal method template - SGPropertyNode* getExistingChild (Itr begin, Itr end, int index, bool create); + SGPropertyNode* getExistingChild (Itr begin, Itr end, int index); // very internal path parsing function template friend SGPropertyNode* find_node_aux(SGPropertyNode * current, SplitItr& itr, @@ -1716,7 +1839,12 @@ private: // Convenience functions for use in templates template -T getValue(const SGPropertyNode*); +#if PROPS_STANDALONE +T +#else +typename boost::disable_if, T>::type +#endif +getValue(const SGPropertyNode*); template<> inline bool getValue(const SGPropertyNode* node) { return node->getBoolValue(); } @@ -1745,6 +1873,62 @@ inline const char * getValue(const SGPropertyNode* node) return node->getStringValue (); } +template<> +inline std::string getValue(const SGPropertyNode* node) +{ + return node->getStringValue(); +} + +namespace simgear +{ + /** + * Default trait for extracting enum values from SGPropertyNode. Create your + * own specialization for specific enum types to enable validation of values. + */ + template + struct enum_traits + { + /** + * Typename of the enum + */ + static const char* name() { return typeid(T).name(); } + + /** + * @return Default value (will be used if validation fails) + */ + static T defVal() { return T(); } + + /** + * @return Whether the given integer value has an enum value defined + */ + static bool validate(int) { return true; } + }; +} // namespace simgear + +/** Extract enum from SGPropertyNode */ +template +#if PROPS_STANDALONE +inline T +#else +inline typename boost::enable_if, T>::type +#endif +getValue(const SGPropertyNode* node) +{ + typedef simgear::enum_traits Traits; + int val = node->getIntValue(); + if( !Traits::validate(val) ) + { + SG_LOG + ( + SG_GENERAL, + SG_WARN, + "Invalid value for enum (" << Traits::name() << ", val = " << val << ")" + ); + return Traits::defVal(); + } + return static_cast(node->getIntValue()); +} + inline bool setValue(SGPropertyNode* node, bool value) { return node->setBoolValue(value); @@ -1846,6 +2030,25 @@ inline T SGPropertyNode::getValue(typename boost::enable_if_c(this); } +template // TODO use C++11 or traits +std::vector SGPropertyNode::getChildValues(const std::string& name) const +{ + const simgear::PropertyList& props = getChildren(name); + std::vector values( props.size() ); + + for( size_t i = 0; i < props.size(); ++i ) + values[i] = props[i]->getValue(); + + return values; +} + +template +inline +std::vector SGPropertyNode::getChildValues(const std::string& name) const +{ + return getChildValues(name); +} + template bool SGPropertyNode::setValue(const T& val, typename boost::disable_if_caddChangeListener(this,initial); } + + SGPropertyChangeCallback(const SGPropertyChangeCallback& other) : + _obj(other._obj), _callback(other._callback), _property(other._property) + { + _property->addChangeListener(this,false); + } + virtual ~SGPropertyChangeCallback() { _property->removeChangeListener(this);