f3b71fc2ac
"
the main problem is the wrapper generation:
The PropertyInfo class use MethodInfo class to access to the value.
When the property are define with the I_Property* macro,
the MethodInfo use by the property to have access to the value
are instancied in the I_Property* macro, but there
are already instantied by the I_Method* macro before
secondary problem:
- the function used by the property could no be customized
in the genwrapper.conf file
- an array property can't insert a value
- the std::map reflector (and indexedProperty in general) haven't remove method
- about the help in wrapper ... why not ...
solution :
To use the function define by the I_Method, I add a MethodInfo variable in the I_Method0 macro
old macro :
#define I_Method0(ret, fn) (\
params.clear(),\
addMethod(new osgIntrospection::TypedMethodIn
fo0<reflected_type, ret >(qualifyName(#fn), &reflected_type::fn, params)))
new macro :
#define I_Method0(ret, fn, signature, briefHelp, detailedHelp) \
params.clear(); \
osgIntrospection::MethodInfo* signature = addMethod(new osgIntrospection::TypedMethodInfo0<reflected_type, ret >(qualifyName(#fn), &reflected_type::fn, params, briefHelp, detailedHelp)); sink(signature)
the osgIntrospection::MethodInfo* signature is used by the I_Property macro to define the MethodInfo that it use
so for I_Property macro :
old macro :
#define I_PropertyWithReturnType(t, n, r) \
cap=addProperty(new osgIntrospection::PropertyInfo(osgIntrospection::Reflection::getType(typeid(reflected_type)), osgIntrospection::Reflection::getType(typeid(t)), #n, \
I_Method0(t, get##n), \
I_Method1(r, set##n, IN, t, value)))
new macro:
#define I_SimpleProperty(t, n, get, set) \
get, \
set))
The genwrapper has been modified in this way.
The method signature is define by the prototype of the method
For example, the "const char* libraryName();" have "__C5_char_P1__libraryName" for signature
solution for secondary problem:
The genwrapper accept new tokens in the configuration to custumize the property.
The new PropertyInserter and the CustomPropertyInsertAttribute class has been defined
The PropertyRemover has been added to the StdMapReflector
The _briefHelp and _detailedHelp variable has been added in PropertyInfo, MethodInfo and ContructorInfo class
modification:
I have modify the genwrapper files
Configuration.cpp Configuration.h add some tokens to custumize the property
Doxyfile.template add the comment in the output xml
genwrapper.conf customize some property in osg::Geometry
RegistryBuilder.h RegistryBuilder.cpp add the process_help function (to extract help from xml)
TypeRegister.cpp TypeRegister.h optimize the property detection
TypeDesc.h TypeDesc.cpp modify FunctionDesc and PropertyDesc
WrapperGenerator.h WrapperGenerator.cpp modify the output
I also modify the fallowing osgIntrospection files:
include/osgIntrospection/Attributes add the PropertyInserter and the CustomPropertyInsertAttribute class
include/osgIntrospection/ConstructorInfo add the _briefHelp and _detailedHelp variable in the ConstructorInfo class
add access function for the two new variables (_briefHelp and _detailedHelp)
modify the constructor to define the two new variables (_briefHelp and _detailedHelp)
include/osgIntrospection/MethodInfo add the _briefHelp and _detailedHelp variable in the MethodInfo class
add access function for the two new variables (_briefHelp and _detailedHelp)
modify the constructor to define the two new variables (_briefHelp and _detailedHelp)
include/osgIntrospection/PropertyInfo add the _briefHelp and _detailedHelp variable in the PropertyInfo class
add access function for the two new variables (_briefHelp and _detailedHelp)
modify the constructor to define the two new variables (_briefHelp and _detailedHelp)
include/osgIntrospection/ReflectionMacro remove unused I_Property* macro
modify all I_Method macro to accept the help string
modify all I_Method macro to define a MethodInfo signature
include/osgIntrospection/Reflector add the PropertyInserter in StdVectorReflector and StdListReflector
add the PropertyRemover in the StdMapReflector
include/osgIntrospection/StaticMethodInfo modify all StaticMethodInfo* to accept the help in parameter
include/osgIntrospection/TypedMethodInfo modify all TypedMethodInfo* to accept the help in parameter
include/osgIntrospection/TypedConstructorInfo modify all TypedConstructorInfo* to accept the help in parameter
include/osgIntrospection/Type add the _briefHelp and _detailedHelp variable in the Type class
"
368 lines
12 KiB
C++
368 lines
12 KiB
C++
/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
|
|
*
|
|
* This library is open source and may be redistributed and/or modified under
|
|
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
|
|
* (at your option) any later version. The full license is in LICENSE file
|
|
* included with this distribution, and on the openscenegraph.org website.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* OpenSceneGraph Public License for more details.
|
|
*/
|
|
//osgIntrospection - Copyright (C) 2005 Marco Jez
|
|
|
|
#include <osgIntrospection/PropertyInfo>
|
|
#include <osgIntrospection/Attributes>
|
|
#include <osgIntrospection/variant_cast>
|
|
|
|
using namespace osgIntrospection;
|
|
|
|
void PropertyInfo::getInheritedProviders(CustomAttributeProviderList& providers) const
|
|
{
|
|
for (int i=0; i<_decltype.getNumBaseTypes(); ++i)
|
|
{
|
|
const PropertyInfo* pi = _decltype.getBaseType(i).getProperty(_name, _ptype, getIndexParameters(), false);
|
|
if (pi)
|
|
{
|
|
providers.push_back(pi);
|
|
}
|
|
}
|
|
}
|
|
|
|
Value PropertyInfo::getValue(const Value& instance) const
|
|
{
|
|
const PropertyTypeAttribute *pta = getAttribute<PropertyTypeAttribute>(false);
|
|
const CustomPropertyGetAttribute *cget = getAttribute<CustomPropertyGetAttribute>(false);
|
|
|
|
if (cget)
|
|
{
|
|
if (pta)
|
|
return cget->getGetter()->get(instance).convertTo(pta->getPropertyType());
|
|
return cget->getGetter()->get(instance);
|
|
}
|
|
|
|
if (!_getm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::GET);
|
|
|
|
if (pta)
|
|
return _getm->invoke(instance).convertTo(pta->getPropertyType());
|
|
return _getm->invoke(instance);
|
|
}
|
|
|
|
Value PropertyInfo::getValue(Value& instance) const
|
|
{
|
|
const PropertyTypeAttribute *pta = getAttribute<PropertyTypeAttribute>(false);
|
|
const CustomPropertyGetAttribute *cget = getAttribute<CustomPropertyGetAttribute>(false);
|
|
|
|
if (cget)
|
|
{
|
|
if (pta)
|
|
return cget->getGetter()->get(instance).convertTo(pta->getPropertyType());
|
|
return cget->getGetter()->get(instance);
|
|
}
|
|
|
|
if (!_getm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::GET);
|
|
|
|
if (pta)
|
|
return _getm->invoke(instance).convertTo(pta->getPropertyType());
|
|
return _getm->invoke(instance);
|
|
}
|
|
|
|
void PropertyInfo::setValue(Value& instance, const Value& value) const
|
|
{
|
|
const CustomPropertySetAttribute *cset = getAttribute<CustomPropertySetAttribute>(false);
|
|
|
|
if (cset)
|
|
{
|
|
cset->getSetter()->set(instance, value);
|
|
return;
|
|
}
|
|
|
|
if (!_setm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::SET);
|
|
|
|
ValueList args;
|
|
args.push_back(value);
|
|
_setm->invoke(instance, args);
|
|
}
|
|
|
|
Value PropertyInfo::getIndexedValue(const Value& instance, ValueList& args) const
|
|
{
|
|
const PropertyTypeAttribute *pta = getAttribute<PropertyTypeAttribute>(false);
|
|
const CustomPropertyGetAttribute *cget = getAttribute<CustomPropertyGetAttribute>(false);
|
|
|
|
if (cget)
|
|
{
|
|
if (pta)
|
|
return cget->getGetter()->get(instance, args).convertTo(pta->getPropertyType());
|
|
return cget->getGetter()->get(instance, args);
|
|
}
|
|
|
|
if (!_getm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::IGET);
|
|
|
|
if (pta)
|
|
return _getm->invoke(instance, args).convertTo(pta->getPropertyType());
|
|
return _getm->invoke(instance, args);
|
|
}
|
|
|
|
Value PropertyInfo::getIndexedValue(Value& instance, ValueList& args) const
|
|
{
|
|
const PropertyTypeAttribute *pta = getAttribute<PropertyTypeAttribute>(false);
|
|
const CustomPropertyGetAttribute *cget = getAttribute<CustomPropertyGetAttribute>(false);
|
|
|
|
if (cget)
|
|
{
|
|
if (pta)
|
|
return cget->getGetter()->get(instance, args).convertTo(pta->getPropertyType());
|
|
return cget->getGetter()->get(instance, args);
|
|
}
|
|
|
|
if (!_getm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::IGET);
|
|
|
|
if (pta)
|
|
return _getm->invoke(instance, args).convertTo(pta->getPropertyType());
|
|
return _getm->invoke(instance, args);
|
|
}
|
|
|
|
void PropertyInfo::setIndexedValue(Value& instance, ValueList& args, const Value& value) const
|
|
{
|
|
const CustomPropertySetAttribute *cset = getAttribute<CustomPropertySetAttribute>(false);
|
|
if (cset)
|
|
{
|
|
cset->getSetter()->set(instance, args, value);
|
|
return;
|
|
}
|
|
|
|
if (!_setm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::ISET);
|
|
|
|
ValueList tmpArgs(args);
|
|
tmpArgs.push_back(value);
|
|
_setm->invoke(instance, tmpArgs);
|
|
}
|
|
|
|
int PropertyInfo::getNumArrayItems(const Value& instance) const
|
|
{
|
|
const CustomPropertyCountAttribute *ccount = getAttribute<CustomPropertyCountAttribute>(false);
|
|
if (ccount) return ccount->getCounter()->count(instance);
|
|
|
|
if (!_numm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::COUNT);
|
|
|
|
return variant_cast<int>(_numm->invoke(instance));
|
|
}
|
|
|
|
Value PropertyInfo::getArrayItem(const Value& instance, int i) const
|
|
{
|
|
const PropertyTypeAttribute *pta = getAttribute<PropertyTypeAttribute>(false);
|
|
const CustomPropertyGetAttribute *cget = getAttribute<CustomPropertyGetAttribute>(false);
|
|
|
|
if (cget)
|
|
{
|
|
if (pta)
|
|
return cget->getGetter()->get(instance, i).convertTo(pta->getPropertyType());
|
|
return cget->getGetter()->get(instance, i);
|
|
}
|
|
|
|
if (!_getm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::AGET);
|
|
|
|
ValueList args;
|
|
args.push_back(i);
|
|
|
|
if (pta)
|
|
return _getm->invoke(instance, args).convertTo(pta->getPropertyType());
|
|
return _getm->invoke(instance, args);
|
|
}
|
|
|
|
Value PropertyInfo::getArrayItem(Value& instance, int i) const
|
|
{
|
|
const PropertyTypeAttribute *pta = getAttribute<PropertyTypeAttribute>(false);
|
|
const CustomPropertyGetAttribute *cget = getAttribute<CustomPropertyGetAttribute>(false);
|
|
|
|
if (cget)
|
|
{
|
|
if (pta)
|
|
return cget->getGetter()->get(instance, i).convertTo(pta->getPropertyType());
|
|
return cget->getGetter()->get(instance, i);
|
|
}
|
|
|
|
if (!_getm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::AGET);
|
|
|
|
ValueList args;
|
|
args.push_back(i);
|
|
|
|
if (pta)
|
|
return _getm->invoke(instance, args).convertTo(pta->getPropertyType());
|
|
return _getm->invoke(instance, args);
|
|
}
|
|
|
|
void PropertyInfo::setArrayItem(Value& instance, int i, const Value& value) const
|
|
{
|
|
const CustomPropertySetAttribute *cset = getAttribute<CustomPropertySetAttribute>(false);
|
|
if (cset)
|
|
{
|
|
cset->getSetter()->set(instance, i, value);
|
|
return;
|
|
}
|
|
|
|
if (!_setm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::ASET);
|
|
|
|
ValueList args;
|
|
args.push_back(i);
|
|
args.push_back(value);
|
|
_setm->invoke(instance, args);
|
|
}
|
|
|
|
void PropertyInfo::addArrayItem(Value& instance, const Value& value) const
|
|
{
|
|
const CustomPropertyAddAttribute *cadd = getAttribute<CustomPropertyAddAttribute>(false);
|
|
if (cadd)
|
|
{
|
|
cadd->getAdder()->add(instance, value);
|
|
return;
|
|
}
|
|
|
|
if (!_addm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::ADD);
|
|
|
|
ValueList args;
|
|
args.push_back(value);
|
|
_addm->invoke(instance, args);
|
|
}
|
|
|
|
void PropertyInfo::insertArrayItem(Value& instance, int i, const Value& value) const
|
|
{
|
|
const CustomPropertyInsertAttribute *cadd = getAttribute<CustomPropertyInsertAttribute>(false);
|
|
if (cadd)
|
|
{
|
|
cadd->getInserter()->insert(instance, i, value);
|
|
return;
|
|
}
|
|
|
|
if (!_addm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::INSERT);
|
|
|
|
ValueList args;
|
|
args.push_back(i);
|
|
args.push_back(value);
|
|
_insm->invoke(instance, args);
|
|
}
|
|
|
|
void PropertyInfo::removeArrayItem(Value& instance, int i) const
|
|
{
|
|
const CustomPropertyRemoveAttribute *crem = getAttribute<CustomPropertyRemoveAttribute>(false);
|
|
if (crem)
|
|
{
|
|
crem->getRemover()->remove(instance, i);
|
|
return;
|
|
}
|
|
|
|
if (!_remm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::REMOVE);
|
|
|
|
ValueList args;
|
|
args.push_back(i);
|
|
_remm->invoke(instance, args);
|
|
}
|
|
|
|
Value PropertyInfo::getDefaultValue() const
|
|
{
|
|
if (isArray() || isIndexed()) return Value();
|
|
|
|
const CustomAttributeList& cal = getCustomAttributes();
|
|
for (CustomAttributeList::const_iterator i=cal.begin(); i!=cal.end(); ++i)
|
|
{
|
|
if (dynamic_cast<const NoDefaultValueAttribute *>(*i) != 0)
|
|
return Value();
|
|
|
|
const DefaultValueAttribute *dv = dynamic_cast<const DefaultValueAttribute *>(*i);
|
|
if (dv)
|
|
{
|
|
return dv->getDefaultValue();
|
|
}
|
|
}
|
|
|
|
if (_decltype.isAbstract())
|
|
{
|
|
if (_ptype.isAbstract() || !_ptype.isDefined())
|
|
return Value();
|
|
return _ptype.createInstance();
|
|
}
|
|
|
|
// auto default value
|
|
Value instance = _decltype.createInstance();
|
|
return getValue(instance);
|
|
}
|
|
|
|
void PropertyInfo::getIndexValueSet(int whichindex, const Value& instance, ValueList& values) const
|
|
{
|
|
const CustomIndexAttribute *cia = getAttribute<CustomIndexAttribute>(false);
|
|
if (cia)
|
|
{
|
|
cia->getIndexInfo()->getIndexValueSet(whichindex, instance, values);
|
|
}
|
|
else
|
|
{
|
|
std::map<int, const IndexTypeAttribute *> ita_map;
|
|
const CustomAttributeList& cal = getCustomAttributes();
|
|
for (CustomAttributeList::const_iterator i=cal.begin(); i!=cal.end(); ++i)
|
|
{
|
|
const IndexTypeAttribute *ita = dynamic_cast<const IndexTypeAttribute *>(*i);
|
|
if (ita)
|
|
ita_map[ita->getWhichIndex()] = ita;
|
|
}
|
|
|
|
const EnumLabelMap* elm = &getIndexParameters().at(whichindex)->getParameterType().getEnumLabels();
|
|
if (elm->empty())
|
|
{
|
|
if (ita_map[whichindex])
|
|
elm = &ita_map[whichindex]->getIndexType().getEnumLabels();
|
|
|
|
if (elm->empty())
|
|
throw IndexValuesNotDefinedException(_name, getIndexParameters().at(whichindex)->getName());
|
|
}
|
|
|
|
for (EnumLabelMap::const_iterator i=elm->begin(); i!=elm->end(); ++i)
|
|
{
|
|
if (ita_map[whichindex])
|
|
values.push_back(Value(i->first).convertTo(ita_map[whichindex]->getIndexType()));
|
|
else
|
|
values.push_back(Value(i->first).convertTo(_indices[whichindex]->getParameterType()));
|
|
}
|
|
}
|
|
}
|
|
|
|
const ParameterInfoList& PropertyInfo::getIndexParameters() const
|
|
{
|
|
const CustomIndexAttribute *cia = getAttribute<CustomIndexAttribute>(false);
|
|
if (cia)
|
|
{
|
|
return cia->getIndexInfo()->getIndexParameters();
|
|
}
|
|
|
|
return _indices;
|
|
}
|
|
|
|
void PropertyInfo::removeIndexedItem(Value& instance, ValueList& args) const
|
|
{
|
|
const CustomPropertyRemoveAttribute *crem = getAttribute<CustomPropertyRemoveAttribute>(false);
|
|
if (crem)
|
|
{
|
|
crem->getRemover()->remove(instance, args);
|
|
return;
|
|
}
|
|
|
|
if (!_remm)
|
|
throw PropertyAccessException(_decltype.getQualifiedName() + "::" + _name, PropertyAccessException::REMOVE);
|
|
|
|
_remm->invoke(instance, args);
|
|
}
|
|
|