realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revise hierarchical sorting

Browse Source 
The lexicographical sort for hierarchical pages needs to satisfy the
following:
- Ensure a parent comes before all its children
- Ensure all children with the same parent are sorted by page number
- Ensure all of a parent's children come before the parent's next sibling

To do this, we need to compare at each path level before descending

Fixes https://gitlab.com/kicad/code/kicad/-/issues/20701
This commit is contained in:
Seth Hillbrand 2025-05-14 16:43:23 -07:00
parent 2e357fbfa0
commit e06e60882d
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
eeschema/sch_sheet_path.cpp
View File

@ -826,23 +826,50 @@ void SCH_SHEET_LIST::SortByHierarchicalPageNumbers( bool aUpdateVirtualPageNums
std::sort( begin(), end(),
[]( const SCH_SHEET_PATH& a, const SCH_SHEET_PATH& b ) -> bool
{
if( a.size() != b.size() )
return a.size() < b.size();
// Find the divergence point in the paths
size_t common_len = 0;
size_t min_len = std::min( a.size(), b.size() );
int retval = SCH_SHEET::ComparePageNum( a.GetCachedPageNumber(),
b.GetCachedPageNumber() );
while( common_len < min_len && a.at( common_len )->m_Uuid == b.at( common_len )->m_Uuid )
common_len++;
if( retval < 0 )
return true;
else if( retval > 0 )
return false;
// If one path is a prefix of the other, the shorter one comes first
// This ensures parents come before children
if( common_len == a.size() )
return true; // a is a prefix of b - a is the parent
if( common_len == b.size() )
return false; // b is a prefix of a - b is the parent
// Paths diverge at common_len
// If they share the same parent, sort by page number
// This ensures siblings are sorted by page number
SCH_SHEET* sheet_a = a.at( common_len );
SCH_SHEET* sheet_b = b.at( common_len );
// Create partial paths to get to these sheets for page number comparison
KIID_PATH path_a, path_b;
for( size_t i = 0; i <= common_len; i++ )
{
path_a.push_back( a.at( i )->m_Uuid );
path_b.push_back( b.at( i )->m_Uuid );
}
// Compare page numbers - use the last sheet's page number
wxString page_a = sheet_a->getPageNumber( path_a );
wxString page_b = sheet_b->getPageNumber( path_b );
int retval = SCH_SHEET::ComparePageNum( page_a, page_b );
if( retval != 0 )
return retval < 0;
// If page numbers are the same, use virtual page numbers as a tie-breaker
if( a.GetVirtualPageNumber() < b.GetVirtualPageNumber() )
return true;
else if( a.GetVirtualPageNumber() > b.GetVirtualPageNumber() )
return false;
// Enforce strict ordering. If the page numbers are the same, use UUIDs
// Finally, use UUIDs for stable ordering when everything else is equal
return a.GetCurrentHash() < b.GetCurrentHash();
} );