haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properties (introspection) 

Introduces classes:
- INSPECTED: base class for types taking advantage of
  generic properties system.
- PROPERTY*: meta-data storing information about properties
- PROPERTY_MANAGER: singleton class to get properties data
This commit is contained in:
Maciej Suminski 2020-02-02 19:29:33 +01:00 committed by Jon Evans
parent 1e68c353f1
commit 745c94b0a1
4 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/property.h
View File

@ -50,9 +50,10 @@ class ENUM_MAP;
enum PROPERTY_DISPLAY
{
DEFAULT, ///< Default property for a given type
DISTANCE, ///< Display value expressed in distance units (mm/inch)
DEGREE, ///< Display value expressed in degrees
DECIDEGREE ///< Convert decidegrees to degrees for display
SIZE, ///< Size expressed in distance units (mm/inch)
COORD, ///< Coordinate expressed in distance units (mm/inch)
DEGREE, ///< Angle expressed in degrees
DECIDEGREE ///< Angle expressed in decidegrees
};
///< Macro to generate unique identifier for a type
@ -176,8 +177,9 @@ private:
public:
PROPERTY_BASE( const wxString& aName, PROPERTY_DISPLAY aDisplay = DEFAULT ) :
m_id( nextId ),
m_name( aName ),
m_display( aDisplay ),
m_type( aType ),
m_availFunc( [](INSPECTABLE*)->bool { return true; } )
{
}
@ -251,9 +253,9 @@ public:
virtual bool IsReadOnly() const = 0;
PROPERTY_DISPLAY GetDisplay() const
PROPERTY_TYPE Type() const
{
return m_display;
return m_type;
}
protected:
@ -279,8 +281,9 @@ protected:
virtual wxAny getter( void* aObject ) const = 0;
private:
const wxString m_name;
const PROPERTY_DISPLAY m_display;
const size_t m_id;
const wxString m_name;
const PROPERTY_DISPLAY m_display;
std::function<bool(INSPECTABLE*)> m_availFunc; ///< Eval to determine if prop is available
@ -298,18 +301,18 @@ public:
template<typename SetType, typename GetType>
PROPERTY( const wxString& aName,
void ( Base::*aSetter )( SetType ), GetType( Base::*aGetter )(),
PROPERTY_DISPLAY aDisplay = DEFAULT )
PROPERTY_TYPE aType = DEFAULT )
: PROPERTY( aName, METHOD<Owner, T, Base>::Wrap( aSetter ),
METHOD<Owner, T, Base>::Wrap( aGetter ), aDisplay )
METHOD<Owner, T, Base>::Wrap( aGetter ), aType )
{
}
template<typename SetType, typename GetType>
PROPERTY( const wxString& aName,
void ( Base::*aSetter )( SetType ), GetType( Base::*aGetter )() const,
PROPERTY_DISPLAY aDisplay = DEFAULT )
PROPERTY_TYPE aType = DEFAULT )
: PROPERTY( aName, METHOD<Owner, T, Base>::Wrap( aSetter ),
METHOD<Owner, T, Base>::Wrap( aGetter ), aDisplay )
METHOD<Owner, T, Base>::Wrap( aGetter ), aType )
{
}
@ -335,8 +338,8 @@ public:
protected:
PROPERTY( const wxString& aName, SETTER_BASE<Owner, T>* s, GETTER_BASE<Owner, T>* g,
PROPERTY_DISPLAY aDisplay )
: PROPERTY_BASE( aName, aDisplay ), m_setter( s ), m_getter( g ),
PROPERTY_TYPE aType )
: PROPERTY_BASE( aName, aType ), m_setter( s ), m_getter( g ),
m_ownerHash( TYPE_HASH( Owner ) ), m_baseHash( TYPE_HASH( Base ) ),
m_typeHash( TYPE_HASH( BASE_TYPE ) )
{
@ -387,9 +390,9 @@ public:
template<typename SetType, typename GetType>
PROPERTY_ENUM( const wxString& aName,
void ( Base::*aSetter )( SetType ), GetType( Base::*aGetter )(),
PROPERTY_DISPLAY aDisplay = PROPERTY_DISPLAY::DEFAULT )
PROPERTY_TYPE aType = PROPERTY_TYPE::DEFAULT )
: PROPERTY<Owner, T, Base>( aName, METHOD<Owner, T, Base>::Wrap( aSetter ),
METHOD<Owner, T, Base>::Wrap( aGetter ), aDisplay )
METHOD<Owner, T, Base>::Wrap( aGetter ), aType )
{
if ( std::is_enum<T>::value )
{
@ -401,9 +404,9 @@ public:
template<typename SetType, typename GetType>
PROPERTY_ENUM( const wxString& aName,
void ( Base::*aSetter )( SetType ), GetType( Base::*aGetter )() const,
PROPERTY_DISPLAY aDisplay = PROPERTY_DISPLAY::DEFAULT )
PROPERTY_TYPE aType = PROPERTY_TYPE::DEFAULT )
: PROPERTY<Owner, T, Base>( aName, METHOD<Owner, T, Base>::Wrap( aSetter ),
METHOD<Owner, T, Base>::Wrap( aGetter ), aDisplay )
METHOD<Owner, T, Base>::Wrap( aGetter ), aType )
{
if ( std::is_enum<T>::value )
{
@ -442,7 +445,7 @@ public:
const wxPGChoices& Choices() const override
{
return m_choices;
return m_choices.GetCount() > 0 ? m_choices : ENUM_MAP<T>::Instance().Choices();
}
void SetChoices( const wxPGChoices& aChoices ) override
@ -452,7 +455,7 @@ public:
bool HasChoices() const override
{
return m_choices.GetCount() > 0;
return Choices().GetCount() > 0;
}
protected:

4
pcbnew/board_item.cpp
View File

@ -256,9 +256,9 @@ static struct BOARD_ITEM_DESC
propMgr.InheritsAfter( TYPE_HASH( BOARD_ITEM ), TYPE_HASH( EDA_ITEM ) );
propMgr.AddProperty( new PROPERTY<BOARD_ITEM, int>( _HKI( "Position X" ),
&BOARD_ITEM::SetX, &BOARD_ITEM::GetX, PROPERTY_DISPLAY::DISTANCE ) );
&BOARD_ITEM::SetX, &BOARD_ITEM::GetX, PROPERTY_TYPE::COORD ) );
propMgr.AddProperty( new PROPERTY<BOARD_ITEM, int>( _HKI( "Position Y" ),
&BOARD_ITEM::SetY, &BOARD_ITEM::GetY, PROPERTY_DISPLAY::DISTANCE ) );
&BOARD_ITEM::SetY, &BOARD_ITEM::GetY, PROPERTY_TYPE::COORD ) );
propMgr.AddProperty( new PROPERTY_ENUM<BOARD_ITEM, PCB_LAYER_ID>( _HKI( "Layer" ),
&BOARD_ITEM::SetLayer, &BOARD_ITEM::GetLayer ) );
propMgr.AddProperty( new PROPERTY<BOARD_ITEM, bool>( _HKI( "Locked" ),

4
pcbnew/pcb_target.cpp
View File

@ -200,9 +200,9 @@ static struct PCB_TARGET_DESC
REGISTER_TYPE( PCB_TARGET );
propMgr.InheritsAfter( TYPE_HASH( PCB_TARGET ), TYPE_HASH( BOARD_ITEM ) );
propMgr.AddProperty( new PROPERTY<PCB_TARGET, int>( _HKI( "Size" ),
&PCB_TARGET::SetSize, &PCB_TARGET::GetSize, PROPERTY_DISPLAY::DISTANCE ) );
&PCB_TARGET::SetSize, &PCB_TARGET::GetSize, PROPERTY_TYPE::SIZE ) );
propMgr.AddProperty( new PROPERTY<PCB_TARGET, int>( _HKI( "Width" ),
&PCB_TARGET::SetWidth, &PCB_TARGET::GetWidth, PROPERTY_DISPLAY::DISTANCE ) );
&PCB_TARGET::SetWidth, &PCB_TARGET::GetWidth, PROPERTY_TYPE::SIZE ) );
auto shape = new PROPERTY<PCB_TARGET, int>( _HKI( "Shape" ),
&PCB_TARGET::SetShape, &PCB_TARGET::GetShape );

14
qa/unittests/common/test_property.cpp
View File

@ -259,7 +259,7 @@ BOOST_AUTO_TEST_CASE( NotexistingProperties )
{
ptr = &d;
BOOST_CHECK_EQUAL( ptr->Set<int>( "does not exist", 5 ), false );
//BOOST_CHECK_EQUAL( ptr->Get<int>( "neither" ).has_value(), false );
BOOST_CHECK_EQUAL( static_cast<bool>( ptr->Get<int>( "neither" ) ), false );
}
// Request data using incorrect type
@ -298,12 +298,12 @@ BOOST_AUTO_TEST_CASE( EnumGlob )
BOOST_CHECK_EQUAL( v.GetCount(), values.GetCount() );
BOOST_CHECK_EQUAL( v.GetCount(), labels.GetCount() );
for (int i = 0; i < values.GetCount(); ++i )
for (unsigned int i = 0; i < values.GetCount(); ++i )
{
BOOST_CHECK_EQUAL( v.GetValue( i ), values[i] );
}
for (int i = 0; i < labels.GetCount(); ++i )
for (unsigned int i = 0; i < labels.GetCount(); ++i )
{
BOOST_CHECK_EQUAL( v.GetLabel( i ), labels[i] );
}
@ -338,12 +338,12 @@ BOOST_AUTO_TEST_CASE( EnumClass )
BOOST_CHECK_EQUAL( v.GetCount(), values.GetCount() );
BOOST_CHECK_EQUAL( v.GetCount(), labels.GetCount() );
for (int i = 0; i < values.GetCount(); ++i )
for (unsigned int i = 0; i < values.GetCount(); ++i )
{
BOOST_CHECK_EQUAL( v.GetValue( i ), values[i] );
}
for (int i = 0; i < labels.GetCount(); ++i )
for (unsigned int i = 0; i < labels.GetCount(); ++i )
{
BOOST_CHECK_EQUAL( v.GetLabel( i ), labels[i] );
}
@ -406,12 +406,12 @@ BOOST_AUTO_TEST_CASE( AlternativeEnum )
BOOST_CHECK_EQUAL( v.GetCount(), values.GetCount() );
BOOST_CHECK_EQUAL( v.GetCount(), labels.GetCount() );
for (int i = 0; i < values.GetCount(); ++i )
for (unsigned int i = 0; i < values.GetCount(); ++i )
{
BOOST_CHECK_EQUAL( v.GetValue( i ), values[i] );
}
for (int i = 0; i < labels.GetCount(); ++i )
for (unsigned int i = 0; i < labels.GetCount(); ++i )
{
BOOST_CHECK_EQUAL( v.GetLabel( i ), labels[i] );
}