diff --git a/common/eda_shape.cpp b/common/eda_shape.cpp index 781f09b470..0e879723de 100644 --- a/common/eda_shape.cpp +++ b/common/eda_shape.cpp @@ -1649,20 +1649,20 @@ static struct EDA_SHAPE_DESC NO_SETTER( EDA_SHAPE, SHAPE_T ), &EDA_SHAPE::GetShape ); propMgr.AddProperty( shape ); propMgr.AddProperty( new PROPERTY( _HKI( "Start X" ), - &EDA_SHAPE::SetStartX, &EDA_SHAPE::GetStartX, PROPERTY_DISPLAY::COORD ) ); + &EDA_SHAPE::SetStartX, &EDA_SHAPE::GetStartX, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Start Y" ), - &EDA_SHAPE::SetStartY, &EDA_SHAPE::GetStartY, PROPERTY_DISPLAY::COORD ) ); + &EDA_SHAPE::SetStartY, &EDA_SHAPE::GetStartY, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.AddProperty( new PROPERTY( _HKI( "End X" ), - &EDA_SHAPE::SetEndX, &EDA_SHAPE::GetEndX, PROPERTY_DISPLAY::COORD ) ); + &EDA_SHAPE::SetEndX, &EDA_SHAPE::GetEndX, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.AddProperty( new PROPERTY( _HKI( "End Y" ), - &EDA_SHAPE::SetEndY, &EDA_SHAPE::GetEndY, PROPERTY_DISPLAY::COORD ) ); + &EDA_SHAPE::SetEndY, &EDA_SHAPE::GetEndY, PROPERTY_DISPLAY::PT_COORD ) ); // TODO: m_arcCenter, m_bezierC1, m_bezierC2, m_poly propMgr.AddProperty( new PROPERTY( _HKI( "Line Width" ), - &EDA_SHAPE::SetWidth, &EDA_SHAPE::GetWidth, PROPERTY_DISPLAY::SIZE ) ); + &EDA_SHAPE::SetWidth, &EDA_SHAPE::GetWidth, PROPERTY_DISPLAY::PT_SIZE ) ); auto angle = new PROPERTY( _HKI( "Angle" ), NO_SETTER( EDA_SHAPE, EDA_ANGLE ), &EDA_SHAPE::GetArcAngle, - PROPERTY_DISPLAY::DECIDEGREE ); + PROPERTY_DISPLAY::PT_DECIDEGREE ); angle->SetAvailableFunc( [=]( INSPECTABLE* aItem ) -> bool { diff --git a/common/eda_text.cpp b/common/eda_text.cpp index 8a1a36c3c2..8a03f75317 100644 --- a/common/eda_text.cpp +++ b/common/eda_text.cpp @@ -995,7 +995,7 @@ static struct EDA_TEXT_DESC propMgr.AddProperty( new PROPERTY( _HKI( "Thickness" ), &EDA_TEXT::SetTextThickness, &EDA_TEXT::GetTextThickness, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Italic" ), &EDA_TEXT::SetItalic, &EDA_TEXT::IsItalic ) ); @@ -1010,11 +1010,11 @@ static struct EDA_TEXT_DESC propMgr.AddProperty( new PROPERTY( _HKI( "Width" ), &EDA_TEXT::SetTextWidth, &EDA_TEXT::GetTextWidth, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Height" ), &EDA_TEXT::SetTextHeight, &EDA_TEXT::GetTextHeight, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Horizontal Justification" ), &EDA_TEXT::SetHorizJustify, diff --git a/common/pg_properties.cpp b/common/pg_properties.cpp index 2ccaf86278..6dd6086ec6 100644 --- a/common/pg_properties.cpp +++ b/common/pg_properties.cpp @@ -39,20 +39,20 @@ wxPGProperty* PGPropertyFactory( const PROPERTY_BASE* aProperty ) switch( display ) { - case PROPERTY_DISPLAY::SIZE: + case PROPERTY_DISPLAY::PT_SIZE: ret = new PGPROPERTY_SIZE(); break; - case PROPERTY_DISPLAY::COORD: + case PROPERTY_DISPLAY::PT_COORD: ret = new PGPROPERTY_COORD(); break; - case PROPERTY_DISPLAY::DECIDEGREE: /* fall-through */ - case PROPERTY_DISPLAY::DEGREE: + case PROPERTY_DISPLAY::PT_DECIDEGREE: + case PROPERTY_DISPLAY::PT_DEGREE: { auto prop = new PGPROPERTY_ANGLE(); - if( display == PROPERTY_DISPLAY::DECIDEGREE ) + if( display == PROPERTY_DISPLAY::PT_DECIDEGREE ) prop->SetScale( 10.0 ); ret = prop; @@ -62,7 +62,7 @@ wxPGProperty* PGPropertyFactory( const PROPERTY_BASE* aProperty ) default: wxFAIL; /* fall through */ - case PROPERTY_DISPLAY::DEFAULT: + case PROPERTY_DISPLAY::PT_DEFAULT: { // Create a corresponding wxPGProperty size_t typeId = aProperty->TypeHash(); @@ -74,32 +74,26 @@ wxPGProperty* PGPropertyFactory( const PROPERTY_BASE* aProperty ) ret = new wxEnumProperty( wxPG_LABEL, wxPG_LABEL, const_cast( aProperty->Choices() ) ); } - else if( typeId == TYPE_HASH( int ) || typeId == TYPE_HASH( long ) ) { ret = new wxIntProperty(); } - else if( typeId == TYPE_HASH( unsigned int ) || typeId == TYPE_HASH( unsigned long ) ) { ret = new wxUIntProperty(); } - else if( typeId == TYPE_HASH( float ) || typeId == TYPE_HASH( double ) ) { ret = new wxFloatProperty(); } - else if( typeId == TYPE_HASH( bool ) ) { ret = new wxBoolProperty(); } - else if( typeId == TYPE_HASH( wxString ) ) { ret = new wxStringProperty(); } - else { wxFAIL_MSG( wxString::Format( "Property '" + aProperty->Name() + diff --git a/include/property.h b/include/property.h index d2af7ded74..9f512ecfe3 100644 --- a/include/property.h +++ b/include/property.h @@ -49,11 +49,11 @@ class ENUM_MAP; ///< Common property types enum PROPERTY_DISPLAY { - DEFAULT, ///< Default property for a given type - 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 + PT_DEFAULT, ///< Default property for a given type + PT_SIZE, ///< Size expressed in distance units (mm/inch) + PT_COORD, ///< Coordinate expressed in distance units (mm/inch) + PT_DEGREE, ///< Angle expressed in degrees + PT_DECIDEGREE ///< Angle expressed in decidegrees }; ///< Macro to generate unique identifier for a type @@ -177,7 +177,7 @@ private: ///< Used to generate unique IDs. Must come up front so it's initialized before ctor. public: - PROPERTY_BASE( const wxString& aName, PROPERTY_DISPLAY aDisplay = DEFAULT ) : +PROPERTY_BASE( const wxString& aName, PROPERTY_DISPLAY aDisplay = PT_DEFAULT ) : m_name( aName ), m_display( aDisplay ), m_availFunc( [](INSPECTABLE*)->bool { return true; } ) @@ -300,7 +300,7 @@ public: template PROPERTY( const wxString& aName, void ( Base::*aSetter )( SetType ), GetType( Base::*aGetter )(), - PROPERTY_DISPLAY aDisplay = DEFAULT ) + PROPERTY_DISPLAY aDisplay = PT_DEFAULT ) : PROPERTY( aName, METHOD::Wrap( aSetter ), METHOD::Wrap( aGetter ), aDisplay ) { @@ -309,7 +309,7 @@ public: template PROPERTY( const wxString& aName, void ( Base::*aSetter )( SetType ), GetType( Base::*aGetter )() const, - PROPERTY_DISPLAY aDisplay = DEFAULT ) + PROPERTY_DISPLAY aDisplay = PT_DEFAULT ) : PROPERTY( aName, METHOD::Wrap( aSetter ), METHOD::Wrap( aGetter ), aDisplay ) { @@ -389,7 +389,7 @@ public: template PROPERTY_ENUM( const wxString& aName, void ( Base::*aSetter )( SetType ), GetType( Base::*aGetter )(), - PROPERTY_DISPLAY aDisplay = DEFAULT ) + PROPERTY_DISPLAY aDisplay = PT_DEFAULT ) : PROPERTY( aName, METHOD::Wrap( aSetter ), METHOD::Wrap( aGetter ), aDisplay ) { @@ -403,7 +403,7 @@ public: template PROPERTY_ENUM( const wxString& aName, void ( Base::*aSetter )( SetType ), GetType( Base::*aGetter )() const, - PROPERTY_DISPLAY aDisplay = DEFAULT ) + PROPERTY_DISPLAY aDisplay = PT_DEFAULT ) : PROPERTY( aName, METHOD::Wrap( aSetter ), METHOD::Wrap( aGetter ), aDisplay ) { diff --git a/pcbnew/board_item.cpp b/pcbnew/board_item.cpp index 3d01534955..540159c21e 100644 --- a/pcbnew/board_item.cpp +++ b/pcbnew/board_item.cpp @@ -256,9 +256,9 @@ static struct BOARD_ITEM_DESC propMgr.InheritsAfter( TYPE_HASH( BOARD_ITEM ), TYPE_HASH( EDA_ITEM ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Position X" ), - &BOARD_ITEM::SetX, &BOARD_ITEM::GetX, PROPERTY_DISPLAY::COORD ) ); + &BOARD_ITEM::SetX, &BOARD_ITEM::GetX, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Position Y" ), - &BOARD_ITEM::SetY, &BOARD_ITEM::GetY, PROPERTY_DISPLAY::COORD ) ); + &BOARD_ITEM::SetY, &BOARD_ITEM::GetY, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Layer" ), &BOARD_ITEM::SetLayer, &BOARD_ITEM::GetLayer ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Locked" ), diff --git a/pcbnew/footprint.cpp b/pcbnew/footprint.cpp index c915bf6d4c..c4866f97ff 100644 --- a/pcbnew/footprint.cpp +++ b/pcbnew/footprint.cpp @@ -2818,13 +2818,13 @@ static struct FOOTPRINT_DESC &FOOTPRINT::SetValue, &FOOTPRINT::GetValue ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Orientation" ), &FOOTPRINT::SetOrientationDegrees, &FOOTPRINT::GetOrientationDegrees, - PROPERTY_DISPLAY::DEGREE ) ); + PROPERTY_DISPLAY::PT_DEGREE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Clearance Override" ), &FOOTPRINT::SetLocalClearance, &FOOTPRINT::GetLocalClearance, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Solderpaste Margin Override" ), &FOOTPRINT::SetLocalSolderPasteMargin, &FOOTPRINT::GetLocalSolderPasteMargin, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Solderpaste Margin Ratio Override" ), &FOOTPRINT::SetLocalSolderPasteMarginRatio, &FOOTPRINT::GetLocalSolderPasteMarginRatio ) ); diff --git a/pcbnew/pad.cpp b/pcbnew/pad.cpp index b4c6cd6119..147fd5f4af 100644 --- a/pcbnew/pad.cpp +++ b/pcbnew/pad.cpp @@ -1699,39 +1699,39 @@ static struct PAD_DESC &PAD::SetPinType, &PAD::GetPinType ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Orientation" ), &PAD::SetOrientationDegrees, &PAD::GetOrientationDegrees, - PROPERTY_DISPLAY::DEGREE ) ); + PROPERTY_DISPLAY::PT_DEGREE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Size X" ), &PAD::SetSizeX, &PAD::GetSizeX, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Size Y" ), &PAD::SetSizeY, &PAD::GetSizeY, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Hole Size X" ), &PAD::SetDrillSizeX, &PAD::GetDrillSizeX, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Hole Size Y" ), &PAD::SetDrillSizeY, &PAD::GetDrillSizeY, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Pad To Die Length" ), &PAD::SetPadToDieLength, &PAD::GetPadToDieLength, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Soldermask Margin Override" ), &PAD::SetLocalSolderMaskMargin, &PAD::GetLocalSolderMaskMargin, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Solderpaste Margin Override" ), &PAD::SetLocalSolderPasteMargin, &PAD::GetLocalSolderPasteMargin, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Solderpaste Margin Ratio Override" ), &PAD::SetLocalSolderPasteMarginRatio, &PAD::GetLocalSolderPasteMarginRatio ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Relief Spoke Width" ), &PAD::SetThermalSpokeWidth, &PAD::GetThermalSpokeWidth, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Relief Spoke Angle" ), &PAD::SetThermalSpokeAngleDegrees, &PAD::GetThermalSpokeAngleDegrees, - PROPERTY_DISPLAY::DEGREE ) ); + PROPERTY_DISPLAY::PT_DEGREE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Relief Gap" ), &PAD::SetThermalGap, &PAD::GetThermalGap, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Fabrication Property" ), &PAD::SetProperty, &PAD::GetProperty ) ); @@ -1746,7 +1746,7 @@ static struct PAD_DESC propMgr.AddProperty( new PROPERTY( _HKI( "Clearance Override" ), &PAD::SetLocalClearance, &PAD::GetLocalClearance, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Parent" ), NO_SETTER( PAD, wxString ), &PAD::GetParentAsString ) ); diff --git a/pcbnew/pcb_target.cpp b/pcbnew/pcb_target.cpp index cde7fc2e72..1b1e164a4c 100644 --- a/pcbnew/pcb_target.cpp +++ b/pcbnew/pcb_target.cpp @@ -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( _HKI( "Size" ), - &PCB_TARGET::SetSize, &PCB_TARGET::GetSize, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TARGET::SetSize, &PCB_TARGET::GetSize, PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Width" ), - &PCB_TARGET::SetWidth, &PCB_TARGET::GetWidth, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TARGET::SetWidth, &PCB_TARGET::GetWidth, PROPERTY_DISPLAY::PT_SIZE ) ); auto shape = new PROPERTY( _HKI( "Shape" ), &PCB_TARGET::SetShape, &PCB_TARGET::GetShape ); diff --git a/pcbnew/pcb_track.cpp b/pcbnew/pcb_track.cpp index 8889983b51..4298bc8b17 100644 --- a/pcbnew/pcb_track.cpp +++ b/pcbnew/pcb_track.cpp @@ -1242,34 +1242,34 @@ static struct TRACK_VIA_DESC propMgr.InheritsAfter( TYPE_HASH( PCB_TRACK ), TYPE_HASH( BOARD_CONNECTED_ITEM ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Width" ), - &PCB_TRACK::SetWidth, &PCB_TRACK::GetWidth, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TRACK::SetWidth, &PCB_TRACK::GetWidth, PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Position X" ), new PROPERTY( _HKI( "Origin X" ), - &PCB_TRACK::SetX, &PCB_TRACK::GetX, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TRACK::SetX, &PCB_TRACK::GetX, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Position Y" ), new PROPERTY( _HKI( "Origin Y" ), - &PCB_TRACK::SetY, &PCB_TRACK::GetY, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TRACK::SetY, &PCB_TRACK::GetY, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.AddProperty( new PROPERTY( _HKI( "End X" ), - &PCB_TRACK::SetEndX, &PCB_TRACK::GetEndX, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TRACK::SetEndX, &PCB_TRACK::GetEndX, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.AddProperty( new PROPERTY( _HKI( "End Y" ), - &PCB_TRACK::SetEndY, &PCB_TRACK::GetEndY, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TRACK::SetEndY, &PCB_TRACK::GetEndY, PROPERTY_DISPLAY::PT_COORD ) ); // Arc REGISTER_TYPE( PCB_ARC ); propMgr.InheritsAfter( TYPE_HASH( PCB_ARC ), TYPE_HASH( BOARD_CONNECTED_ITEM ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Width" ), - &PCB_ARC::SetWidth, &PCB_ARC::GetWidth, PROPERTY_DISPLAY::SIZE ) ); + &PCB_ARC::SetWidth, &PCB_ARC::GetWidth, PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Position X" ), new PROPERTY( _HKI( "Origin X" ), - &PCB_TRACK::SetX, &PCB_ARC::GetX, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TRACK::SetX, &PCB_ARC::GetX, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Position Y" ), new PROPERTY( _HKI( "Origin Y" ), - &PCB_TRACK::SetY, &PCB_ARC::GetY, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TRACK::SetY, &PCB_ARC::GetY, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.AddProperty( new PROPERTY( _HKI( "End X" ), - &PCB_TRACK::SetEndX, &PCB_ARC::GetEndX, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TRACK::SetEndX, &PCB_ARC::GetEndX, PROPERTY_DISPLAY::PT_COORD ) ); propMgr.AddProperty( new PROPERTY( _HKI( "End Y" ), - &PCB_TRACK::SetEndY, &PCB_ARC::GetEndY, PROPERTY_DISPLAY::SIZE ) ); + &PCB_TRACK::SetEndY, &PCB_ARC::GetEndY, PROPERTY_DISPLAY::PT_COORD ) ); // Via REGISTER_TYPE( PCB_VIA ); @@ -1279,9 +1279,9 @@ static struct TRACK_VIA_DESC // TODO test drill, use getdrillvalue? propMgr.ReplaceProperty( TYPE_HASH( PCB_TRACK ), _HKI( "Width" ), new PROPERTY( _HKI( "Diameter" ), - &PCB_VIA::SetWidth, &PCB_VIA::GetWidth, PROPERTY_DISPLAY::SIZE ) ); + &PCB_VIA::SetWidth, &PCB_VIA::GetWidth, PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Hole" ), - &PCB_VIA::SetDrill, &PCB_VIA::GetDrillValue, PROPERTY_DISPLAY::SIZE ) ); + &PCB_VIA::SetDrill, &PCB_VIA::GetDrillValue, PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.ReplaceProperty( TYPE_HASH( BOARD_ITEM ), _HKI( "Layer" ), new PROPERTY_ENUM( _HKI( "Layer Top" ), &PCB_VIA::SetLayer, &PCB_VIA::GetLayer ) ); diff --git a/pcbnew/zone.cpp b/pcbnew/zone.cpp index 2799c41fbc..b2c3cf4bb3 100644 --- a/pcbnew/zone.cpp +++ b/pcbnew/zone.cpp @@ -1299,18 +1299,18 @@ static struct ZONE_DESC &ZONE::SetZoneName, &ZONE::GetZoneName ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Clearance Override" ), &ZONE::SetLocalClearance, &ZONE::GetLocalClearance, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Min Width" ), &ZONE::SetMinThickness, &ZONE::GetMinThickness, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY_ENUM( _HKI( "Pad Connections" ), &ZONE::SetPadConnection, &ZONE::GetPadConnection ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Relief Gap" ), &ZONE::SetThermalReliefGap, &ZONE::GetThermalReliefGap, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); propMgr.AddProperty( new PROPERTY( _HKI( "Thermal Relief Spoke Width" ), &ZONE::SetThermalReliefSpokeWidth, &ZONE::GetThermalReliefSpokeWidth, - PROPERTY_DISPLAY::SIZE ) ); + PROPERTY_DISPLAY::PT_SIZE ) ); } } _ZONE_DESC;