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

Revert "Pcbnew, Altium import: Fix issues with hatched zones." 

This removed the hatch fill import functionality,
and is no longer needed now that the root cause was found.

This reverts commit 616510aca2.

(cherry picked from commit 80b7f5fcbf)
This commit is contained in:
Alex Shvartzkop 2024-06-09 18:56:40 +03:00
parent 2a1ef2d09d
commit ad7bd9b5f8
1 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pcbnew/pcb_io/altium/altium_pcb.cpp
View File

@ -556,43 +556,12 @@ void ALTIUM_PCB::Parse( const ALTIUM_COMPOUND_FILE& altiumPcbFi
for( std::pair<const ALTIUM_LAYER, ZONE*>& zone : m_outer_plane )
zone.second->SetAssignedPriority( 0 );
// Change zone fills in case we constructed them from tracks (hatched fill)
int zone_to_refill = 0;
int zone_converted = 0;
// Simplify and fracture zone fills in case we constructed them from tracks (hatched fill)
for( ZONE* zone : m_polygons )
{
if( !zone )
continue;
if( zone->GetFillMode() == ZONE_FILL_MODE::HATCH_PATTERN )
{
// Keep the hatch fill pattern only if the thickness and gap have a not too
// small value, especially if zone->GetHatchGap() is very small or null.
// Otherwise the refill calculation time can be **really big**
const int hatch_thickness_min_value = zone->GetMinThickness();
// If the gap is too small, the Hatch is similar to a solid filled area
// and trying to rebuild the hatch can look like hanging.
const int hatch_gap_min_value = pcbIUScale.mmToIU( 0.1 ); //arbitrary small value
if( zone->GetHatchGap() < hatch_gap_min_value )
{
zone->SetFillMode( ZONE_FILL_MODE::POLYGONS );
zone_converted++;
}
//if( zone->GetHatchThickness() < hatch_thickness_min_value )
// Remove the Altium fill solid areas, they are very different from Pcbnew
// that does not have a "painted" fill mode since a long time,
// and cannot be used as this. They must be rebuilt
zone->UnFill();
zone_to_refill++;
}
#if 0
// Probably this section of code makes no sense.
for( PCB_LAYER_ID layer : zone->GetLayerSet().Seq() )
{
if( !zone->HasFilledPolysForLayer( layer ) )
@ -600,22 +569,6 @@ void ALTIUM_PCB::Parse( const ALTIUM_COMPOUND_FILE& altiumPcbFi
zone->GetFilledPolysList( layer )->Fracture( SHAPE_POLY_SET::PM_STRICTLY_SIMPLE );
}
#endif
}
if( m_reporter && zone_converted )
{
m_reporter->Report( wxString::Format(
_( "%d hatched zones with very small gap converted to solid" ),
zone_converted ),
RPT_SEVERITY_INFO );
}
if( m_reporter && zone_to_refill )
{
m_reporter->Report( wxString::Format( _( "%d hatched or converted zones found. They need refill" ),
zone_to_refill ),
RPT_SEVERITY_INFO );
}
// Altium doesn't appear to store either the dimension value nor the dimensioned object in
@ -2014,10 +1967,6 @@ void ALTIUM_PCB::ParsePolygons6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbF
if( elem.hatchstyle != ALTIUM_POLYGON_HATCHSTYLE::SOLID
&& elem.hatchstyle != ALTIUM_POLYGON_HATCHSTYLE::UNKNOWN )
{
// We can set the hach fill pattern only if the thickness and gap have a
// not too small value. Otherwise the refill calculation time can be
// **really big**
// The hatch option validity will be checked later, after all zones are built
zone->SetFillMode( ZONE_FILL_MODE::HATCH_PATTERN );
zone->SetHatchThickness( elem.trackwidth );