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

Fix CLangTidy warnings and improve SNR.

This commit is contained in:
Jeff Young 2018-09-16 11:42:28 +01:00
parent 0058ef5825
commit 0af31e1bf0
2 changed files with 65 additions and 336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

367
eeschema/sch_text.cpp
View File

@ -145,29 +145,16 @@ wxPoint SCH_TEXT::GetSchematicTextOffset() const
{ {
wxPoint text_offset; wxPoint text_offset;
// add an offset to x ( or y) position to allow a text to // add an offset to x (or y) position to aid readability of text on a wire or line
// be on a wire or a line and be readable int thick_offset = TXT_MARGIN + ( GetPenSize() + GetDefaultLineThickness() ) / 2;
int thick_offset = TXT_MARGIN +
( GetPenSize() + GetDefaultLineThickness() ) / 2;
switch( GetLabelSpinStyle() ) switch( GetLabelSpinStyle() )
{ {
default: default:
case 0: // Horiz Normal Orientation (left justified) case 0: text_offset.y = -thick_offset; break; // Horiz Normal Orientation (left justified)
text_offset.y = -thick_offset; case 1: text_offset.x = -thick_offset; break; // Vert Orientation UP
break; case 2: text_offset.y = -thick_offset; break; // Horiz Orientation - Right justified
case 3: text_offset.x = -thick_offset; break; // Vert Orientation BOTTOM
case 1: // Vert Orientation UP
text_offset.x = -thick_offset;
break;
case 2: // Horiz Orientation - Right justified
text_offset.y = -thick_offset;
break;
case 3: // Vert Orientation BOTTOM
text_offset.x = -thick_offset;
break;
} }
return text_offset; return text_offset;
@ -197,18 +184,11 @@ void SCH_TEXT::MirrorY( int aYaxis_position )
// Text is NOT really mirrored; it is moved to a suitable horizontal position // Text is NOT really mirrored; it is moved to a suitable horizontal position
switch( GetLabelSpinStyle() ) switch( GetLabelSpinStyle() )
{ {
case 0: // horizontal text
SetLabelSpinStyle( 2 );
break;
case 2: // invert horizontal text
SetLabelSpinStyle( 0 );
break;
case 1: // Vert Orientation UP
case 3: // Vert Orientation BOTTOM
default: default:
break; case 0: SetLabelSpinStyle( 2 ); break; // horizontal text
case 1: break; // Vert Orientation UP
case 2: SetLabelSpinStyle( 0 ); break; // invert horizontal text
case 3: break; // Vert Orientation BOTTOM
} }
SetTextX( Mirror( GetTextPos().x, aYaxis_position ) ); SetTextX( Mirror( GetTextPos().x, aYaxis_position ) );
@ -220,18 +200,11 @@ void SCH_TEXT::MirrorX( int aXaxis_position )
// Text is NOT really mirrored; it is moved to a suitable vertical position // Text is NOT really mirrored; it is moved to a suitable vertical position
switch( GetLabelSpinStyle() ) switch( GetLabelSpinStyle() )
{ {
case 1: // Vert Orientation UP
SetLabelSpinStyle( 3 );
break;
case 3: // Vert Orientation BOTTOM
SetLabelSpinStyle( 1 );
break;
case 0: // horizontal text
case 2: // invert horizontal text
default: default:
break; case 0: break; // horizontal text
case 1: SetLabelSpinStyle( 3 ); break; // Vert Orientation UP
case 2: break; // invert horizontal text
case 3: SetLabelSpinStyle( 1 ); break; // Vert Orientation BOTTOM
} }
SetTextY( Mirror( GetTextPos().y, aXaxis_position ) ); SetTextY( Mirror( GetTextPos().y, aXaxis_position ) );
@ -248,30 +221,19 @@ void SCH_TEXT::Rotate( wxPoint aPosition )
SetLabelSpinStyle( (GetLabelSpinStyle() + 1) % 4 ); SetLabelSpinStyle( (GetLabelSpinStyle() + 1) % 4 );
switch( GetLabelSpinStyle() ) if( this->Type() == SCH_TEXT_T )
{ {
case 0: // horizontal text switch( GetLabelSpinStyle() )
dy = GetTextHeight(); {
break; case 0: dy = GetTextHeight(); break; // horizontal text
case 1: dy = 0; break; // Vert Orientation UP
case 2: dy = GetTextHeight(); break; // invert horizontal text
case 3: dy = 0; break; // Vert Orientation BOTTOM
default: dy = 0; break;
}
case 1: // Vert Orientation UP SetTextY( GetTextPos().y + dy );
dy = 0;
break;
case 2: // invert horizontal text
dy = GetTextHeight();
break;
case 3: // Vert Orientation BOTTOM
dy = 0;
break;
default:
dy = 0;
break;
} }
SetTextY( GetTextPos().y + dy );
} }
@ -477,7 +439,7 @@ const EDA_RECT SCH_TEXT::GetBoundingBox() const
EDA_RECT rect = GetTextBox( -1, linewidth ); EDA_RECT rect = GetTextBox( -1, linewidth );
if( GetTextAngle() ) // Rotate rect if( GetTextAngle() != 0 ) // Rotate rect
{ {
wxPoint pos = rect.GetOrigin(); wxPoint pos = rect.GetOrigin();
wxPoint end = rect.GetEnd(); wxPoint end = rect.GetEnd();
@ -569,7 +531,7 @@ void SCH_TEXT::Plot( PLOTTER* aPlotter )
wxStringSplit( GetShownText(), strings_list, '\n' ); wxStringSplit( GetShownText(), strings_list, '\n' );
positions.reserve( strings_list.Count() ); positions.reserve( strings_list.Count() );
GetPositionsOfLinesOfMultilineText(positions, strings_list.Count() ); GetPositionsOfLinesOfMultilineText(positions, (int) strings_list.Count() );
for( unsigned ii = 0; ii < strings_list.Count(); ii++ ) for( unsigned ii = 0; ii < strings_list.Count(); ii++ )
{ {
@ -608,53 +570,23 @@ void SCH_TEXT::GetMsgPanelInfo( EDA_UNITS_T aUnits, MSG_PANEL_ITEMS& aList )
switch( Type() ) switch( Type() )
{ {
case SCH_TEXT_T: case SCH_TEXT_T: msg = _( "Graphic Text" ); break;
msg = _( "Graphic Text" ); case SCH_LABEL_T: msg = _( "Label" ); break;
break; case SCH_GLOBAL_LABEL_T: msg = _( "Global Label" ); break;
case SCH_HIERARCHICAL_LABEL_T: msg = _( "Hierarchical Label" ); break;
case SCH_LABEL_T: case SCH_SHEET_PIN_T: msg = _( "Hierarchical Sheet Pin" ); break;
msg = _( "Label" ); default: return;
break;
case SCH_GLOBAL_LABEL_T:
msg = _( "Global Label" );
break;
case SCH_HIERARCHICAL_LABEL_T:
msg = _( "Hierarchical Label" );
break;
case SCH_SHEET_PIN_T:
msg = _( "Hierarchical Sheet Pin" );
break;
default:
return;
} }
aList.push_back( MSG_PANEL_ITEM( msg, GetShownText(), DARKCYAN ) ); aList.push_back( MSG_PANEL_ITEM( msg, GetShownText(), DARKCYAN ) );
switch( GetLabelSpinStyle() ) switch( GetLabelSpinStyle() )
{ {
case 0: // horizontal text case 0: msg = _( "Horizontal" ); break;
msg = _( "Horizontal" ); case 1: msg = _( "Vertical up" ); break;
break; case 2: msg = _( "Horizontal invert" ); break;
case 3: msg = _( "Vertical down" ); break;
case 1: // Vert Orientation UP default: msg = wxT( "???" ); break;
msg = _( "Vertical up" );
break;
case 2: // invert horizontal text
msg = _( "Horizontal invert" );
break;
case 3: // Vert Orientation Down
msg = _( "Vertical down" );
break;
default:
msg = wxT( "???" );
break;
} }
aList.push_back( MSG_PANEL_ITEM( _( "Orientation" ), msg, BROWN ) ); aList.push_back( MSG_PANEL_ITEM( _( "Orientation" ), msg, BROWN ) );
@ -729,58 +661,6 @@ EDA_ITEM* SCH_LABEL::Clone() const
} }
wxPoint SCH_LABEL::GetSchematicTextOffset() const
{
return SCH_TEXT::GetSchematicTextOffset();
}
void SCH_LABEL::SetLabelSpinStyle( int aOrientation )
{
SCH_TEXT::SetLabelSpinStyle( aOrientation );
}
void SCH_LABEL::MirrorX( int aXaxis_position )
{
// Text is NOT really mirrored; it is moved to a suitable position
switch( GetLabelSpinStyle() )
{
case 1: // Vert Orientation UP
SetLabelSpinStyle( 3 );
break;
case 3: // Vert Orientation BOTTOM
SetLabelSpinStyle( 1 );
break;
case 0: // horizontal text
case 2: // invert horizontal text
default:
break;
}
SetTextY( ::Mirror( GetTextPos().y, aXaxis_position ) );
}
void SCH_LABEL::Rotate( wxPoint aPosition )
{
wxPoint pt = GetTextPos();
RotatePoint( &pt, aPosition, 900 );
SetTextPos( pt );
SetLabelSpinStyle( (GetLabelSpinStyle() + 1) % 4 );
}
void SCH_LABEL::Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset,
GR_DRAWMODE DrawMode, COLOR4D Color )
{
SCH_TEXT::Draw( panel, DC, offset, DrawMode, Color );
}
const EDA_RECT SCH_LABEL::GetBoundingBox() const const EDA_RECT SCH_LABEL::GetBoundingBox() const
{ {
int linewidth = GetThickness() == 0 ? GetDefaultLineThickness() : GetThickness(); int linewidth = GetThickness() == 0 ? GetDefaultLineThickness() : GetThickness();
@ -833,55 +713,6 @@ EDA_ITEM* SCH_GLOBALLABEL::Clone() const
} }
void SCH_GLOBALLABEL::MirrorY( int aYaxis_position )
{
/* The global label is NOT really mirrored.
* for an horizontal label, the schematic orientation is changed.
* for a vertical label, the schematic orientation is not changed.
* and the label is moved to a suitable position
*/
switch( GetLabelSpinStyle() )
{
case 0: // horizontal text
SetLabelSpinStyle( 2 );
break;
case 2: // invert horizontal text
SetLabelSpinStyle( 0 );
break;
}
SetTextX( ::Mirror( GetTextPos().x, aYaxis_position ) );
}
void SCH_GLOBALLABEL::MirrorX( int aXaxis_position )
{
switch( GetLabelSpinStyle() )
{
case 1: // vertical text
SetLabelSpinStyle( 3 );
break;
case 3: // invert vertical text
SetLabelSpinStyle( 1 );
break;
}
SetTextY( ::Mirror( GetTextPos().y, aXaxis_position ) );
}
void SCH_GLOBALLABEL::Rotate( wxPoint aPosition )
{
wxPoint pt = GetTextPos();
RotatePoint( &pt, aPosition, 900 );
SetTextPos( pt );
SetLabelSpinStyle( (GetLabelSpinStyle() + 3) % 4 );
}
wxPoint SCH_GLOBALLABEL::GetSchematicTextOffset() const wxPoint SCH_GLOBALLABEL::GetSchematicTextOffset() const
{ {
wxPoint text_offset; wxPoint text_offset;
@ -910,21 +741,11 @@ wxPoint SCH_GLOBALLABEL::GetSchematicTextOffset() const
switch( GetLabelSpinStyle() ) switch( GetLabelSpinStyle() )
{ {
case 0: // Orientation horiz normal default:
text_offset.x -= offset; case 0: text_offset.x -= offset; break; // Orientation horiz normal
break; case 1: text_offset.y -= offset; break; // Orientation vert UP
case 2: text_offset.x += offset; break; // Orientation horiz inverse
case 1: // Orientation vert UP case 3: text_offset.y += offset; break; // Orientation vert BOTTOM
text_offset.y -= offset;
break;
case 2: // Orientation horiz inverse
text_offset.x += offset;
break;
case 3: // Orientation vert BOTTOM
text_offset.y += offset;
break;
} }
return text_offset; return text_offset;
@ -1089,31 +910,22 @@ void SCH_GLOBALLABEL::CreateGraphicShape( std::vector <wxPoint>& aPoints, const
switch( GetLabelSpinStyle() ) switch( GetLabelSpinStyle() )
{ {
case 0: // Orientation horiz normal default:
break; case 0: break; // Orientation horiz normal
case 1: angle = -900; break; // Orientation vert UP
case 1: // Orientation vert UP case 2: angle = 1800; break; // Orientation horiz inverse
angle = -900; case 3: angle = 900; break; // Orientation vert BOTTOM
break;
case 2: // Orientation horiz inverse
angle = 1800;
break;
case 3: // Orientation vert BOTTOM
angle = 900;
break;
} }
// Rotate outlines and move corners in real position // Rotate outlines and move corners in real position
for( unsigned ii = 0; ii < aPoints.size(); ii++ ) for( wxPoint& aPoint : aPoints )
{ {
aPoints[ii].x += x_offset; aPoint.x += x_offset;
if( angle ) if( angle )
RotatePoint( &aPoints[ii], angle ); RotatePoint( &aPoint, angle );
aPoints[ii] += Pos; aPoint += Pos;
} }
aPoints.push_back( aPoints[0] ); // closing aPoints.push_back( aPoints[0] ); // closing
@ -1137,6 +949,7 @@ const EDA_RECT SCH_GLOBALLABEL::GetBoundingBox() const
switch( GetLabelSpinStyle() ) // respect orientation switch( GetLabelSpinStyle() ) // respect orientation
{ {
default:
case 0: // Horiz Normal Orientation (left justified) case 0: // Horiz Normal Orientation (left justified)
dx = -length; dx = -length;
dy = height; dy = height;
@ -1174,7 +987,7 @@ const EDA_RECT SCH_GLOBALLABEL::GetBoundingBox() const
wxString SCH_GLOBALLABEL::GetSelectMenuText( EDA_UNITS_T aUnits ) const wxString SCH_GLOBALLABEL::GetSelectMenuText( EDA_UNITS_T aUnits ) const
{ {
return wxString::Format( _( "Global Label %s" ), GetChars( ShortenedShownText() ) ); return wxString::Format( _( "Global Label %s" ), ShortenedShownText() );
} }
@ -1283,7 +1096,6 @@ void SCH_HIERLABEL::CreateGraphicShape( std::vector <wxPoint>& aPoints, const wx
{ {
int* Template = TemplateShape[m_shape][m_spin_style]; int* Template = TemplateShape[m_shape][m_spin_style];
int halfSize = GetTextWidth() / 2; int halfSize = GetTextWidth() / 2;
int imax = *Template; Template++; int imax = *Template; Template++;
aPoints.clear(); aPoints.clear();
@ -1319,6 +1131,7 @@ const EDA_RECT SCH_HIERLABEL::GetBoundingBox() const
switch( GetLabelSpinStyle() ) switch( GetLabelSpinStyle() )
{ {
default:
case 0: // Horiz Normal Orientation (left justified) case 0: // Horiz Normal Orientation (left justified)
dx = -length; dx = -length;
dy = height; dy = height;
@ -1357,85 +1170,25 @@ const EDA_RECT SCH_HIERLABEL::GetBoundingBox() const
wxPoint SCH_HIERLABEL::GetSchematicTextOffset() const wxPoint SCH_HIERLABEL::GetSchematicTextOffset() const
{ {
wxPoint text_offset; wxPoint text_offset;
int width = std::max( GetThickness(), GetDefaultLineThickness() ); int width = std::max( GetThickness(), GetDefaultLineThickness() );
int ii = GetTextWidth() + TXT_MARGIN + width; int ii = GetTextWidth() + TXT_MARGIN + width;
switch( GetLabelSpinStyle() ) switch( GetLabelSpinStyle() )
{ {
case 0: // Orientation horiz normale default:
text_offset.x = -ii; case 0: text_offset.x = -ii; break; // Orientation horiz normale
break; case 1: text_offset.y = -ii; break; // Orientation vert UP
case 2: text_offset.x = ii; break; // Orientation horiz inverse
case 1: // Orientation vert UP case 3: text_offset.y = ii; break; // Orientation vert BOTTOM
text_offset.y = -ii;
break;
case 2: // Orientation horiz inverse
text_offset.x = ii;
break;
case 3: // Orientation vert BOTTOM
text_offset.y = ii;
break;
} }
return text_offset; return text_offset;
} }
void SCH_HIERLABEL::MirrorY( int aYaxis_position )
{
/* The hierarchical label is NOT really mirrored for an horizontal label, the schematic
* orientation is changed. For a vertical label, the schematic orientation is not changed
* and the label is moved to a suitable position.
*/
switch( GetLabelSpinStyle() )
{
case 0: // horizontal text
SetLabelSpinStyle( 2 );
break;
case 2: // invert horizontal text
SetLabelSpinStyle( 0 );
break;
}
SetTextX( Mirror( GetTextPos().x, aYaxis_position ) );
}
void SCH_HIERLABEL::MirrorX( int aXaxis_position )
{
switch( GetLabelSpinStyle() )
{
case 1: // vertical text
SetLabelSpinStyle( 3 );
break;
case 3: // invert vertical text
SetLabelSpinStyle( 1 );
break;
}
SetTextY( Mirror( GetTextPos().y, aXaxis_position ) );
}
void SCH_HIERLABEL::Rotate( wxPoint aPosition )
{
wxPoint pt = GetTextPos();
RotatePoint( &pt, aPosition, 900 );
SetTextPos( pt );
SetLabelSpinStyle( (GetLabelSpinStyle() + 3) % 4 );
}
wxString SCH_HIERLABEL::GetSelectMenuText( EDA_UNITS_T aUnits ) const wxString SCH_HIERLABEL::GetSelectMenuText( EDA_UNITS_T aUnits ) const
{ {
return wxString::Format( _( "Hierarchical Label %s" ), GetChars( ShortenedShownText() ) ); return wxString::Format( _( "Hierarchical Label %s" ), ShortenedShownText() );
} }

34
eeschema/sch_text.h
View File

@ -128,7 +128,7 @@ public:
virtual wxPoint GetSchematicTextOffset() const; virtual wxPoint GetSchematicTextOffset() const;
virtual void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset, virtual void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset,
GR_DRAWMODE draw_mode, COLOR4D Color = COLOR4D::UNSPECIFIED ) override; GR_DRAWMODE draw_mode, COLOR4D Color ) override;
/** /**
* Calculate the graphic shape (a polygon) associated to the text. * Calculate the graphic shape (a polygon) associated to the text.
@ -163,7 +163,7 @@ public:
virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override; virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation ) override;
virtual bool Replace( wxFindReplaceData& aSearchData, void* aAuxData = NULL ) override virtual bool Replace( wxFindReplaceData& aSearchData, void* aAuxData ) override
{ {
return EDA_ITEM::Replace( aSearchData, m_Text ); return EDA_ITEM::Replace( aSearchData, m_Text );
} }
@ -195,8 +195,7 @@ public:
virtual bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override; virtual bool HitTest( const wxPoint& aPosition, int aAccuracy ) const override;
virtual bool HitTest( const EDA_RECT& aRect, bool aContained = false, virtual bool HitTest( const EDA_RECT& aRect, bool aContained, int aAccuracy ) const override;
int aAccuracy = 0 ) const override;
virtual void Plot( PLOTTER* aPlotter ) override; virtual void Plot( PLOTTER* aPlotter ) override;
@ -219,22 +218,11 @@ public:
~SCH_LABEL() { } ~SCH_LABEL() { }
void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset,
GR_DRAWMODE draw_mode, COLOR4D Color = COLOR4D::UNSPECIFIED ) override;
wxString GetClass() const override wxString GetClass() const override
{ {
return wxT( "SCH_LABEL" ); return wxT( "SCH_LABEL" );
} }
void SetLabelSpinStyle( int aSpinStyle ) override;
wxPoint GetSchematicTextOffset() const override;
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition ) override;
const EDA_RECT GetBoundingBox() const override; const EDA_RECT GetBoundingBox() const override;
bool IsConnectable() const override { return true; } bool IsConnectable() const override { return true; }
@ -268,7 +256,7 @@ public:
~SCH_GLOBALLABEL() { } ~SCH_GLOBALLABEL() { }
void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset, void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset,
GR_DRAWMODE draw_mode, COLOR4D Color = COLOR4D::UNSPECIFIED ) override; GR_DRAWMODE draw_mode, COLOR4D Color ) override;
wxString GetClass() const override wxString GetClass() const override
{ {
@ -283,12 +271,6 @@ public:
void CreateGraphicShape( std::vector <wxPoint>& aPoints, const wxPoint& aPos ) override; void CreateGraphicShape( std::vector <wxPoint>& aPoints, const wxPoint& aPos ) override;
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition ) override;
bool IsConnectable() const override { return true; } bool IsConnectable() const override { return true; }
bool CanConnect( const SCH_ITEM* aItem ) const override bool CanConnect( const SCH_ITEM* aItem ) const override
@ -320,7 +302,7 @@ public:
~SCH_HIERLABEL() { } ~SCH_HIERLABEL() { }
void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset, void Draw( EDA_DRAW_PANEL* panel, wxDC* DC, const wxPoint& offset,
GR_DRAWMODE draw_mode, COLOR4D Color = COLOR4D::UNSPECIFIED ) override; GR_DRAWMODE draw_mode, COLOR4D Color ) override;
wxString GetClass() const override wxString GetClass() const override
{ {
@ -335,12 +317,6 @@ public:
const EDA_RECT GetBoundingBox() const override; const EDA_RECT GetBoundingBox() const override;
void MirrorY( int aYaxis_position ) override;
void MirrorX( int aXaxis_position ) override;
void Rotate( wxPoint aPosition ) override;
bool IsConnectable() const override { return true; } bool IsConnectable() const override { return true; }
bool CanConnect( const SCH_ITEM* aItem ) const override bool CanConnect( const SCH_ITEM* aItem ) const override