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

Beef up property manager access to SCH_SYMBOL. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16640
This commit is contained in:
Jeff Young 2024-01-18 16:11:33 +00:00
parent 61876533df
commit 6361995412
3 changed files with 118 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/sch_edit_frame.h
View File

@ -64,22 +64,6 @@ class RESCUER;
class HIERARCHY_PANE;
// @todo Move this to transform alone with all of the transform manipulation code.
/// enum used in RotationMiroir()
enum SYMBOL_ORIENTATION_T
{
SYM_NORMAL, // Normal orientation, no rotation or mirror
SYM_ROTATE_CLOCKWISE, // Rotate -90
SYM_ROTATE_COUNTERCLOCKWISE, // Rotate +90
SYM_ORIENT_0, // No rotation and no mirror id SYM_NORMAL
SYM_ORIENT_90, // Rotate 90, no mirror
SYM_ORIENT_180, // Rotate 180, no mirror
SYM_ORIENT_270, // Rotate -90, no mirror
SYM_MIRROR_X = 0x100, // Mirror around X axis
SYM_MIRROR_Y = 0x200 // Mirror around Y axis
};
/// Schematic search type used by the socket link with Pcbnew
enum SCH_SEARCH_T
{

50
eeschema/sch_symbol.cpp
View File

@ -2601,10 +2601,58 @@ static struct SCH_SYMBOL_DESC
{
SCH_SYMBOL_DESC()
{
ENUM_MAP<SYMBOL_ORIENTATION_PROP>::Instance()
.Map( SYMBOL_ANGLE_0, wxS( "0" ) )
.Map( SYMBOL_ANGLE_90, wxS( "90" ) )
.Map( SYMBOL_ANGLE_180, wxS( "180" ) )
.Map( SYMBOL_ANGLE_270, wxS( "270" ) );
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
REGISTER_TYPE( SCH_SYMBOL );
propMgr.InheritsAfter( TYPE_HASH( SCH_SYMBOL ), TYPE_HASH( SCH_ITEM ) );
propMgr.AddProperty( new PROPERTY<SCH_SYMBOL, int>( _HKI( "Position X" ),
&SCH_SYMBOL::SetX, &SCH_SYMBOL::GetX, PROPERTY_DISPLAY::PT_COORD,
ORIGIN_TRANSFORMS::ABS_X_COORD ) );
propMgr.AddProperty( new PROPERTY<SCH_SYMBOL, int>( _HKI( "Position Y" ),
&SCH_SYMBOL::SetY, &SCH_SYMBOL::GetY, PROPERTY_DISPLAY::PT_COORD,
ORIGIN_TRANSFORMS::ABS_Y_COORD ) );
propMgr.AddProperty( new PROPERTY_ENUM<SCH_SYMBOL, SYMBOL_ORIENTATION_PROP>(
_HKI( "Orientation" ), &SCH_SYMBOL::SetOrientationProp,
&SCH_SYMBOL::GetOrientationProp ) );
auto isMultiUnitSymbol =
[]( INSPECTABLE* aItem ) -> bool
{
if( SCH_SYMBOL* symbol = dynamic_cast<SCH_SYMBOL*>( aItem ) )
return symbol->GetUnitCount() > 1;
return false;
};
propMgr.AddProperty( new PROPERTY<SCH_SYMBOL, int>( _HKI( "Unit" ),
&SCH_SYMBOL::SetUnit, &SCH_SYMBOL::GetUnit ) )
.SetAvailableFunc( isMultiUnitSymbol );
const wxString groupFields = _HKI( "Fields" );
propMgr.AddProperty( new PROPERTY<SCH_SYMBOL, wxString>( _HKI( "Reference" ),
&SCH_SYMBOL::SetRefProp, &SCH_SYMBOL::GetRefProp ),
groupFields );
propMgr.AddProperty( new PROPERTY<SCH_SYMBOL, wxString>( _HKI( "Value" ),
&SCH_SYMBOL::SetValueProp, &SCH_SYMBOL::GetValueProp ),
groupFields );
propMgr.AddProperty( new PROPERTY<SCH_SYMBOL, wxString>( _HKI( "Library Link" ),
NO_SETTER( SCH_SYMBOL, wxString ), &SCH_SYMBOL::GetSymbolIDAsString ),
groupFields );
propMgr.AddProperty( new PROPERTY<SCH_SYMBOL, wxString>( _HKI( "Library Description" ),
NO_SETTER( SCH_SYMBOL, wxString ), &SCH_SYMBOL::GetDescription ),
groupFields );
propMgr.AddProperty( new PROPERTY<SCH_SYMBOL, wxString>( _HKI( "Keywords" ),
NO_SETTER( SCH_SYMBOL, wxString ), &SCH_SYMBOL::GetKeyWords ),
groupFields );
const wxString groupAttributes = _HKI( "Attributes" );
propMgr.AddProperty( new PROPERTY<SCH_SYMBOL, bool>( _HKI( "Exclude From Board" ),
@ -2621,3 +2669,5 @@ static struct SCH_SYMBOL_DESC
groupAttributes );
}
} _SCH_SYMBOL_DESC;
ENUM_TO_WXANY( SYMBOL_ORIENTATION_PROP )

68
eeschema/sch_symbol.h
View File

@ -44,6 +44,7 @@
#include <wx/gdicmn.h>
#include <wx/string.h>
#include <schematic.h>
#include <sch_field.h>
#include <sch_item.h>
#include <sch_pin.h>
@ -74,6 +75,33 @@ typedef std::weak_ptr<LIB_SYMBOL> PART_REF;
extern std::string toUTFTildaText( const wxString& txt );
// @todo Move this to transform alone with all of the transform manipulation code.
/// enum used in RotationMiroir()
enum SYMBOL_ORIENTATION_T
{
SYM_NORMAL, // Normal orientation, no rotation or mirror
SYM_ROTATE_CLOCKWISE, // Rotate -90
SYM_ROTATE_COUNTERCLOCKWISE, // Rotate +90
SYM_ORIENT_0, // No rotation and no mirror id SYM_NORMAL
SYM_ORIENT_90, // Rotate 90, no mirror
SYM_ORIENT_180, // Rotate 180, no mirror
SYM_ORIENT_270, // Rotate -90, no mirror
SYM_MIRROR_X = 0x100, // Mirror around X axis
SYM_MIRROR_Y = 0x200 // Mirror around Y axis
};
// Cover for SYMBOL_ORIENTATION_T for property manager (in order to expose only a subset of
// SYMBOL_ORIENTATION_T's values).
enum SYMBOL_ORIENTATION_PROP
{
SYMBOL_ANGLE_0 = SYMBOL_ORIENTATION_T::SYM_ORIENT_0,
SYMBOL_ANGLE_90 = SYMBOL_ORIENTATION_T::SYM_ORIENT_90,
SYMBOL_ANGLE_180 = SYMBOL_ORIENTATION_T::SYM_ORIENT_180,
SYMBOL_ANGLE_270 = SYMBOL_ORIENTATION_T::SYM_ORIENT_270
};
/**
* Schematic symbol object.
*/
@ -174,6 +202,8 @@ public:
const LIB_ID& GetLibId() const { return m_lib_id; }
wxString GetSymbolIDAsString() const { return m_lib_id.Format(); }
/**
* The name of the symbol in the schematic library symbol list.
*
@ -319,6 +349,18 @@ public:
*/
int GetOrientation() const;
/**
* Access for property manager.
*/
void SetOrientationProp( SYMBOL_ORIENTATION_PROP aAngle )
{
SetOrientation( aAngle );
}
SYMBOL_ORIENTATION_PROP GetOrientationProp() const
{
return (SYMBOL_ORIENTATION_PROP) GetOrientation();
}
/**
* Return the list of system text vars & fields for this symbol.
*/
@ -457,6 +499,26 @@ public:
bool aAllowExtraText ) const;
void SetFootprintFieldText( const wxString& aFootprint );
/*
* Field access for property manager
*/
wxString GetRefProp() const
{
return GetRef( &Schematic()->CurrentSheet() );
}
void SetRefProp( const wxString aRef )
{
SetRef( &Schematic()->CurrentSheet(), aRef );
}
wxString GetValueProp() const
{
return GetValueFieldText( false, &Schematic()->CurrentSheet(), false );
}
void SetValueProp( const wxString aRef )
{
SetValueFieldText( aRef );
}
/**
* Restore fields to the original library values.
*
@ -700,6 +762,12 @@ public:
VECTOR2I GetPosition() const override { return m_pos; }
void SetPosition( const VECTOR2I& aPosition ) override { Move( aPosition - m_pos ); }
int GetX() const { return GetPosition().x; };
void SetX( int aX ) { SetPosition( VECTOR2I( aX, GetY() ) ); }
int GetY() const { return GetPosition().y; }
void SetY( int aY ) { SetPosition( VECTOR2I( GetX(), aY ) ); }
bool HitTest( const VECTOR2I& aPosition, int aAccuracy = 0 ) const override;
bool HitTest( const BOX2I& aRect, bool aContained, int aAccuracy = 0 ) const override;