From: eap <eap@opencascade.com>
Date: Thu, 2 Oct 2008 11:52:22 +0000 (+0000)
Subject: 0014047: EDF PAL 334 : Problem to select merged face with Create group window
X-Git-Tag: V5_1_0a3~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6c057505a6e4bcff162cfb8b86deeda0eefff60a;p=modules%2Fgeom.git

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 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;