0014047: EDF PAL 334 : Problem to select merged face with Create group window

     fix pb that temporary result of getInPlace() remains visible after [Cancel]

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 66537a00ea7e1fc37deea9c0430b6911a25788b9..25af1ff7d8bb63632b1fa11b8f6928216ca0c245 100644 (file)
--- 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 0624ed6f11e34ea8f2ac64599929daf94c8384ee..9abd834bf456f9acf56f013049ab26b1d269c50c 100644 (file)
--- 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;