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

CADSTAR Schematic Archive Importer: Fix loading of Schematic Sheet Pins and Orientation of Labels 

- Find the intersection between the wire and the sheet and place the sheet pin there
- Fix orientation of hierarchical labels and global labels by applying opposite orientation to the connecting wire
This commit is contained in:
Roberto Fernandez Bautista 2020-11-27 18:05:57 +00:00 committed by jean-pierre charras
parent ba77bf662c
commit 6a28d6af27
1 changed files with 132 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
View File

@ -577,14 +577,30 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadNets()
} }
} }
auto getHierarchicalLabel = [&]( NETELEMENT_ID aNode ) -> SCH_HIERLABEL*
{
if( aNode.Contains( "BLKT" ) )
{
NET_SCH::BLOCK_TERM blockTerm = net.BlockTerminals.at( aNode );
BLOCK_PIN_ID blockPinID = std::make_pair( blockTerm.BlockID, blockTerm.TerminalID );
if( mSheetPinMap.find( blockPinID )
!= mSheetPinMap.end() )
{
return mSheetPinMap.at( blockPinID );
}
}
return nullptr;
};
//Add net name to all hierarchical pins (block terminals in CADSTAR) //Add net name to all hierarchical pins (block terminals in CADSTAR)
for( std::pair<NETELEMENT_ID, NET_SCH::BLOCK_TERM> blockPair : net.BlockTerminals ) for( std::pair<NETELEMENT_ID, NET_SCH::BLOCK_TERM> blockPair : net.BlockTerminals )
{ {
NET_SCH::BLOCK_TERM blockTerm = blockPair.second; SCH_HIERLABEL* label = getHierarchicalLabel( blockPair.first );
BLOCK_PIN_ID blockPinID = std::make_pair( blockTerm.BlockID, blockTerm.TerminalID );
if( mSheetPinMap.find( blockPinID ) != mSheetPinMap.end() ) if(label)
mSheetPinMap.at( blockPinID )->SetText( netName ); label->SetText( netName );
} }
// Load all bus entries and add net label if required // Load all bus entries and add net label if required
@ -637,6 +653,9 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadNets()
for( NET_SCH::CONNECTION_SCH conn : net.Connections ) for( NET_SCH::CONNECTION_SCH conn : net.Connections )
{ {
if( conn.LayerID == wxT( "NO_SHEET" ) )
continue; // No point loading virtual connections. KiCad handles that internally
if( conn.Path.size() < 2 ) if( conn.Path.size() < 2 )
{ {
//Implied straight line connection between the two elements //Implied straight line connection between the two elements
@ -653,14 +672,91 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadNets()
bool firstPt = true; bool firstPt = true;
bool secondPt = false; bool secondPt = false;
POINT last; wxPoint last;
SCH_LINE* wire = nullptr; SCH_LINE* wire = nullptr;
SHAPE_LINE_CHAIN wireChain; // Create a temp. line chain representing the connection
for( POINT pt : conn.Path ) for( POINT pt : conn.Path )
{
wireChain.Append( getKiCadPoint( pt ) );
}
// AUTO-FIX SHEET PINS
//--------------------
// KiCad constrains the sheet pin on the edge of the sheet object whereas in
// CADSTAR it can be anywhere. Let's find the intersection of the wires with the sheet
// and place the hierarchical
std::vector<NETELEMENT_ID> nodes;
nodes.push_back( conn.StartNode );
nodes.push_back( conn.EndNode );
for( NETELEMENT_ID node : nodes )
{
SCH_HIERLABEL* sheetPin = getHierarchicalLabel( node );
if( sheetPin )
{
if( sheetPin->Type() == SCH_SHEET_PIN_T
&& SCH_SHEET::ClassOf( sheetPin->GetParent() ) )
{
SCH_SHEET* parentSheet = static_cast<SCH_SHEET*>( sheetPin->GetParent() );
wxSize sheetSize = parentSheet->GetSize();
wxPoint sheetPosition = parentSheet->GetPosition();
int leftSide = sheetPosition.x;
int rightSide = sheetPosition.x + sheetSize.x;
int topSide = sheetPosition.y;
int botSide = sheetPosition.y + sheetSize.y;
SHAPE_LINE_CHAIN sheetEdge;
sheetEdge.Append( leftSide, topSide );
sheetEdge.Append( rightSide, topSide );
sheetEdge.Append( rightSide, botSide );
sheetEdge.Append( leftSide, botSide );
sheetEdge.Append( leftSide, topSide );
SHAPE_LINE_CHAIN::INTERSECTIONS wireToSheetIntersects;
if( !wireChain.Intersect( sheetEdge, wireToSheetIntersects ) )
{
// The block terminal is outside the block shape in the original
// CADSTAR design. Since KiCad's Sheet Pin will already be constrained
// on the edge, we will simply join to it with a straight line.
if( node == conn.StartNode )
wireChain = wireChain.Reverse();
wireChain.Append( sheetPin->GetPosition() );
if( node == conn.StartNode )
wireChain = wireChain.Reverse();
}
else
{
// The block terminal is either inside or on the shape edge. Lets use the
// first interection point
VECTOR2I intsctPt = wireToSheetIntersects.at( 0 ).p;
int intsctIndx = wireChain.FindSegment( intsctPt );
wxASSERT_MSG( intsctIndx != -1, "Can't find intersecting segment" );
if( node == conn.StartNode )
wireChain.Replace( 0, intsctIndx, intsctPt );
else
wireChain.Replace( intsctIndx + 1, /*end index*/ -1, intsctPt );
sheetPin->SetPosition( (wxPoint) intsctPt );
}
}
}
}
// Now we can load the wires
for( const VECTOR2I pt : wireChain.CPoints() )
{ {
if( firstPt ) if( firstPt )
{ {
last = pt; last = (wxPoint) pt;
firstPt = false; firstPt = false;
secondPt = true; secondPt = true;
continue; continue;
@ -670,45 +766,55 @@ void CADSTAR_SCH_ARCHIVE_LOADER::loadNets()
{ {
secondPt = false; secondPt = false;
wxPoint kiLast = last;
wxPoint kiCurrent = (wxPoint) pt;
double wireangleDeciDeg = getPolarAngle( kiLast - kiCurrent );
LABEL_SPIN_STYLE spin = getSpinStyleDeciDeg( wireangleDeciDeg );
if( netlabels.find( conn.StartNode ) != netlabels.end() ) if( netlabels.find( conn.StartNode ) != netlabels.end() )
{ {
wxPoint kiLast = getKiCadPoint( last );
wxPoint kiCurrent = getKiCadPoint( pt );
double wireangleDeciDeg = getPolarAngle( kiCurrent - kiLast );
LABEL_SPIN_STYLE spin = getSpinStyleDeciDeg( wireangleDeciDeg );
netlabels.at( conn.StartNode )->SetLabelSpinStyle( spin ); netlabels.at( conn.StartNode )->SetLabelSpinStyle( spin );
} }
SCH_HIERLABEL* sheetPin = getHierarchicalLabel( conn.StartNode );
if( sheetPin )
sheetPin->SetLabelSpinStyle( spin );
} }
wire = new SCH_LINE();
if( conn.LayerID != wxT( "NO_SHEET" ) ) wire->SetStartPoint( last );
{ wire->SetEndPoint( (wxPoint) pt );
wire = new SCH_LINE(); wire->SetLayer( LAYER_WIRE );
wire->SetStartPoint( getKiCadPoint( last ) ); if( !conn.ConnectionLineCode.IsEmpty() )
wire->SetEndPoint( getKiCadPoint( pt ) ); wire->SetLineWidth( getLineThickness( conn.ConnectionLineCode ) );
wire->SetLayer( LAYER_WIRE );
if( !conn.ConnectionLineCode.IsEmpty() ) last = (wxPoint) pt;
wire->SetLineWidth( getLineThickness( conn.ConnectionLineCode ) );
last = pt; mSheetMap.at( conn.LayerID )->GetScreen()->Append( wire );
mSheetMap.at( conn.LayerID )->GetScreen()->Append( wire );
}
} }
if( wire && netlabels.find( conn.EndNode ) != netlabels.end() ) //Fix labels on the end wire
if( wire )
{ {
wxPoint kiLast = wire->GetEndPoint(); wxPoint kiLast = wire->GetEndPoint();
wxPoint kiCurrent = wire->GetStartPoint(); wxPoint kiCurrent = wire->GetStartPoint();
double wireangleDeciDeg = getPolarAngle( kiCurrent - kiLast ); double wireangleDeciDeg = getPolarAngle( kiLast - kiCurrent );
LABEL_SPIN_STYLE spin = getSpinStyleDeciDeg( wireangleDeciDeg ); LABEL_SPIN_STYLE spin = getSpinStyleDeciDeg( wireangleDeciDeg );
netlabels.at( conn.EndNode )->SetLabelSpinStyle( spin );
if( netlabels.find( conn.EndNode ) != netlabels.end() )
netlabels.at( conn.EndNode )->SetLabelSpinStyle( spin );
SCH_HIERLABEL* sheetPin = getHierarchicalLabel( conn.EndNode );
if( sheetPin )
sheetPin->SetLabelSpinStyle( spin );
} }
} }
for( std::pair<NETELEMENT_ID, NET::JUNCTION> juncPair : net.Junctions ) for( std::pair<NETELEMENT_ID, NET::JUNCTION> juncPair : net.Junctions )
{ {
NET::JUNCTION junc = juncPair.second; NET::JUNCTION junc = juncPair.second;