ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-24 16:30:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

IPAL21062 Fatal error on Add "Names of filters" - regression

Browse Source
This commit is contained in:
dmv 2009-04-17 07:15:33 +00:00
parent c41972303e
commit 25f640b0b6
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -1370,7 +1370,13 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
int aCriterionType = GetCriterionType(row); int aCriterionType = GetCriterionType(row);
QtxColorButton* clrBtn = qobject_cast<QtxColorButton*>(aTable->cellWidget(row, 2)); QtxColorButton* clrBtn = qobject_cast<QtxColorButton*>(aTable->cellWidget(row, 2));
bool isComboItem = aTable->item(row, 2)->type() == ComboItem::Type(); int aComboType = ComboItem::Type();
QTableWidgetItem* aTableItem = aTable->item(row, 2);
bool isComboItem = false;
if (aTableItem) {
int aTableType = aTable->item(row, 2)->type();
isComboItem = aTableType == aComboType ? true : false;
}
if ( (aCriterionType != SMESH::FT_GroupColor && clrBtn) || if ( (aCriterionType != SMESH::FT_GroupColor && clrBtn) ||
(aCriterionType != SMESH::FT_ElemGeomType && isComboItem) ) (aCriterionType != SMESH::FT_ElemGeomType && isComboItem) )
@ -1445,19 +1451,21 @@ void SMESHGUI_FilterTable::onCriterionChanged (const int row, const int col, con
} }
else else
{ {
if (aCompareItem->count() != 3) if (aCompareItem && aCompareItem->count() != 3)
{ {
aCompareItem->setItems(getCompare()); aCompareItem->setItems(getCompare());
} }
QString aText = aTable->text(row, 2); if (aTable->item( row, 2 )) {
bool isOk = false; QString aText = aTable->text(row, 2);
aText.toDouble(&isOk); bool isOk = false;
aTable->item( row, 2 )->setText(isOk ? aText : QString("")); aText.toDouble(&isOk);
if (!aTable->isEditable(row, 1)) aTable->item( row, 2 )->setText(isOk ? aText : QString(""));
aTable->setEditable(true, row, 1); if (!aTable->isEditable(row, 1))
if (!aTable->isEditable(row, 2)) aTable->setEditable(true, row, 1);
aTable->setEditable(true, row, 2); if (!aTable->isEditable(row, 2))
aTable->setEditable(true, row, 2);
}
} }
updateAdditionalWidget(); updateAdditionalWidget();