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

Eeschema: fix subtle find bug when at the end of the search list. (fixes lp 1199689)

This commit is contained in:
Thiadmer Riemersma 2013-07-20 13:13:40 -04:00 committed by Wayne Stambaugh
parent ba16d9e763
commit f2003d8dda
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
eeschema/sch_collectors.cpp
View File

@ -338,7 +338,7 @@ bool SCH_COLLECTOR::IsDraggableJunction() const
}
bool SCH_FIND_COLLECTOR::atEnd() const
bool SCH_FIND_COLLECTOR::PassedEnd() const
{
bool retv = false;
@ -351,12 +351,12 @@ bool SCH_FIND_COLLECTOR::atEnd() const
{
if( flags & wxFR_DOWN )
{
if( m_foundIndex >= (GetCount() - 1) )
if( m_foundIndex >= GetCount() )
retv = true;
}
else
{
if( m_foundIndex == 0 )
if( m_foundIndex < 0 )
retv = true;
}
}
@ -390,21 +390,15 @@ void SCH_FIND_COLLECTOR::UpdateIndex()
if( flags & wxFR_DOWN )
{
if( !(flags & FR_SEARCH_WRAP) && (m_foundIndex == (GetCount() - 1)) )
return;
m_foundIndex += 1;
if( m_foundIndex < GetCount() )
m_foundIndex += 1;
if( (m_foundIndex >= GetCount()) && (flags & FR_SEARCH_WRAP) )
m_foundIndex = 0;
}
else
{
if( !(flags & FR_SEARCH_WRAP) && (m_foundIndex == 0) )
return;
m_foundIndex -= 1;
if( m_foundIndex >= 0 )
m_foundIndex -= 1;
if( (m_foundIndex < 0) && (flags & FR_SEARCH_WRAP) )
m_foundIndex = GetCount() - 1;
}
@ -452,7 +446,7 @@ wxString SCH_FIND_COLLECTOR::GetText()
EDA_ITEM* SCH_FIND_COLLECTOR::GetItem( SCH_FIND_COLLECTOR_DATA& aData )
{
if( atEnd() )
if( PassedEnd() )
return NULL;
aData = m_data[ m_foundIndex ];
@ -462,7 +456,7 @@ EDA_ITEM* SCH_FIND_COLLECTOR::GetItem( SCH_FIND_COLLECTOR_DATA& aData )
bool SCH_FIND_COLLECTOR::ReplaceItem()
{
if( atEnd() )
if( PassedEnd() )
return false;
wxCHECK_MSG( IsValidIndex( m_foundIndex ), false,

10
eeschema/sch_collectors.h
View File

@ -238,13 +238,13 @@ class SCH_FIND_COLLECTOR : public COLLECTOR
bool m_forceSearch;
/**
* Function atEnd
* tests if #m_foundIndex is at the end of the list give the current find/replace
* criterial in #m_findReplaceData.
* Function PassedEnd
* tests if #m_foundIndex is beyond the end of the list give the current
* find/replace criterial in #m_findReplaceData.
*
* @return True if #m_foundIndex is at the end of the found item list.
* @return True if #m_foundIndex has crossed the end of the found item list.
*/
bool atEnd() const;
bool PassedEnd() const;
/**
* Function dump