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

Fix some warnings in the cadstar importer

This commit is contained in:
Ian McInerney 2020-09-16 11:27:15 +01:00
parent 4ca103c82c
commit aa0b0ca7e7
2 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
pcbnew/plugins/cadstar/cadstar_pcb_archive_loader.cpp
View File

@ -115,18 +115,18 @@ void CADSTAR_PCB_ARCHIVE_LOADER::logBoardStackupWarning(
void CADSTAR_PCB_ARCHIVE_LOADER::loadBoardStackup() void CADSTAR_PCB_ARCHIVE_LOADER::loadBoardStackup()
{ {
std::map<LAYER_ID, LAYER>& cpaLayers = Assignments.Layerdefs.Layers; std::map<LAYER_ID, LAYER>& cpaLayers = Assignments.Layerdefs.Layers;
std::map<MATERIAL_ID, MATERIAL>& cpaMaterials = Assignments.Layerdefs.Materials; std::map<MATERIAL_ID, MATERIAL>& cpaMaterials = Assignments.Layerdefs.Materials;
std::vector<LAYER_ID>& cpaLayerStack = Assignments.Layerdefs.LayerStack; std::vector<LAYER_ID>& cpaLayerStack = Assignments.Layerdefs.LayerStack;
unsigned numElecAndPowerLayers = 0; unsigned numElecAndPowerLayers = 0;
BOARD_DESIGN_SETTINGS& designSettings = mBoard->GetDesignSettings(); BOARD_DESIGN_SETTINGS& designSettings = mBoard->GetDesignSettings();
BOARD_STACKUP& stackup = designSettings.GetStackupDescriptor(); BOARD_STACKUP& stackup = designSettings.GetStackupDescriptor();
int noOfKiCadStackupLayers = 0; int noOfKiCadStackupLayers = 0;
int lastElectricalLayerIndex = 0; int lastElectricalLayerIndex = 0;
int dielectricSublayer = 0; int dielectricSublayer = 0;
int numDielectricLayers = 0; int numDielectricLayers = 0;
bool prevWasDielectric = false; bool prevWasDielectric = false;
BOARD_STACKUP_ITEM* tempKiCadLayer; BOARD_STACKUP_ITEM* tempKiCadLayer = nullptr;
std::vector<PCB_LAYER_ID> layerIDs; std::vector<PCB_LAYER_ID> layerIDs;
//Remove all layers except required ones //Remove all layers except required ones
@ -164,9 +164,9 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadBoardStackup()
case LAYER_TYPE::ASSCOMPCOPP: case LAYER_TYPE::ASSCOMPCOPP:
case LAYER_TYPE::NOLAYER: case LAYER_TYPE::NOLAYER:
//Shouldn't be here if CPA file is correctly parsed and not corrupt //Shouldn't be here if CPA file is correctly parsed and not corrupt
THROW_IO_ERROR( wxString::Format( THROW_IO_ERROR( wxString::Format( _( "Unexpected layer '%s' in layer stack." ),
_( "Unexpected layer '%s' in layer stack." ), curLayer.Name ) ); curLayer.Name ) );
continue;
case LAYER_TYPE::JUMPERLAYER: case LAYER_TYPE::JUMPERLAYER:
copperType = LAYER_T::LT_JUMPER; copperType = LAYER_T::LT_JUMPER;
kicadLayerID = getKiCadCopperLayerID( ++numElecAndPowerLayers ); kicadLayerID = getKiCadCopperLayerID( ++numElecAndPowerLayers );
@ -678,12 +678,16 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryPads( const SYMDEF& aComponent, MODU
if( csPadcode.DrillDiameter != UNDEFINED_VALUE ) if( csPadcode.DrillDiameter != UNDEFINED_VALUE )
{ {
if( csPadcode.SlotLength != UNDEFINED_VALUE ) if( csPadcode.SlotLength != UNDEFINED_VALUE )
{
pad->SetDrillSize( { getKiCadLength( csPadcode.DrillDiameter ), pad->SetDrillSize( { getKiCadLength( csPadcode.DrillDiameter ),
getKiCadLength( (long long) csPadcode.DrillOversize getKiCadLength( (long long) csPadcode.DrillOversize
+ (long long) csPadcode.DrillDiameter ) } ); + (long long) csPadcode.DrillDiameter ) } );
}
else else
{
pad->SetDrillSize( { getKiCadLength( csPadcode.DrillDiameter ), pad->SetDrillSize( { getKiCadLength( csPadcode.DrillDiameter ),
getKiCadLength( csPadcode.DrillDiameter ) } ); getKiCadLength( csPadcode.DrillDiameter ) } );
}
} }
//TODO handle csPadcode.Reassigns when KiCad supports full padstacks //TODO handle csPadcode.Reassigns when KiCad supports full padstacks
} }
@ -713,17 +717,19 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadGroups()
if( !csGroup.GroupID.IsEmpty() ) if( !csGroup.GroupID.IsEmpty() )
{ {
if( mGroupMap.find( csGroup.ID ) == mGroupMap.end() ) if( mGroupMap.find( csGroup.ID ) == mGroupMap.end() )
{
THROW_IO_ERROR( wxString::Format( THROW_IO_ERROR( wxString::Format(
_( "The file appears to be corrupt. Unable to find group ID %s " _( "The file appears to be corrupt. Unable to find group ID %s "
"in the group definitions." ), "in the group definitions." ),
csGroup.ID ) ); csGroup.ID ) );
}
else if( mGroupMap.find( csGroup.ID ) == mGroupMap.end() ) else if( mGroupMap.find( csGroup.ID ) == mGroupMap.end() )
{
THROW_IO_ERROR( wxString::Format( THROW_IO_ERROR( wxString::Format(
_( "The file appears to be corrupt. Unable to find sub group %s " _( "The file appears to be corrupt. Unable to find sub group %s "
"in the group map (parent group ID=%s, Name=%s)." ), "in the group map (parent group ID=%s, Name=%s)." ),
csGroup.GroupID, csGroup.ID, csGroup.Name ) ); csGroup.GroupID, csGroup.ID, csGroup.Name ) );
}
else else
{ {
PCB_GROUP* kiCadGroup = mGroupMap.at( csGroup.ID ); PCB_GROUP* kiCadGroup = mGroupMap.at( csGroup.ID );
@ -1251,7 +1257,7 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadNets()
wxString netnameForErrorReporting = net.Name; wxString netnameForErrorReporting = net.Name;
if( netnameForErrorReporting.IsEmpty() ) if( netnameForErrorReporting.IsEmpty() )
netnameForErrorReporting = "$" + net.SignalNum; netnameForErrorReporting = wxString::Format( "$%ld", net.SignalNum );
for( NET::CONNECTION connection : net.Connections ) for( NET::CONNECTION connection : net.Connections )
{ {
@ -1689,7 +1695,9 @@ DRAWSEGMENT* CADSTAR_PCB_ARCHIVE_LOADER::getDrawSegmentFromVertex( const POINT&
case VERTEX_TYPE::POINT: case VERTEX_TYPE::POINT:
if( isModule( aContainer ) ) if( isModule( aContainer ) )
ds = new EDGE_MODULE( (MODULE*) aContainer, STROKE_T::S_SEGMENT ); {
ds = new EDGE_MODULE( static_cast<MODULE*>( aContainer ), STROKE_T::S_SEGMENT );
}
else else
{ {
ds = new DRAWSEGMENT( aContainer ); ds = new DRAWSEGMENT( aContainer );
@ -1703,11 +1711,15 @@ DRAWSEGMENT* CADSTAR_PCB_ARCHIVE_LOADER::getDrawSegmentFromVertex( const POINT&
case VERTEX_TYPE::CLOCKWISE_SEMICIRCLE: case VERTEX_TYPE::CLOCKWISE_SEMICIRCLE:
case VERTEX_TYPE::CLOCKWISE_ARC: case VERTEX_TYPE::CLOCKWISE_ARC:
cw = true; cw = true;
KI_FALLTHROUGH;
case VERTEX_TYPE::ANTICLOCKWISE_SEMICIRCLE: case VERTEX_TYPE::ANTICLOCKWISE_SEMICIRCLE:
case VERTEX_TYPE::ANTICLOCKWISE_ARC: case VERTEX_TYPE::ANTICLOCKWISE_ARC:
if( isModule( aContainer ) ) if( isModule( aContainer ) )
{
ds = new EDGE_MODULE( (MODULE*) aContainer, STROKE_T::S_ARC ); ds = new EDGE_MODULE( (MODULE*) aContainer, STROKE_T::S_ARC );
}
else else
{ {
ds = new DRAWSEGMENT( aContainer ); ds = new DRAWSEGMENT( aContainer );
@ -1727,6 +1739,7 @@ DRAWSEGMENT* CADSTAR_PCB_ARCHIVE_LOADER::getDrawSegmentFromVertex( const POINT&
ds->SetAngle( NormalizeAnglePos( arcAngle ) ); ds->SetAngle( NormalizeAnglePos( arcAngle ) );
else else
ds->SetAngle( NormalizeAngleNeg( arcAngle ) ); ds->SetAngle( NormalizeAngleNeg( arcAngle ) );
break; break;
} }
@ -1748,7 +1761,7 @@ DRAWSEGMENT* CADSTAR_PCB_ARCHIVE_LOADER::getDrawSegmentFromVertex( const POINT&
ds->Move( aMoveVector ); ds->Move( aMoveVector );
if( isModule( aContainer ) && ds != nullptr ) if( isModule( aContainer ) && ds != nullptr )
( (EDGE_MODULE*) ds )->SetLocalCoord(); static_cast<EDGE_MODULE*>( ds )->SetLocalCoord();
if( !aCadstarGroupID.IsEmpty() ) if( !aCadstarGroupID.IsEmpty() )
addToGroup( aCadstarGroupID, ds ); addToGroup( aCadstarGroupID, ds );
@ -1768,16 +1781,16 @@ ZONE_CONTAINER* CADSTAR_PCB_ARCHIVE_LOADER::getZoneFromCadstarShape(
zone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::DIAGONAL_FULL ); zone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::DIAGONAL_FULL );
} }
else else
{
zone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH ); zone->SetHatchStyle( ZONE_BORDER_DISPLAY_STYLE::NO_HATCH );
}
SHAPE_POLY_SET polygon = getPolySetFromCadstarShape( aCadstarShape, aLineThickness ); SHAPE_POLY_SET polygon = getPolySetFromCadstarShape( aCadstarShape, aLineThickness );
zone->AddPolygon( polygon.COutline( 0 ) ); zone->AddPolygon( polygon.COutline( 0 ) );
for( int i = 0; i < polygon.HoleCount( 0 ); i++ ) for( int i = 0; i < polygon.HoleCount( 0 ); i++ )
{
zone->AddPolygon( polygon.CHole( 0, i ) ); zone->AddPolygon( polygon.CHole( 0, i ) );
}
return zone; return zone;
} }

21
pcbnew/plugins/cadstar/cadstar_pcb_archive_parser.cpp
View File

@ -677,15 +677,20 @@ void CADSTAR_PCB_ARCHIVE_PARSER::HEADER::Parse( XNODE* aNode )
Format.Parse( cNode ); Format.Parse( cNode );
if( Format.Type != wxT( "LAYOUT" ) ) if( Format.Type != wxT( "LAYOUT" ) )
{
if( Format.Type == wxT( "LIBRARY" ) ) if( Format.Type == wxT( "LIBRARY" ) )
THROW_IO_ERROR( {
"The selected file is a CADSTAR Library file (as opposed to a Layout " THROW_IO_ERROR( "The selected file is a CADSTAR Library file (as opposed to"
"file). CADSTAR libraries cannot yet be imported into KiCad." ); " a Layout file). CADSTAR libraries cannot yet be imported"
" into KiCad." );
}
else else
THROW_IO_ERROR( {
"The selected file is an unknown CADSTAR format so cannot be " THROW_IO_ERROR( "The selected file is an unknown CADSTAR format so cannot be "
"imported into KiCad." ); "imported into KiCad." );
}
}
} }
else if( nodeName == wxT( "JOBFILE" ) ) else if( nodeName == wxT( "JOBFILE" ) )
JobFile = GetXmlAttributeIDString( cNode, 0 ); JobFile = GetXmlAttributeIDString( cNode, 0 );
@ -1741,7 +1746,7 @@ void CADSTAR_PCB_ARCHIVE_PARSER::PAD::Parse( XNODE* aNode )
ID = GetXmlAttributeIDLong( aNode, 0 ); ID = GetXmlAttributeIDLong( aNode, 0 );
PadCodeID = GetXmlAttributeIDString( aNode, 2 ); PadCodeID = GetXmlAttributeIDString( aNode, 2 );
Side = GetPadSide( GetXmlAttributeIDString( aNode, 3 ) ); Side = GetPadSide( GetXmlAttributeIDString( aNode, 3 ) );
XNODE* cNode = aNode->GetChildren(); XNODE* cNode = aNode->GetChildren();
wxString location = wxString::Format( "PAD %d", ID ); wxString location = wxString::Format( "PAD %d", ID );