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

CADSTAR PCB Archive Importer: Fix compile error + BULLET pad is now correct

This commit is contained in:
Roberto Fernandez Bautista 2020-09-07 00:16:26 +01:00 committed by Seth Hillbrand
parent 112da7828e
commit 349ac06ee2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,20 +527,22 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryPads( const SYMDEF& aComponent, MODU
switch( csPadcode.Shape.ShapeType ) switch( csPadcode.Shape.ShapeType )
{ {
case PAD_SHAPE_TYPE::ANNULUS: case PAD_SHAPE_TYPE::ANNULUS:
//todo fix: use custom shape instead //todo fix: use custom shape instead (Donught shape, i.e. a circle with a hole)
pad->SetShape( PAD_SHAPE_T::PAD_SHAPE_CIRCLE ); pad->SetShape( PAD_SHAPE_T::PAD_SHAPE_CIRCLE );
pad->SetSize( { getKiCadLength( csPadcode.Shape.Size ), pad->SetSize( { getKiCadLength( csPadcode.Shape.Size ),
getKiCadLength( csPadcode.Shape.Size ) } ); getKiCadLength( csPadcode.Shape.Size ) } );
break; break;
case PAD_SHAPE_TYPE::BULLET: case PAD_SHAPE_TYPE::BULLET:
//todo fix: use custom shape instead (a bullet has the left size flat and right pad->SetShape( PAD_SHAPE_T::PAD_SHAPE_CHAMFERED_RECT );
//side rounded, before rotation is applied)
pad->SetShape( PAD_SHAPE_T::PAD_SHAPE_OVAL );
pad->SetSize( { getKiCadLength( (long long) csPadcode.Shape.Size pad->SetSize( { getKiCadLength( (long long) csPadcode.Shape.Size
+ (long long) csPadcode.Shape.LeftLength + (long long) csPadcode.Shape.LeftLength
+ (long long) csPadcode.Shape.RightLength ), + (long long) csPadcode.Shape.RightLength ),
getKiCadLength( csPadcode.Shape.Size ) } ); getKiCadLength( csPadcode.Shape.Size ) } );
pad->SetChamferPositions( RECT_CHAMFER_POSITIONS::RECT_CHAMFER_BOTTOM_LEFT
| RECT_CHAMFER_POSITIONS::RECT_CHAMFER_TOP_LEFT );
pad->SetRoundRectRadiusRatio( 0.5 );
pad->SetChamferRectRatio( 0.0 );
break; break;
case PAD_SHAPE_TYPE::CIRCLE: case PAD_SHAPE_TYPE::CIRCLE:
@ -727,7 +729,7 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadDimensions()
case DIMENSION::SUBTYPE::ORTHOGONAL: case DIMENSION::SUBTYPE::ORTHOGONAL:
{ {
::DIMENSION* dimension = new ::DIMENSION( mBoard ); ::DIMENSION* dimension = new ::DIMENSION( mBoard );
TEXTCODE& dimText = getTextCode( csDim.Text.TextCodeID ); TEXTCODE dimText = getTextCode( csDim.Text.TextCodeID );
mBoard->Add( dimension, ADD_MODE::APPEND ); mBoard->Add( dimension, ADD_MODE::APPEND );
dimension->SetLayer( getKiCadLayer( csDim.LayerID ) ); dimension->SetLayer( getKiCadLayer( csDim.LayerID ) );