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

Move some LABEL_SPIN_STYLE to the cpp to add back warnings

This commit is contained in:
Marek Roszko 2021-06-01 19:13:53 -04:00
parent c8f308dd36
commit 5f581aa6ad
2 changed files with 72 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
eeschema/sch_text.cpp
View File

@ -130,6 +130,74 @@ static int* TemplateShape[5][4] =
}; };
LABEL_SPIN_STYLE LABEL_SPIN_STYLE::RotateCW()
{
SPIN newSpin = m_spin;
switch( m_spin )
{
case LABEL_SPIN_STYLE::LEFT: newSpin = LABEL_SPIN_STYLE::UP; break;
case LABEL_SPIN_STYLE::UP: newSpin = LABEL_SPIN_STYLE::RIGHT; break;
case LABEL_SPIN_STYLE::RIGHT: newSpin = LABEL_SPIN_STYLE::BOTTOM; break;
case LABEL_SPIN_STYLE::BOTTOM: newSpin = LABEL_SPIN_STYLE::LEFT; break;
default: wxLogWarning( "RotateCW encountered unknown current spin style" ); break;
}
return LABEL_SPIN_STYLE( newSpin );
}
LABEL_SPIN_STYLE LABEL_SPIN_STYLE::RotateCCW()
{
SPIN newSpin = m_spin;
switch( m_spin )
{
case LABEL_SPIN_STYLE::LEFT: newSpin = LABEL_SPIN_STYLE::BOTTOM; break;
case LABEL_SPIN_STYLE::BOTTOM: newSpin = LABEL_SPIN_STYLE::RIGHT; break;
case LABEL_SPIN_STYLE::RIGHT: newSpin = LABEL_SPIN_STYLE::UP; break;
case LABEL_SPIN_STYLE::UP: newSpin = LABEL_SPIN_STYLE::LEFT; break;
default: wxLogWarning( "RotateCCW encountered unknown current spin style" ); break;
}
return LABEL_SPIN_STYLE( newSpin );
}
LABEL_SPIN_STYLE LABEL_SPIN_STYLE::MirrorX()
{
SPIN newSpin = m_spin;
switch( m_spin )
{
case LABEL_SPIN_STYLE::UP: newSpin = LABEL_SPIN_STYLE::BOTTOM; break;
case LABEL_SPIN_STYLE::BOTTOM: newSpin = LABEL_SPIN_STYLE::UP; break;
case LABEL_SPIN_STYLE::LEFT: break;
case LABEL_SPIN_STYLE::RIGHT: break;
default: wxLogWarning( "MirrorX encountered unknown current spin style" ); break;
}
return LABEL_SPIN_STYLE( newSpin );
}
LABEL_SPIN_STYLE LABEL_SPIN_STYLE::MirrorY()
{
SPIN newSpin = m_spin;
switch( m_spin )
{
case LABEL_SPIN_STYLE::LEFT: newSpin = LABEL_SPIN_STYLE::RIGHT; break;
case LABEL_SPIN_STYLE::RIGHT: newSpin = LABEL_SPIN_STYLE::LEFT; break;
case LABEL_SPIN_STYLE::UP: break;
case LABEL_SPIN_STYLE::BOTTOM: break;
default: wxLogWarning( "MirrorY encountered unknown current spin style" ); break;
}
return LABEL_SPIN_STYLE( newSpin );
}
SCH_TEXT::SCH_TEXT( const wxPoint& pos, const wxString& text, KICAD_T aType ) : SCH_TEXT::SCH_TEXT( const wxPoint& pos, const wxString& text, KICAD_T aType ) :
SCH_ITEM( NULL, aType ), SCH_ITEM( NULL, aType ),
EDA_TEXT( text ), EDA_TEXT( text ),

64
eeschema/sch_text.h
View File

@ -71,75 +71,19 @@ public:
return static_cast<int>( m_spin ); return static_cast<int>( m_spin );
} }
LABEL_SPIN_STYLE RotateCW() LABEL_SPIN_STYLE RotateCW();
{
SPIN newSpin = m_spin;
switch( m_spin ) LABEL_SPIN_STYLE RotateCCW();
{
case LABEL_SPIN_STYLE::LEFT: newSpin = LABEL_SPIN_STYLE::UP; break;
case LABEL_SPIN_STYLE::UP: newSpin = LABEL_SPIN_STYLE::RIGHT; break;
case LABEL_SPIN_STYLE::RIGHT: newSpin = LABEL_SPIN_STYLE::BOTTOM; break;
case LABEL_SPIN_STYLE::BOTTOM: newSpin = LABEL_SPIN_STYLE::LEFT; break;
default: break;
}
return LABEL_SPIN_STYLE( newSpin );
}
LABEL_SPIN_STYLE RotateCCW()
{
SPIN newSpin = m_spin;
switch( m_spin )
{
case LABEL_SPIN_STYLE::LEFT: newSpin = LABEL_SPIN_STYLE::BOTTOM; break;
case LABEL_SPIN_STYLE::BOTTOM: newSpin = LABEL_SPIN_STYLE::RIGHT; break;
case LABEL_SPIN_STYLE::RIGHT: newSpin = LABEL_SPIN_STYLE::UP; break;
case LABEL_SPIN_STYLE::UP: newSpin = LABEL_SPIN_STYLE::LEFT; break;
default: break;
}
return LABEL_SPIN_STYLE( newSpin );
}
/* /*
* Mirrors the label spin style across the X axis or simply swaps up and bottom * Mirrors the label spin style across the X axis or simply swaps up and bottom
*/ */
LABEL_SPIN_STYLE MirrorX() LABEL_SPIN_STYLE MirrorX();
{
SPIN newSpin = m_spin;
switch( m_spin )
{
case LABEL_SPIN_STYLE::UP: newSpin = LABEL_SPIN_STYLE::BOTTOM; break;
case LABEL_SPIN_STYLE::BOTTOM: newSpin = LABEL_SPIN_STYLE::UP; break;
case LABEL_SPIN_STYLE::LEFT: break;
case LABEL_SPIN_STYLE::RIGHT: break;
default: break;
}
return LABEL_SPIN_STYLE( newSpin );
}
/* /*
* Mirrors the label spin style across the Y axis or simply swaps left and right * Mirrors the label spin style across the Y axis or simply swaps left and right
*/ */
LABEL_SPIN_STYLE MirrorY() LABEL_SPIN_STYLE MirrorY();
{
SPIN newSpin = m_spin;
switch( m_spin )
{
case LABEL_SPIN_STYLE::LEFT: newSpin = LABEL_SPIN_STYLE::RIGHT; break;
case LABEL_SPIN_STYLE::RIGHT: newSpin = LABEL_SPIN_STYLE::LEFT; break;
case LABEL_SPIN_STYLE::UP: break;
case LABEL_SPIN_STYLE::BOTTOM: break;
default: break;
}
return LABEL_SPIN_STYLE( newSpin );
}
private: private:
SPIN m_spin; SPIN m_spin;