Fixed issue #553. Tape.exe crash. Issue with the Search field.

(grafted from c4cc1aca74cb29d3fb57cd0718ec282b3dd0dc7b)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-25 19:32:59 +03:00
parent 89ce8afe77
commit 99a2f0f807
2 changed files with 30 additions and 23 deletions

View File

@ -59,6 +59,7 @@
- [#543] Detail loses details. - [#543] Detail loses details.
- [#548] Bug Detail tool. Case when seam allowance is wrong. - [#548] Bug Detail tool. Case when seam allowance is wrong.
- Called the main app in console mode doesn't show opening file error in some cases. - Called the main app in console mode doesn't show opening file error in some cases.
- [#553] Tape.exe crash. Issue with the Search field.
# Version 0.4.4 April 12, 2016 # Version 0.4.4 April 12, 2016
- Updated measurement templates with all measurements. Added new template Aldrich/Women measurements. - Updated measurement templates with all measurements. Added new template Aldrich/Women measurements.

View File

@ -49,7 +49,11 @@ void VTableSearch::Clear()
{ {
SCASSERT(table != nullptr); SCASSERT(table != nullptr);
foreach(QTableWidgetItem *item, searchList) for(int i = 0; i < table->rowCount(); ++i)
{
for(int j = 0; j < table->columnCount(); ++j)
{
if (QTableWidgetItem *item = table->item(i, j))
{ {
if (item->row() % 2 != 0 && table->alternatingRowColors()) if (item->row() % 2 != 0 && table->alternatingRowColors())
{ {
@ -60,6 +64,10 @@ void VTableSearch::Clear()
item->setBackground(QPalette().base()); item->setBackground(QPalette().base());
} }
} }
}
}
searchList.clear();
searchIndex = -1; searchIndex = -1;
} }
@ -87,17 +95,14 @@ void VTableSearch::Find(const QString &term)
{ {
SCASSERT(table != nullptr); SCASSERT(table != nullptr);
const QList<QTableWidgetItem *> list = table->findItems(term, Qt::MatchContains);
if (list.isEmpty() || term.isEmpty())
{
Clear();
}
else
{
Clear(); Clear();
searchList = list; if (not term.isEmpty())
{
searchList = table->findItems(term, Qt::MatchContains);
if (not searchList.isEmpty())
{
foreach(QTableWidgetItem *item, searchList) foreach(QTableWidgetItem *item, searchList)
{ {
item->setBackground(Qt::yellow); item->setBackground(Qt::yellow);
@ -109,6 +114,7 @@ void VTableSearch::Find(const QString &term)
table->scrollToItem(item); table->scrollToItem(item);
} }
} }
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VTableSearch::FindPrevious() void VTableSearch::FindPrevious()