Consistent naming.

This commit is contained in:
Jeff Young 2021-03-19 19:55:59 +00:00
parent 4b46c0c954
commit 7a13ad7b17
21 changed files with 44 additions and 45 deletions

View File

@ -142,9 +142,9 @@ void SCH_BITMAP::MirrorHorizontally( int aCenter )
} }
void SCH_BITMAP::Rotate( wxPoint aPosition ) void SCH_BITMAP::Rotate( wxPoint aCenter )
{ {
RotatePoint( &m_pos, aPosition, 900 ); RotatePoint( &m_pos, aCenter, 900 );
m_image->Rotate( false ); m_image->Rotate( false );
} }

View File

@ -126,7 +126,7 @@ public:
void MirrorHorizontally( int aCenter ) override; void MirrorHorizontally( int aCenter ) override;
void MirrorVertically( int aCenter ) override; void MirrorVertically( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
wxString GetSelectMenuText( EDA_UNITS aUnits ) const override wxString GetSelectMenuText( EDA_UNITS aUnits ) const override
{ {

View File

@ -268,9 +268,9 @@ void SCH_BUS_ENTRY_BASE::MirrorHorizontally( int aCenter )
} }
void SCH_BUS_ENTRY_BASE::Rotate( wxPoint aPosition ) void SCH_BUS_ENTRY_BASE::Rotate( wxPoint aCenter )
{ {
RotatePoint( &m_pos, aPosition, 900 ); RotatePoint( &m_pos, aCenter, 900 );
RotatePoint( &m_size.x, &m_size.y, 900 ); RotatePoint( &m_size.x, &m_size.y, 900 );
} }

View File

@ -90,7 +90,7 @@ public:
void MirrorHorizontally( int aCenter ) override; void MirrorHorizontally( int aCenter ) override;
void MirrorVertically( int aCenter ) override; void MirrorVertically( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
bool IsDangling() const override; bool IsDangling() const override;

View File

@ -135,9 +135,9 @@ void SCH_JUNCTION::MirrorHorizontally( int aCenter )
} }
void SCH_JUNCTION::Rotate( wxPoint aPosition ) void SCH_JUNCTION::Rotate( wxPoint aCenter )
{ {
RotatePoint( &m_pos, aPosition, 900 ); RotatePoint( &m_pos, aCenter, 900 );
} }

View File

@ -71,7 +71,7 @@ public:
void MirrorHorizontally( int aCenter ) override; void MirrorHorizontally( int aCenter ) override;
void MirrorVertically( int aCenter ) override; void MirrorVertically( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList ) override; void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList ) override;

View File

@ -392,22 +392,22 @@ void SCH_LINE::MirrorHorizontally( int aCenter )
} }
void SCH_LINE::Rotate( wxPoint aPosition ) void SCH_LINE::Rotate( wxPoint aCenter )
{ {
RotatePoint( &m_start, aPosition, 900 ); RotatePoint( &m_start, aCenter, 900 );
RotatePoint( &m_end, aPosition, 900 ); RotatePoint( &m_end, aCenter, 900 );
} }
void SCH_LINE::RotateStart( wxPoint aPosition ) void SCH_LINE::RotateStart( wxPoint aCenter )
{ {
RotatePoint( &m_start, aPosition, 900 ); RotatePoint( &m_start, aCenter, 900 );
} }
void SCH_LINE::RotateEnd( wxPoint aPosition ) void SCH_LINE::RotateEnd( wxPoint aCenter )
{ {
RotatePoint( &m_end, aPosition, 900 ); RotatePoint( &m_end, aCenter, 900 );
} }

View File

@ -177,9 +177,9 @@ public:
void MirrorVertically( int aCenter ) override; void MirrorVertically( int aCenter ) override;
void MirrorHorizontally( int aCenter ) override; void MirrorHorizontally( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
void RotateStart( wxPoint aPosition ); void RotateStart( wxPoint aCenter );
void RotateEnd( wxPoint aPosition ); void RotateEnd( wxPoint aCenter );
/** /**
* Check line against \a aLine to see if it overlaps and merge if it does. * Check line against \a aLine to see if it overlaps and merge if it does.

View File

@ -173,7 +173,7 @@ BITMAPS SCH_MARKER::GetMenuImage() const
} }
void SCH_MARKER::Rotate( wxPoint aPosition ) void SCH_MARKER::Rotate( wxPoint aCenter )
{ {
// Marker geometry isn't user-editable // Marker geometry isn't user-editable
} }

View File

@ -78,7 +78,7 @@ public:
void MirrorHorizontally( int aCenter ) override; void MirrorHorizontally( int aCenter ) override;
void MirrorVertically( int aCenter ) override; void MirrorVertically( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
/** /**
* Compare DRC marker main and auxiliary text against search string. * Compare DRC marker main and auxiliary text against search string.

View File

@ -127,9 +127,9 @@ void SCH_NO_CONNECT::MirrorHorizontally( int aCenter )
} }
void SCH_NO_CONNECT::Rotate( wxPoint aPosition ) void SCH_NO_CONNECT::Rotate( wxPoint aCenter )
{ {
RotatePoint( &m_pos, aPosition, 900 ); RotatePoint( &m_pos, aCenter, 900 );
} }

View File

@ -84,7 +84,7 @@ public:
void MirrorHorizontally( int aCenter ) override; void MirrorHorizontally( int aCenter ) override;
void MirrorVertically( int aCenter ) override; void MirrorVertically( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
bool IsConnectable() const override { return true; } bool IsConnectable() const override { return true; }

View File

@ -83,8 +83,7 @@ public:
void MirrorHorizontally( int aCenter ) override {} void MirrorHorizontally( int aCenter ) override {}
void MirrorVertically( int aCenter ) override {} void MirrorVertically( int aCenter ) override {}
void Rotate( wxPoint aCenter ) override {}
void Rotate( wxPoint aPosition ) override {}
wxPoint GetPosition() const override { return GetTransformedPosition(); } wxPoint GetPosition() const override { return GetTransformedPosition(); }
const wxPoint GetLocalPosition() const { return m_position; } const wxPoint GetLocalPosition() const { return m_position; }

View File

@ -717,11 +717,11 @@ void SCH_SHEET::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, MSG_PANEL_ITEMS& aList
} }
void SCH_SHEET::Rotate( wxPoint aPosition ) void SCH_SHEET::Rotate( wxPoint aCenter )
{ {
wxPoint prev = m_pos; wxPoint prev = m_pos;
RotatePoint( &m_pos, aPosition, 900 ); RotatePoint( &m_pos, aCenter, 900 );
RotatePoint( &m_size.x, &m_size.y, 900 ); RotatePoint( &m_size.x, &m_size.y, 900 );
if( m_size.x < 0 ) if( m_size.x < 0 )
@ -739,7 +739,7 @@ void SCH_SHEET::Rotate( wxPoint aPosition )
// Pins must be rotated first as that's how we determine vertical vs horizontal // Pins must be rotated first as that's how we determine vertical vs horizontal
// orientation for auto-placement // orientation for auto-placement
for( SCH_SHEET_PIN* sheetPin : m_pins ) for( SCH_SHEET_PIN* sheetPin : m_pins )
sheetPin->Rotate( aPosition ); sheetPin->Rotate( aCenter );
if( m_fieldsAutoplaced == FIELDS_AUTOPLACED_AUTO ) if( m_fieldsAutoplaced == FIELDS_AUTOPLACED_AUTO )
{ {

View File

@ -181,7 +181,7 @@ public:
void MirrorVertically( int aCenter ) override; void MirrorVertically( int aCenter ) override;
void MirrorHorizontally( int aCenter ) override; void MirrorHorizontally( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
bool Matches( const wxFindReplaceData& aSearchData, void* aAuxData ) const override bool Matches( const wxFindReplaceData& aSearchData, void* aAuxData ) const override
{ {
@ -522,9 +522,9 @@ public:
field.Move( aMoveVector ); field.Move( aMoveVector );
} }
void MirrorHorizontally( int aYaxis_position ) override; void MirrorHorizontally( int aCenter ) override;
void MirrorVertically( int aXaxis_position ) override; void MirrorVertically( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
bool Matches( const wxFindReplaceData& aSearchData, void* aAuxData ) const override; bool Matches( const wxFindReplaceData& aSearchData, void* aAuxData ) const override;

View File

@ -77,7 +77,7 @@ public:
void Move( const wxPoint& aMoveVector ) override {} void Move( const wxPoint& aMoveVector ) override {}
void MirrorHorizontally( int aCenter ) override {} void MirrorHorizontally( int aCenter ) override {}
void MirrorVertically( int aCenter ) override {} void MirrorVertically( int aCenter ) override {}
void Rotate( wxPoint aPosition ) override {} void Rotate( wxPoint aCenter ) override {}
#if defined(DEBUG) #if defined(DEBUG)
void Show( int , std::ostream& ) const override {} void Show( int , std::ostream& ) const override {}

View File

@ -243,10 +243,10 @@ void SCH_SHEET_PIN::MirrorHorizontally( int aCenter )
} }
void SCH_SHEET_PIN::Rotate( wxPoint aPosition ) void SCH_SHEET_PIN::Rotate( wxPoint aCenter )
{ {
wxPoint pt = GetTextPos(); wxPoint pt = GetTextPos();
RotatePoint( &pt, aPosition, 900 ); RotatePoint( &pt, aCenter, 900 );
ConstrainOnEdge( pt ); ConstrainOnEdge( pt );
} }

View File

@ -1483,11 +1483,11 @@ void SCH_COMPONENT::MirrorVertically( int aCenter )
} }
void SCH_COMPONENT::Rotate( wxPoint aPosition ) void SCH_COMPONENT::Rotate( wxPoint aCenter )
{ {
wxPoint prev = m_pos; wxPoint prev = m_pos;
RotatePoint( &m_pos, aPosition, 900 ); RotatePoint( &m_pos, aCenter, 900 );
SetOrientation( CMP_ROTATE_COUNTERCLOCKWISE ); SetOrientation( CMP_ROTATE_COUNTERCLOCKWISE );

View File

@ -608,7 +608,7 @@ public:
void MirrorHorizontally( int aCenter ) override; void MirrorHorizontally( int aCenter ) override;
void MirrorVertically( int aCenter ) override; void MirrorVertically( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
bool Matches( const wxFindReplaceData& aSearchData, void* aAuxData ) const override; bool Matches( const wxFindReplaceData& aSearchData, void* aAuxData ) const override;

View File

@ -215,10 +215,10 @@ void SCH_TEXT::MirrorVertically( int aCenter )
} }
void SCH_TEXT::Rotate( wxPoint aPosition ) void SCH_TEXT::Rotate( wxPoint aCenter )
{ {
wxPoint pt = GetTextPos(); wxPoint pt = GetTextPos();
RotatePoint( &pt, aPosition, 900 ); RotatePoint( &pt, aCenter, 900 );
wxPoint offset = pt - GetTextPos(); wxPoint offset = pt - GetTextPos();
Rotate90( false ); Rotate90( false );
@ -979,10 +979,10 @@ void SCH_GLOBALLABEL::SetLabelSpinStyle( LABEL_SPIN_STYLE aSpinStyle )
} }
void SCH_GLOBALLABEL::Rotate( wxPoint aPosition ) void SCH_GLOBALLABEL::Rotate( wxPoint aCenter )
{ {
wxPoint pt = GetTextPos(); wxPoint pt = GetTextPos();
RotatePoint( &pt, aPosition, 900 ); RotatePoint( &pt, aCenter, 900 );
wxPoint offset = pt - GetTextPos(); wxPoint offset = pt - GetTextPos();
Rotate90( false ); Rotate90( false );

View File

@ -278,7 +278,7 @@ public:
void MirrorHorizontally( int aCenter ) override; void MirrorHorizontally( int aCenter ) override;
void MirrorVertically( int aCenter ) override; void MirrorVertically( int aCenter ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
virtual void Rotate90( bool aClockwise ); virtual void Rotate90( bool aClockwise );
virtual void MirrorSpinStyle( bool aLeftRight ); virtual void MirrorSpinStyle( bool aLeftRight );
@ -402,7 +402,7 @@ public:
void RunOnChildren( const std::function<void( SCH_ITEM* )>& aFunction ) override; void RunOnChildren( const std::function<void( SCH_ITEM* )>& aFunction ) override;
void Rotate( wxPoint aPosition ) override; void Rotate( wxPoint aCenter ) override;
void Rotate90( bool aClockwise ) override; void Rotate90( bool aClockwise ) override;
void MirrorSpinStyle( bool aLeftRight ) override; void MirrorSpinStyle( bool aLeftRight ) override;