OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Intermediate fixes to avoid noise from asserts

Browse Source
This commit is contained in:
Magne Sjaastad
2015-08-04 15:57:37 +02:00
parent a225d3abff
commit c09143e706
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.cpp
View File

@@ -105,7 +105,7 @@ bool PdmUiTreeOrdering::containsObject(const PdmObjectHandle* object)
{
PdmUiTreeOrdering* child = dynamic_cast<PdmUiTreeOrdering*>(this->child(cIdx)); // What again ???
if (child->object() == object)
if (child->isRepresentingObject() && child->object() == object)
{
return true;
}

3
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeViewModel.cpp
View File

@@ -483,7 +483,8 @@ QVariant PdmUiTreeViewModel::data(const QModelIndex &index, int role ) const
bool isFieldRep = uitreeOrdering->isRepresentingField();
bool isDisplayOnly = uitreeOrdering->isDisplayItemOnly();
assert (uitreeOrdering->isValid()); // Tree generation has some error.
// MODTODO
//assert (uitreeOrdering->isValid()); // Tree generation has some error.
if (role == Qt::DisplayRole || role == Qt::EditRole)
{