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

CADSTAR PCB: Use all User layers when mapping documentation layers 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/9577
This commit is contained in:
Roberto Fernandez Bautista 2021-11-10 21:41:48 +00:00
parent ad2e780a2c
commit 13f081549c
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,7 +294,7 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadBoardStackup()
cadstarBoardStackup.pop_back(); cadstarBoardStackup.pop_back();
LAYER_BLOCK dummyLayer; LAYER_BLOCK dummyLayer;
LAYER_ID lastConstruction = secondToLastLayer.ConstructionLayers.back(); LAYER_ID lastConstruction = secondToLastLayer.ConstructionLayers.back();
if( secondToLastLayer.ConstructionLayers.size() > 1 ) if( secondToLastLayer.ConstructionLayers.size() > 1 )
{ {
@ -459,6 +459,11 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadBoardStackup()
int numElecAndPowerLayers = 0; int numElecAndPowerLayers = 0;
// Map CADSTAR documentation layers to KiCad "User layers"
int currentDocLayer = 0;
std::vector<PCB_LAYER_ID> docLayers = { Dwgs_User, Cmts_User, User_1, User_2, User_3, User_4,
User_5, User_6, User_7, User_8, User_9 };
for( LAYER_ID cadstarLayerID : Assignments.Layerdefs.LayerStack ) for( LAYER_ID cadstarLayerID : Assignments.Layerdefs.LayerStack )
{ {
LAYER curLayer = Assignments.Layerdefs.Layers.at( cadstarLayerID ); LAYER curLayer = Assignments.Layerdefs.Layers.at( cadstarLayerID );
@ -490,7 +495,7 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadBoardStackup()
break; break;
case LOG_LEVEL::WARN: case LOG_LEVEL::WARN:
logBoardStackupMessage( curLayer.Name, kicadLayerID ); logBoardStackupWarning( curLayer.Name, kicadLayerID );
break; break;
} }
}; };
@ -517,7 +522,12 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadBoardStackup()
break; break;
case LAYER_TYPE::DOC: case LAYER_TYPE::DOC:
selectLayerID( PCB_LAYER_ID::Dwgs_User, PCB_LAYER_ID::Cmts_User, LOG_LEVEL::WARN );
if( currentDocLayer >= docLayers.size() )
currentDocLayer = 0;
kicadLayerID = docLayers.at( currentDocLayer++ );
logBoardStackupMessage( curLayer.Name, kicadLayerID );
break; break;
case LAYER_TYPE::NONELEC: case LAYER_TYPE::NONELEC: