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

CADSTAR Schematic Archive Importer: Align to original grid 

Previous assumption of 100mil grid in CADSTAR schematic designs has
been proven to be incorrect. Let's use the "working grid" in the
original design instead.
This commit is contained in:
Roberto Fernandez Bautista 2021-02-17 17:02:57 +00:00 committed by Wayne Stambaugh
parent c98106ebcf
commit 5acdf1ddb1
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/plugins/cadstar/cadstar_archive_parser.h
View File

@ -495,7 +495,7 @@ public:
wxString Name;
long Param1; ///< Either Units or X step, depending on Type (see GRID_TYPE for
///< more details)
long Param2; ///< Either Divisor or Y step, depending on Type (see GRID_TYPE for
long Param2; ///< Either Divisor or Y step, depending on Type (see GRID_TYPE for
///< more details)
static bool IsGrid( XNODE* aNode );

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

@ -138,24 +138,35 @@ void CADSTAR_SCH_ARCHIVE_LOADER::Load( SCHEMATIC* aSchematic, SCH_SHEET* aRootSh
sheetBoundingBox.Merge( bbox );
}
auto roundToNearest100mil =
[]( int aNumber ) -> int
{
int error = aNumber % Mils2iu( 100 );
// Find the working grid of the original CADSTAR design
int grid = Assignments.Grids.WorkingGrid.Param1;
if( abs( error ) > Mils2iu( 50 ) )
return aNumber + ( sign(error) * Mils2iu( 100 ) ) - error;
if( Assignments.Grids.WorkingGrid.Type == GRID_TYPE::FRACTIONALGRID )
grid = grid / Assignments.Grids.WorkingGrid.Param2;
else if( Assignments.Grids.WorkingGrid.Param2 > grid )
grid = Assignments.Grids.WorkingGrid.Param2;
grid = getKiCadLength( grid );
auto roundToNearestGrid =
[&]( int aNumber ) -> int
{
int error = aNumber % grid;
int absError = sign( error ) * error;
if( absError > ( grid / 2 ) )
return aNumber + ( sign( error ) * grid ) - error;
else
return aNumber - error;
};
// When exporting to pdf, CADSTAR applies a margin of 3% of the longest dimension (height
// or width) to all 4 sides (top, bottom, left right). For the import, we are also rounding
// the margin to the nearest 100mil, ensuring all items remain on the grid
// the margin to the nearest grid, ensuring all items remain on the grid.
wxSize targetSheetSize = sheetBoundingBox.GetSize();
int longestSide = std::max( targetSheetSize.x, targetSheetSize.y );
int margin = ( (double) longestSide * 0.03);
margin = roundToNearest100mil( margin );
margin = roundToNearestGrid( margin );
targetSheetSize.IncBy( margin * 2, margin * 2 );
// Update page size always
@ -166,14 +177,15 @@ void CADSTAR_SCH_ARCHIVE_LOADER::Load( SCHEMATIC* aSchematic, SCH_SHEET* aRootSh
// Set the new sheet size.
sheet->GetScreen()->SetPageSettings( pageInfo );
wxSize pageSizeIU = sheet->GetScreen()->GetPageSettings().GetSizeIU();
wxPoint sheetcentre( pageSizeIU.x / 2, pageSizeIU.y / 2 );
wxPoint itemsCentre = sheetBoundingBox.Centre();
// round the translation to nearest 100mil to place it on the grid.
// round the translation to nearest point on the grid
wxPoint translation = sheetcentre - itemsCentre;
translation.x = roundToNearest100mil( translation.x );
translation.y = roundToNearest100mil( translation.y );
translation.x = roundToNearestGrid( translation.x );
translation.y = roundToNearestGrid( translation.y );
// Translate the items.
std::vector<SCH_ITEM*> allItems;