From 03a6d6ca45a9b04bc4cf458592eef0b644a55b6a Mon Sep 17 00:00:00 2001
From: eap <eap@opencascade.com>
Date: Tue, 30 Sep 2008 14:13:19 +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   | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 65ac46503..3f9538419 100644
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -408,6 +408,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);
@@ -436,6 +438,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 312048d8c..eb9a90736 100644
--- a/src/GroupGUI/GroupGUI_GroupDlg.h
+++ b/src/GroupGUI/GroupGUI_GroupDlg.h
@@ -99,6 +99,7 @@ private:
   GEOM::GEOM_Object_var           myMainObj;
   GEOM::GEOM_Object_var           myGroup;
   GEOM::GEOM_Object_var           myInPlaceObj;
+  int                             myInPlaceObjSelectWay;
   TColStd_DataMapOfIntegerInteger myMain2InPlaceIndices;
 
   QPushButton*                    mySelBtn;
@@ -106,8 +107,6 @@ private:
   QPushButton*                    mySelBtn2;
   QLineEdit*                      myShape2Name;
   QButtonGroup*                   mySelectionWayGroup;
-  //QRadioButton*                   mySelSubBtn;
-  //QCheckBox*                      myPlaceCheckBox;
   QPushButton*                    mySelAllBtn;
   QPushButton*                    myAddBtn;
   QPushButton*                    myRemBtn;
-- 
2.39.2