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

Eeschema: find next key shouldn't launch find dialog 

Adds some general cleanups of overridden find functions while I'm in there.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8967
This commit is contained in:
Mike Williams 2021-08-26 16:21:19 -04:00 committed by Seth Hillbrand
parent e7905b05e7
commit d18d993eac
4 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeschema/sch_edit_frame.cpp
View File

@ -836,18 +836,6 @@ void SCH_EDIT_FRAME::OnUpdatePCB( wxCommandEvent& event )
} }
wxFindReplaceData* SCH_EDIT_FRAME::GetFindReplaceData()
{
if( m_findReplaceDialog && m_findReplaceDialog->IsVisible()
&& !m_findReplaceData->GetFindString().IsEmpty() )
{
return m_findReplaceData;
}
return nullptr;
}
HIERARCHY_NAVIG_DLG* SCH_EDIT_FRAME::FindHierarchyNavigator() HIERARCHY_NAVIG_DLG* SCH_EDIT_FRAME::FindHierarchyNavigator()
{ {
wxWindow* navigator = wxWindow::FindWindowByName( HIERARCHY_NAVIG_DLG_WNAME ); wxWindow* navigator = wxWindow::FindWindowByName( HIERARCHY_NAVIG_DLG_WNAME );

5
eeschema/sch_edit_frame.h
View File

@ -245,11 +245,6 @@ public:
void ShowFindReplaceStatus( const wxString& aMsg, int aStatusTime ); void ShowFindReplaceStatus( const wxString& aMsg, int aStatusTime );
void ClearFindReplaceStatus(); void ClearFindReplaceStatus();
/**
* Get the find criteria (as set by the dialog).
*/
wxFindReplaceData* GetFindReplaceData();
/** /**
* Notification that the Find dialog has closed. * Notification that the Find dialog has closed.
*/ */

47
eeschema/tools/sch_editor_control.cpp
View File

@ -245,12 +245,12 @@ int SCH_EDITOR_CONTROL::NavigateHierarchy( const TOOL_EVENT& aEvent )
int SCH_EDITOR_CONTROL::UpdateFind( const TOOL_EVENT& aEvent ) int SCH_EDITOR_CONTROL::UpdateFind( const TOOL_EVENT& aEvent )
{ {
wxFindReplaceData* data = m_frame->GetFindReplaceData(); wxFindReplaceData& data = m_frame->GetFindReplaceData();
auto visit = auto visit =
[&]( EDA_ITEM* aItem, SCH_SHEET_PATH* aSheet ) [&]( EDA_ITEM* aItem, SCH_SHEET_PATH* aSheet )
{ {
if( data && aItem->Matches( *data, aSheet ) ) if( aItem->Matches( data, aSheet ) )
{ {
aItem->SetForceVisible( true ); aItem->SetForceVisible( true );
m_selectionTool->BrightenItem( aItem ); m_selectionTool->BrightenItem( aItem );
@ -293,7 +293,7 @@ int SCH_EDITOR_CONTROL::UpdateFind( const TOOL_EVENT& aEvent )
SCH_ITEM* SCH_EDITOR_CONTROL::nextMatch( SCH_SCREEN* aScreen, SCH_SHEET_PATH* aSheet, SCH_ITEM* SCH_EDITOR_CONTROL::nextMatch( SCH_SCREEN* aScreen, SCH_SHEET_PATH* aSheet,
SCH_ITEM* aAfter, wxFindReplaceData* aData ) SCH_ITEM* aAfter, wxFindReplaceData& aData )
{ {
bool past_item = true; bool past_item = true;
@ -336,10 +336,10 @@ SCH_ITEM* SCH_EDITOR_CONTROL::nextMatch( SCH_SCREEN* aScreen, SCH_SHEET_PATH* aS
} }
else if( past_item ) else if( past_item )
{ {
if( aData == &g_markersOnly && item->Type() == SCH_MARKER_T ) if( &aData == &g_markersOnly && item->Type() == SCH_MARKER_T )
return item; return item;
if( item->Matches( *aData, aSheet ) ) if( item->Matches( aData, aSheet ) )
return item; return item;
if( item->Type() == SCH_SYMBOL_T ) if( item->Type() == SCH_SYMBOL_T )
@ -348,13 +348,13 @@ SCH_ITEM* SCH_EDITOR_CONTROL::nextMatch( SCH_SCREEN* aScreen, SCH_SHEET_PATH* aS
for( SCH_FIELD& field : cmp->GetFields() ) for( SCH_FIELD& field : cmp->GetFields() )
{ {
if( field.Matches( *aData, aSheet ) ) if( field.Matches( aData, aSheet ) )
return &field; return &field;
} }
for( SCH_PIN* pin : cmp->GetPins() ) for( SCH_PIN* pin : cmp->GetPins() )
{ {
if( pin->Matches( *aData, aSheet ) ) if( pin->Matches( aData, aSheet ) )
return pin; return pin;
} }
} }
@ -365,13 +365,13 @@ SCH_ITEM* SCH_EDITOR_CONTROL::nextMatch( SCH_SCREEN* aScreen, SCH_SHEET_PATH* aS
for( SCH_FIELD& field : sheet->GetFields() ) for( SCH_FIELD& field : sheet->GetFields() )
{ {
if( field.Matches( *aData, aSheet ) ) if( field.Matches( aData, aSheet ) )
return &field; return &field;
} }
for( SCH_SHEET_PIN* pin : sheet->GetPins() ) for( SCH_SHEET_PIN* pin : sheet->GetPins() )
{ {
if( pin->Matches( *aData, aSheet ) ) if( pin->Matches( aData, aSheet ) )
return pin; return pin;
} }
} }
@ -387,21 +387,20 @@ int SCH_EDITOR_CONTROL::FindNext( const TOOL_EVENT& aEvent )
// A timer during which a subsequent FindNext will result in a wrap-around // A timer during which a subsequent FindNext will result in a wrap-around
static wxTimer wrapAroundTimer; static wxTimer wrapAroundTimer;
wxFindReplaceData* data = m_frame->GetFindReplaceData(); wxFindReplaceData& data = m_frame->GetFindReplaceData();
if( aEvent.IsAction( &ACTIONS::findNextMarker ) ) if( aEvent.IsAction( &ACTIONS::findNextMarker ) )
{ {
if( data ) g_markersOnly.SetFlags( data.GetFlags() );
g_markersOnly.SetFlags( data->GetFlags() );
data = &g_markersOnly; data = g_markersOnly;
} }
else if( !data ) else if( data.GetFindString().IsEmpty() )
{ {
return FindAndReplace( ACTIONS::find.MakeEvent() ); return FindAndReplace( ACTIONS::find.MakeEvent() );
} }
bool searchAllSheets = !( data->GetFlags() & FR_CURRENT_SHEET_ONLY ); bool searchAllSheets = !( data.GetFlags() & FR_CURRENT_SHEET_ONLY );
EE_SELECTION& selection = m_selectionTool->GetSelection(); EE_SELECTION& selection = m_selectionTool->GetSelection();
SCH_SCREEN* afterScreen = m_frame->GetScreen(); SCH_SCREEN* afterScreen = m_frame->GetScreen();
SCH_ITEM* afterItem = dynamic_cast<SCH_ITEM*>( selection.Front() ); SCH_ITEM* afterItem = dynamic_cast<SCH_ITEM*>( selection.Front() );
@ -483,25 +482,25 @@ int SCH_EDITOR_CONTROL::FindNext( const TOOL_EVENT& aEvent )
bool SCH_EDITOR_CONTROL::HasMatch() bool SCH_EDITOR_CONTROL::HasMatch()
{ {
wxFindReplaceData* data = m_frame->GetFindReplaceData(); wxFindReplaceData& data = m_frame->GetFindReplaceData();
EDA_ITEM* item = m_selectionTool->GetSelection().Front(); EDA_ITEM* item = m_selectionTool->GetSelection().Front();
return data && item && item->Matches( *data, &m_frame->GetCurrentSheet() ); return item && item->Matches( data, &m_frame->GetCurrentSheet() );
} }
int SCH_EDITOR_CONTROL::ReplaceAndFindNext( const TOOL_EVENT& aEvent ) int SCH_EDITOR_CONTROL::ReplaceAndFindNext( const TOOL_EVENT& aEvent )
{ {
wxFindReplaceData* data = m_frame->GetFindReplaceData(); wxFindReplaceData& data = m_frame->GetFindReplaceData();
EDA_ITEM* item = m_selectionTool->GetSelection().Front(); EDA_ITEM* item = m_selectionTool->GetSelection().Front();
SCH_SHEET_PATH* sheet = &m_frame->GetCurrentSheet(); SCH_SHEET_PATH* sheet = &m_frame->GetCurrentSheet();
if( !data ) if( data.GetFindString().IsEmpty() )
return FindAndReplace( ACTIONS::find.MakeEvent() ); return FindAndReplace( ACTIONS::find.MakeEvent() );
if( item && item->Matches( *data, sheet ) ) if( item && item->Matches( data, sheet ) )
{ {
if( item->Replace( *data, sheet ) ) if( item->Replace( data, sheet ) )
{ {
m_frame->UpdateItem( item ); m_frame->UpdateItem( item );
m_frame->GetCurrentSheet().UpdateAllScreenReferences(); m_frame->GetCurrentSheet().UpdateAllScreenReferences();
@ -517,10 +516,10 @@ int SCH_EDITOR_CONTROL::ReplaceAndFindNext( const TOOL_EVENT& aEvent )
int SCH_EDITOR_CONTROL::ReplaceAll( const TOOL_EVENT& aEvent ) int SCH_EDITOR_CONTROL::ReplaceAll( const TOOL_EVENT& aEvent )
{ {
wxFindReplaceData* data = m_frame->GetFindReplaceData(); wxFindReplaceData& data = m_frame->GetFindReplaceData();
bool modified = false; bool modified = false;
if( !data ) if( data.GetFindString().IsEmpty() )
return FindAndReplace( ACTIONS::find.MakeEvent() ); return FindAndReplace( ACTIONS::find.MakeEvent() );
SCH_SHEET_LIST schematic = m_frame->Schematic().GetSheets(); SCH_SHEET_LIST schematic = m_frame->Schematic().GetSheets();
@ -532,7 +531,7 @@ int SCH_EDITOR_CONTROL::ReplaceAll( const TOOL_EVENT& aEvent )
for( EDA_ITEM* item = nextMatch( screen, sheet, nullptr, data ); item; ) for( EDA_ITEM* item = nextMatch( screen, sheet, nullptr, data ); item; )
{ {
if( item->Replace( *data, sheet ) ) if( item->Replace( data, sheet ) )
{ {
m_frame->UpdateItem( item ); m_frame->UpdateItem( item );
modified = true; modified = true;

2
eeschema/tools/sch_editor_control.h
View File

@ -207,7 +207,7 @@ private:
* @return pointer to the next search item found or NULL if nothing found * @return pointer to the next search item found or NULL if nothing found
*/ */
SCH_ITEM* nextMatch( SCH_SCREEN* aScreen, SCH_SHEET_PATH* aSheet, SCH_ITEM* aAfter, SCH_ITEM* nextMatch( SCH_SCREEN* aScreen, SCH_SHEET_PATH* aSheet, SCH_ITEM* aAfter,
wxFindReplaceData* aData ); wxFindReplaceData& aData );
private: private:
bool m_probingPcbToSch; // Recursion guard when cross-probing to PcbNew bool m_probingPcbToSch; // Recursion guard when cross-probing to PcbNew