From 1a1cdf7bccc3846c4e85509cf751e0fae43cb7fa Mon Sep 17 00:00:00 2001 From: skl Date: Thu, 8 Feb 2007 12:17:05 +0000 Subject: [PATCH] Corrected for bug NPAL14695 --- src/SMESHGUI/SMESHGUI_MeshOp.cxx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx index 0e13c26e5..6a9c8553d 100644 --- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx +++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx @@ -331,11 +331,19 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const GEOM::GEOM_Object::_narrow(_CAST(SObject,pSubGeom)->GetObject()); if (aSubGeomVar->_is_nil()) return false; + // skl for NPAL14695 - implementation of searching of mainObj GEOM::GEOM_Object_var mainObj = op->GetMainShape(aSubGeomVar); - if (mainObj->_is_nil() || - string(mainObj->GetEntry()) != string(mainGeom->GetEntry())) return false; + //if (mainObj->_is_nil() || + // string(mainObj->GetEntry()) != string(mainGeom->GetEntry())) return false; + while(1) { + if(mainObj->_is_nil()) + return false; + if( string(mainObj->GetEntry()) == string(mainGeom->GetEntry()) ) + return true; + mainObj = op->GetMainShape(mainObj); + } } - return true; + //return true; } return false; -- 2.39.2