7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 11:41:41 +00:00

properties: post-rebase fixes

This commit is contained in:
Tomasz Wlostowski 2020-05-27 16:01:07 +02:00
parent 04728278c0
commit c1d5394e46
30 changed files with 39 additions and 37 deletions

View File

@ -630,7 +630,7 @@ static struct EDA_TEXT_DESC
propMgr.AddProperty( new PROPERTY<EDA_TEXT, wxString>( _( "Text" ),
&EDA_TEXT::SetText, &EDA_TEXT::GetText ) );
propMgr.AddProperty( new PROPERTY<EDA_TEXT, int>( _( "Thickness" ),
&EDA_TEXT::SetThickness, &EDA_TEXT::GetThickness, PROPERTY_DISPLAY::DISTANCE ) );
&EDA_TEXT::SetTextThickness, &EDA_TEXT::GetTextThickness, PROPERTY_DISPLAY::DISTANCE ) );
propMgr.AddProperty( new PROPERTY<EDA_TEXT, bool>( _( "Italic" ),
&EDA_TEXT::SetItalic, &EDA_TEXT::IsItalic ) );
propMgr.AddProperty( new PROPERTY<EDA_TEXT, bool>( _( "Bold" ),

View File

@ -87,7 +87,7 @@ public:
void MoveTo( const wxPoint& aPosition ) override;
const wxPoint GetPosition() const override { return m_Pos; }
wxPoint GetPosition() const override { return m_Pos; }
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter ) override;

View File

@ -351,7 +351,7 @@ void LIB_BEZIER::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_
aList.emplace_back( _( "Bounding Box" ), msg, BROWN );
}
const wxPoint LIB_BEZIER::GetPosition() const
wxPoint LIB_BEZIER::GetPosition() const
{
if( !m_PolyPoints.size() )
return wxPoint(0, 0);

View File

@ -74,7 +74,7 @@ public:
void MoveTo( const wxPoint& aPosition ) override;
const wxPoint GetPosition() const override;
wxPoint GetPosition() const override;
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter ) override;

View File

@ -68,7 +68,7 @@ public:
void MoveTo( const wxPoint& aPosition ) override;
const wxPoint GetPosition() const override { return m_Pos; }
wxPoint GetPosition() const override { return m_Pos; }
void SetEnd( const wxPoint& aPosition ) { m_EndPos = aPosition; }
wxPoint GetEnd() const { return m_EndPos; }

View File

@ -177,7 +177,7 @@ public:
void MoveTo( const wxPoint& aPosition ) override;
const wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter ) override;

View File

@ -427,7 +427,7 @@ public:
void MoveTo( const wxPoint& aPosition ) override;
const wxPoint GetPosition() const override { return m_position; }
wxPoint GetPosition() const override { return m_position; }
/**
* move this and all linked pins to the new position

View File

@ -90,7 +90,7 @@ public:
void MoveTo( const wxPoint& aPosition ) override;
const wxPoint GetPosition() const override { return m_PolyPoints[0]; }
wxPoint GetPosition() const override { return m_PolyPoints[0]; }
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter ) override;

View File

@ -71,7 +71,7 @@ public:
void MoveTo( const wxPoint& aPosition ) override;
const wxPoint GetPosition() const override { return m_Pos; }
wxPoint GetPosition() const override { return m_Pos; }
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter ) override;

View File

@ -81,7 +81,7 @@ public:
void MoveTo( const wxPoint& aPosition ) override;
const wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
void MirrorHorizontal( const wxPoint& aCenter ) override;
void MirrorVertical( const wxPoint& aCenter ) override;

View File

@ -137,7 +137,7 @@ public:
void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) override;
const wxPoint GetPosition() const override { return m_pos; }
wxPoint GetPosition() const override { return m_pos; }
void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; }
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

View File

@ -107,7 +107,7 @@ public:
void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const override;
const wxPoint GetPosition() const override { return m_pos; }
wxPoint GetPosition() const override { return m_pos; }
void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; }
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

View File

@ -649,7 +649,7 @@ public:
bool IsReplaceable() const override { return true; }
const wxPoint GetPosition() const override { return m_Pos; }
wxPoint GetPosition() const override { return m_Pos; }
void SetPosition( const wxPoint& aPosition ) override { Move( aPosition - m_Pos ); }
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

View File

@ -576,7 +576,7 @@ void SCH_FIELD::SetPosition( const wxPoint& aPosition )
}
const wxPoint SCH_FIELD::GetPosition() const
wxPoint SCH_FIELD::GetPosition() const
{
if( m_Parent && m_Parent->Type() == SCH_COMPONENT_T )
{

View File

@ -187,7 +187,7 @@ public:
wxPoint GetLibPosition() const { return EDA_TEXT::GetTextPos(); }
const wxPoint GetPosition() const override;
wxPoint GetPosition() const override;
void SetPosition( const wxPoint& aPosition ) override;
wxPoint GetParentPosition() const;

View File

@ -136,7 +136,7 @@ public:
|| ( m_pos == rhs.m_pos && m_item < rhs.m_item ) );
}
const wxPoint GetPosition() const { return m_pos; }
wxPoint GetPosition() const { return m_pos; }
EDA_ITEM* GetItem() const { return m_item; }
const EDA_ITEM* GetParent() const { return m_parent; }
DANGLING_END_T GetType() const { return m_type; }

View File

@ -94,7 +94,7 @@ public:
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
const wxPoint GetPosition() const override { return m_pos; }
wxPoint GetPosition() const override { return m_pos; }
void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; }
int GetDiameter() const { return m_diameter; }

View File

@ -207,7 +207,7 @@ public:
bool operator <( const SCH_ITEM& aItem ) const override;
const wxPoint GetPosition() const override { return m_start; }
wxPoint GetPosition() const override { return m_start; }
void SetPosition( const wxPoint& aPosition ) override;
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

View File

@ -98,7 +98,7 @@ public:
BITMAP_DEF GetMenuImage() const override;
const wxPoint GetPosition() const override { return m_Pos; }
wxPoint GetPosition() const override { return m_Pos; }
void SetPosition( const wxPoint& aPosition ) override { m_Pos = aPosition; }
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

View File

@ -105,7 +105,7 @@ public:
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
const wxPoint GetPosition() const override { return m_pos; }
wxPoint GetPosition() const override { return m_pos; }
void SetPosition( const wxPoint& aPosition ) override { m_pos = aPosition; }
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

View File

@ -78,7 +78,7 @@ public:
void Rotate( wxPoint aPosition ) override {}
const wxPoint GetPosition() const override { return GetTransformedPosition(); }
wxPoint GetPosition() const override { return GetTransformedPosition(); }
const wxPoint GetLocalPosition() const { return m_position; }
void SetPosition( const wxPoint& aPosition ) override { m_position = aPosition; }

View File

@ -567,7 +567,7 @@ public:
void ViewGetLayers( int aLayers[], int& aCount ) const override;
const wxPoint GetPosition() const override { return m_pos; }
wxPoint GetPosition() const override { return m_pos; }
void SetPosition( const wxPoint& aPosition ) override;
bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;

View File

@ -310,7 +310,7 @@ public:
void GetNetListItem( NETLIST_OBJECT_LIST& aNetListItems, SCH_SHEET_PATH* aSheetPath ) override;
const wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
wxPoint GetPosition() const override { return EDA_TEXT::GetTextPos(); }
void SetPosition( const wxPoint& aPosition ) override { EDA_TEXT::SetTextPos( aPosition ); }
bool HitTest( const wxPoint& aPosition, int aAccuracy = 0 ) const override;

View File

@ -194,7 +194,7 @@ public:
* @return const wxPoint& - The position of this object.
* This function exists mainly to satisfy the virtual GetPosition() in parent class
*/
const wxPoint GetPosition() const override { return m_Start; }
wxPoint GetPosition() const override { return m_Start; }
void SetPosition( const wxPoint& aPos ) { m_Start = aPos; }
/**

View File

@ -334,7 +334,7 @@ public:
*/
virtual const EDA_RECT GetBoundingBox() const;
virtual const wxPoint GetPosition() const { return wxPoint(); }
virtual wxPoint GetPosition() const { return wxPoint(); }
/**
* Function GetFocusPosition

Some files were not shown because too many files have changed in this diff Show More