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

Eeschema: fix a colliding name between sch_text.h and a Windows/msys2 header. 

"INPUT" declaration in sch_text.h generate *a lot of* compil warnings.
So it is replaced by PS_INPUT.
For consistency, others member of enum class PINSHEETLABEL_SHAPE are also renamed.
This commit is contained in:
jean-pierre charras 2020-01-09 08:52:30 +01:00
parent ca34ade00c
commit c17c9960d8
7 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/connection_graph.cpp
View File

@ -98,7 +98,7 @@ bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers )
{ {
auto p = static_cast<SCH_SHEET_PIN*>( c ); auto p = static_cast<SCH_SHEET_PIN*>( c );
if( p->GetShape() == PINSHEETLABEL_SHAPE::OUTPUT ) if( p->GetShape() == PINSHEETLABEL_SHAPE::PSHAPE_OUTPUT )
{ {
m_driver = c; m_driver = c;
break; break;

2
eeschema/edit_label.cpp
View File

@ -39,7 +39,7 @@
#include "invoke_sch_dialog.h" #include "invoke_sch_dialog.h"
static PINSHEETLABEL_SHAPE lastGlobalLabelShape = PINSHEETLABEL_SHAPE::INPUT; static PINSHEETLABEL_SHAPE lastGlobalLabelShape = PINSHEETLABEL_SHAPE::PS_INPUT;
static LABEL_SPIN_STYLE lastTextOrientation = LABEL_SPIN_STYLE::LEFT; static LABEL_SPIN_STYLE lastTextOrientation = LABEL_SPIN_STYLE::LEFT;
static bool lastTextBold = false; static bool lastTextBold = false;
static bool lastTextItalic = false; static bool lastTextItalic = false;

34
eeschema/sch_legacy_plugin.cpp
View File

@ -1033,23 +1033,23 @@ SCH_SHEET* SCH_LEGACY_PLUGIN::loadSheet( LINE_READER& aReader )
switch( parseChar( aReader, line, &line ) ) switch( parseChar( aReader, line, &line ) )
{ {
case 'I': case 'I':
sheetPin->SetShape( PINSHEETLABEL_SHAPE::INPUT ); sheetPin->SetShape( PINSHEETLABEL_SHAPE::PS_INPUT );
break; break;
case 'O': case 'O':
sheetPin->SetShape( PINSHEETLABEL_SHAPE::OUTPUT ); sheetPin->SetShape( PINSHEETLABEL_SHAPE::PS_OUTPUT );
break; break;
case 'B': case 'B':
sheetPin->SetShape( PINSHEETLABEL_SHAPE::BIDI ); sheetPin->SetShape( PINSHEETLABEL_SHAPE::PS_BIDI );
break; break;
case 'T': case 'T':
sheetPin->SetShape( PINSHEETLABEL_SHAPE::TRISTATE ); sheetPin->SetShape( PINSHEETLABEL_SHAPE::PS_TRISTATE );
break; break;
case 'U': case 'U':
sheetPin->SetShape( PINSHEETLABEL_SHAPE::UNSPECIFIED ); sheetPin->SetShape( PINSHEETLABEL_SHAPE::PS_UNSPECIFIED );
break; break;
default: default:
SCH_PARSE_ERROR( "invalid sheet pin type", aReader, line ); SCH_PARSE_ERROR( "invalid sheet pin type", aReader, line );
@ -1364,11 +1364,11 @@ SCH_BUS_ENTRY_BASE* SCH_LEGACY_PLUGIN::loadBusEntry( LINE_READER& aReader )
// clang-format off // clang-format off
const std::map<PINSHEETLABEL_SHAPE, const char*> sheetLabelNames const std::map<PINSHEETLABEL_SHAPE, const char*> sheetLabelNames
{ {
{ PINSHEETLABEL_SHAPE::INPUT, "Input" }, { PINSHEETLABEL_SHAPE::PS_INPUT, "Input" },
{ PINSHEETLABEL_SHAPE::OUTPUT, "Output" }, { PINSHEETLABEL_SHAPE::PS_OUTPUT, "Output" },
{ PINSHEETLABEL_SHAPE::BIDI, "BiDi" }, { PINSHEETLABEL_SHAPE::PS_BIDI, "BiDi" },
{ PINSHEETLABEL_SHAPE::TRISTATE, "3State" }, { PINSHEETLABEL_SHAPE::PS_TRISTATE, "3State" },
{ PINSHEETLABEL_SHAPE::UNSPECIFIED, "UnSpc" }, { PINSHEETLABEL_SHAPE::PS_UNSPECIFIED, "UnSpc" },
}; };
// clang-format on // clang-format on
@ -1434,8 +1434,8 @@ SCH_TEXT* SCH_LEGACY_PLUGIN::loadText( LINE_READER& aReader )
{ {
auto resultIt = std::find_if( sheetLabelNames.begin(), sheetLabelNames.end(), auto resultIt = std::find_if( sheetLabelNames.begin(), sheetLabelNames.end(),
[ &line ]( const auto& it ) [ &line ]( const auto& it )
{ {
return strCompare( it.second, line, &line ); return strCompare( it.second, line, &line );
} ); } );
if( resultIt != sheetLabelNames.end() ) if( resultIt != sheetLabelNames.end() )
@ -2187,20 +2187,20 @@ void SCH_LEGACY_PLUGIN::saveSheet( SCH_SHEET* aSheet )
switch( pin.GetShape() ) switch( pin.GetShape() )
{ {
case PINSHEETLABEL_SHAPE::INPUT: case PINSHEETLABEL_SHAPE::PS_INPUT:
type = 'I'; type = 'I';
break; break;
case PINSHEETLABEL_SHAPE::OUTPUT: case PINSHEETLABEL_SHAPE::PS_OUTPUT:
type = 'O'; type = 'O';
break; break;
case PINSHEETLABEL_SHAPE::BIDI: case PINSHEETLABEL_SHAPE::PS_BIDI:
type = 'B'; type = 'B';
break; break;
case PINSHEETLABEL_SHAPE::TRISTATE: case PINSHEETLABEL_SHAPE::PS_TRISTATE:
type = 'T'; type = 'T';
break; break;
default: default:
case PINSHEETLABEL_SHAPE::UNSPECIFIED: case PINSHEETLABEL_SHAPE::PS_UNSPECIFIED:
type = 'U'; type = 'U';
break; break;
} }

10
eeschema/sch_sheet_pin.cpp
View File

@ -50,7 +50,7 @@ SCH_SHEET_PIN::SCH_SHEET_PIN( SCH_SHEET* parent, const wxPoint& pos, const wxStr
else else
SetEdge( SHEET_LEFT_SIDE ); SetEdge( SHEET_LEFT_SIDE );
m_shape = PINSHEETLABEL_SHAPE::INPUT; m_shape = PINSHEETLABEL_SHAPE::PS_INPUT;
m_isDangling = true; m_isDangling = true;
m_number = 2; m_number = 2;
} }
@ -252,11 +252,11 @@ void SCH_SHEET_PIN::CreateGraphicShape( std::vector <wxPoint>& aPoints, const wx
switch( m_shape ) switch( m_shape )
{ {
case PINSHEETLABEL_SHAPE::INPUT: case PINSHEETLABEL_SHAPE::PS_INPUT:
m_shape = PINSHEETLABEL_SHAPE::OUTPUT; m_shape = PINSHEETLABEL_SHAPE::PS_OUTPUT;
break; break;
case PINSHEETLABEL_SHAPE::OUTPUT: case PINSHEETLABEL_SHAPE::PS_OUTPUT:
m_shape = PINSHEETLABEL_SHAPE::INPUT; m_shape = PINSHEETLABEL_SHAPE::PS_INPUT;
break; break;
default: default:
break; break;

38
eeschema/sch_text.cpp
View File

@ -97,7 +97,7 @@ static int* TemplateShape[5][4] =
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 ), EDA_TEXT( text ), m_shape( PINSHEETLABEL_SHAPE::INPUT ) : SCH_ITEM( NULL, aType ), EDA_TEXT( text ), m_shape( PINSHEETLABEL_SHAPE::PS_INPUT )
{ {
m_Layer = LAYER_NOTES; m_Layer = LAYER_NOTES;
m_isDangling = false; m_isDangling = false;
@ -587,19 +587,19 @@ void SCH_TEXT::GetMsgPanelInfo( EDA_UNITS aUnits, MSG_PANEL_ITEMS& aList )
{ {
switch( GetShape() ) switch( GetShape() )
{ {
case PINSHEETLABEL_SHAPE::INPUT: case PINSHEETLABEL_SHAPE::PS_INPUT:
msg = _( "Input" ); msg = _( "Input" );
break; break;
case PINSHEETLABEL_SHAPE::OUTPUT: case PINSHEETLABEL_SHAPE::PS_OUTPUT:
msg = _( "Output" ); msg = _( "Output" );
break; break;
case PINSHEETLABEL_SHAPE::BIDI: case PINSHEETLABEL_SHAPE::PS_BIDI:
msg = _( "Bidirectional" ); msg = _( "Bidirectional" );
break; break;
case PINSHEETLABEL_SHAPE::TRISTATE: case PINSHEETLABEL_SHAPE::PS_TRISTATE:
msg = _( "Tri-State" ); msg = _( "Tri-State" );
break; break;
case PINSHEETLABEL_SHAPE::UNSPECIFIED: case PINSHEETLABEL_SHAPE::PS_UNSPECIFIED:
msg = _( "Passive" ); msg = _( "Passive" );
break; break;
default: default:
@ -647,7 +647,7 @@ SCH_LABEL::SCH_LABEL( const wxPoint& pos, const wxString& text )
: SCH_TEXT( pos, text, SCH_LABEL_T ) : SCH_TEXT( pos, text, SCH_LABEL_T )
{ {
m_Layer = LAYER_LOCLABEL; m_Layer = LAYER_LOCLABEL;
m_shape = PINSHEETLABEL_SHAPE::INPUT; m_shape = PINSHEETLABEL_SHAPE::PS_INPUT;
m_isDangling = true; m_isDangling = true;
SetMultilineAllowed( false ); SetMultilineAllowed( false );
} }
@ -731,7 +731,7 @@ SCH_GLOBALLABEL::SCH_GLOBALLABEL( const wxPoint& pos, const wxString& text )
: SCH_TEXT( pos, text, SCH_GLOBAL_LABEL_T ) : SCH_TEXT( pos, text, SCH_GLOBAL_LABEL_T )
{ {
m_Layer = LAYER_GLOBLABEL; m_Layer = LAYER_GLOBLABEL;
m_shape = PINSHEETLABEL_SHAPE::BIDI; m_shape = PINSHEETLABEL_SHAPE::PS_BIDI;
m_isDangling = true; m_isDangling = true;
SetMultilineAllowed( false ); SetMultilineAllowed( false );
} }
@ -754,14 +754,14 @@ wxPoint SCH_GLOBALLABEL::GetSchematicTextOffset() const
switch( m_shape ) switch( m_shape )
{ {
case PINSHEETLABEL_SHAPE::INPUT: case PINSHEETLABEL_SHAPE::PS_INPUT:
case PINSHEETLABEL_SHAPE::BIDI: case PINSHEETLABEL_SHAPE::PS_BIDI:
case PINSHEETLABEL_SHAPE::TRISTATE: case PINSHEETLABEL_SHAPE::PS_TRISTATE:
offset += halfSize; offset += halfSize;
break; break;
case PINSHEETLABEL_SHAPE::OUTPUT: case PINSHEETLABEL_SHAPE::PS_OUTPUT:
case PINSHEETLABEL_SHAPE::UNSPECIFIED: case PINSHEETLABEL_SHAPE::PS_UNSPECIFIED:
offset += TXT_MARGIN; offset += TXT_MARGIN;
break; break;
@ -895,23 +895,23 @@ void SCH_GLOBALLABEL::CreateGraphicShape( std::vector <wxPoint>& aPoints, const
switch( m_shape ) switch( m_shape )
{ {
case PINSHEETLABEL_SHAPE::INPUT: case PINSHEETLABEL_SHAPE::PS_INPUT:
x_offset = -halfSize; x_offset = -halfSize;
aPoints[0].x += halfSize; aPoints[0].x += halfSize;
break; break;
case PINSHEETLABEL_SHAPE::OUTPUT: case PINSHEETLABEL_SHAPE::PS_OUTPUT:
aPoints[3].x -= halfSize; aPoints[3].x -= halfSize;
break; break;
case PINSHEETLABEL_SHAPE::BIDI: case PINSHEETLABEL_SHAPE::PS_BIDI:
case PINSHEETLABEL_SHAPE::TRISTATE: case PINSHEETLABEL_SHAPE::PS_TRISTATE:
x_offset = -halfSize; x_offset = -halfSize;
aPoints[0].x += halfSize; aPoints[0].x += halfSize;
aPoints[3].x -= halfSize; aPoints[3].x -= halfSize;
break; break;
case PINSHEETLABEL_SHAPE::UNSPECIFIED: case PINSHEETLABEL_SHAPE::PS_UNSPECIFIED:
default: default:
break; break;
} }
@ -1019,7 +1019,7 @@ SCH_HIERLABEL::SCH_HIERLABEL( const wxPoint& pos, const wxString& text, KICAD_T
: SCH_TEXT( pos, text, aType ) : SCH_TEXT( pos, text, aType )
{ {
m_Layer = LAYER_HIERLABEL; m_Layer = LAYER_HIERLABEL;
m_shape = PINSHEETLABEL_SHAPE::INPUT; m_shape = PINSHEETLABEL_SHAPE::PS_INPUT;
m_isDangling = true; m_isDangling = true;
SetMultilineAllowed( false ); SetMultilineAllowed( false );
} }

13
eeschema/sch_text.h
View File

@ -40,7 +40,7 @@
class LINE_READER; class LINE_READER;
class NETLIST_OBJECT_LIST; class NETLIST_OBJECT_LIST;
/* /*
* Spin style for text items of all kinds on schematics * Spin style for text items of all kinds on schematics
* Basically a higher level abstraction of rotation and justification of text * Basically a higher level abstraction of rotation and justification of text
*/ */
@ -196,11 +196,12 @@ private:
*/ */
enum class PINSHEETLABEL_SHAPE enum class PINSHEETLABEL_SHAPE
{ {
INPUT, PS_INPUT, // use "PS_INPUT" instead of "INPUT" to avoid colliding
OUTPUT, // with a Windows header on msys2
BIDI, PS_OUTPUT,
TRISTATE, PS_BIDI,
UNSPECIFIED PS_TRISTATE,
PS_UNSPECIFIED
}; };

2
eeschema/sheet.cpp
View File

@ -766,7 +766,7 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy,
} }
PINSHEETLABEL_SHAPE SCH_EDIT_FRAME::m_lastSheetPinType = PINSHEETLABEL_SHAPE::INPUT; PINSHEETLABEL_SHAPE SCH_EDIT_FRAME::m_lastSheetPinType = PINSHEETLABEL_SHAPE::PS_INPUT;
wxSize SCH_EDIT_FRAME::m_lastSheetPinTextSize( -1, -1 ); wxSize SCH_EDIT_FRAME::m_lastSheetPinTextSize( -1, -1 );
wxPoint SCH_EDIT_FRAME::m_lastSheetPinPosition; wxPoint SCH_EDIT_FRAME::m_lastSheetPinPosition;