From 6c057505a6e4bcff162cfb8b86deeda0eefff60a Mon Sep 17 00:00:00 2001 From: eap Date: Thu, 2 Oct 2008 11:52:22 +0000 Subject: [PATCH] 0014047: EDF PAL 334 : Problem to select merged face with Create group window fix pb that temporary result of getInPlace() remains visible after [Cancel] --- src/GroupGUI/GroupGUI_GroupDlg.cxx | 3 +++ src/GroupGUI/GroupGUI_GroupDlg.h | 1 + 2 files changed, 4 insertions(+) diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index 66537a00e..25af1ff7d 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -403,6 +403,8 @@ void GroupGUI_GroupDlg::setInPlaceObj( GEOM::GEOM_Object_var theObj ) const char* tmpName = "__InPlaceObj__"; // remove old InPlaceObj if ( !myInPlaceObj->_is_nil() ) { + if ( myInPlaceObjSelectWay == GET_IN_PLACE ) // hide temporary object + GEOM_Displayer(getStudy()).Erase( myInPlaceObj, true ); if (_PTR(SObject) SO = getStudy()->studyDS()->FindObject( tmpName )) { getStudy()->studyDS()->NewBuilder()->RemoveObjectWithChildren( SO ); getGeomEngine()->RemoveObject(myInPlaceObj); @@ -431,6 +433,7 @@ void GroupGUI_GroupDlg::setInPlaceObj( GEOM::GEOM_Object_var theObj ) myMain2InPlaceIndices.Bind( aMainIndex, aPlaceIndex ); } } + myInPlaceObjSelectWay = subSelectionWay(); } //================================================================================= diff --git a/src/GroupGUI/GroupGUI_GroupDlg.h b/src/GroupGUI/GroupGUI_GroupDlg.h index 0624ed6f1..9abd834bf 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.h +++ b/src/GroupGUI/GroupGUI_GroupDlg.h @@ -94,6 +94,7 @@ private: GEOM::GEOM_Object_var myMainObj; GEOM::GEOM_Object_var myGroup; GEOM::GEOM_Object_var myInPlaceObj; + int myInPlaceObjSelectWay; TColStd_DataMapOfIntegerInteger myMain2InPlaceIndices; QPushButton* mySelBtn; -- 2.39.2