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

pcbnew: search hits counting fix 

Fixes #6747
This commit is contained in:
Konstantin Baranovskiy 2020-12-16 19:24:31 +02:00 committed by Jeff Young
parent 5761666ad6
commit 08730cf952
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
pcbnew/dialogs/dialog_find.cpp
View File

@ -118,6 +118,8 @@ void DIALOG_FIND::search( bool aDirection )
int index; int index;
wxString msg; wxString msg;
wxString searchString; wxString searchString;
bool endIsReached = false;
bool isFirstSearch = false;
// Add/move the search string to the top of the list if it isn't already there // Add/move the search string to the top of the list if it isn't already there
searchString = m_searchCombo->GetValue(); searchString = m_searchCombo->GetValue();
@ -268,6 +270,7 @@ void DIALOG_FIND::search( bool aDirection )
} }
m_upToDate = true; m_upToDate = true;
isFirstSearch = true;
if( aDirection ) if( aDirection )
m_it = m_hitList.begin(); m_it = m_hitList.begin();
@ -282,21 +285,23 @@ void DIALOG_FIND::search( bool aDirection )
{ {
m_frame->SetStatusText( wxEmptyString ); m_frame->SetStatusText( wxEmptyString );
} }
else if( m_it != m_hitList.end() ) else
{ {
if( aDirection ) if( aDirection )
{ {
if( m_it != m_hitList.end() && !isFirstSearch )
m_it++; m_it++;
if( m_it == m_hitList.end() ) if( m_it == m_hitList.end() )
{ {
if( m_wrap->GetValue() ) if( m_wrap->GetValue() )
{
m_it = m_hitList.begin(); m_it = m_hitList.begin();
}
else else
{ {
m_frame->SetStatusText( wxEmptyString ); endIsReached = true;
m_frame->ShowInfoBarMsg( _( "No more items to show" ) ); m_it--; // point to the last REAL result
return;
} }
} }
} }
@ -305,23 +310,31 @@ void DIALOG_FIND::search( bool aDirection )
if( m_it == m_hitList.begin() ) if( m_it == m_hitList.begin() )
{ {
if( m_wrap->GetValue() ) if( m_wrap->GetValue() )
{
m_it = m_hitList.end(); m_it = m_hitList.end();
}
else else
{ endIsReached = true;
m_frame->SetStatusText( wxEmptyString );
m_frame->ShowInfoBarMsg( _( "No more items to show" ) );
return;
}
} }
if( m_it != m_hitList.begin() )
m_it--; m_it--;
} }
} }
// Display the item // Display the item
if( m_it != m_hitList.end() ) if( m_hitList.empty() )
{
m_frame->SetStatusText( wxEmptyString );
msg.Printf( _( "\"%s\" not found" ), searchString );
m_frame->ShowInfoBarMsg( msg );
}
if( endIsReached )
{
m_frame->SetStatusText( wxEmptyString );
m_frame->ShowInfoBarMsg( _( "No more items to show" ) );
m_status->SetLabel( _( "No hits" ) );
}
else
{ {
m_frame->GetToolManager()->RunAction( PCB_ACTIONS::selectItem, true, *m_it ); m_frame->GetToolManager()->RunAction( PCB_ACTIONS::selectItem, true, *m_it );
m_frame->FocusOnLocation( ( *m_it )->GetPosition() ); m_frame->FocusOnLocation( ( *m_it )->GetPosition() );
@ -329,19 +342,10 @@ void DIALOG_FIND::search( bool aDirection )
msg.Printf( _( "\"%s\" found" ), searchString ); msg.Printf( _( "\"%s\" found" ), searchString );
m_frame->SetStatusText( msg ); m_frame->SetStatusText( msg );
msg.Printf( _( "Hit(s): %ld / %lu" ), std::distance( m_hitList.begin(), m_it ), msg.Printf( _( "Hit(s): %ld / %lu" ), std::distance( m_hitList.begin(), m_it ) + 1,
m_hitList.size() ); m_hitList.size() );
m_status->SetLabel( msg ); m_status->SetLabel( msg );
} }
else
{
m_frame->SetStatusText( wxEmptyString );
msg.Printf( _( "\"%s\" not found" ), searchString );
m_frame->ShowInfoBarMsg( msg );
m_status->SetLabel( _( "No hits" ) );
}
if( m_highlightCallback ) if( m_highlightCallback )
m_highlightCallback( GetItem() ); m_highlightCallback( GetItem() );