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

fix pb that temporary result of getInPlace() remains visible after [Cancel]
This commit is contained in:
eap 2008-09-30 14:13:19 +00:00
parent eb4c2e36a5
commit 03a6d6ca45
2 changed files with 4 additions and 2 deletions

View File

@ -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();
}
//=================================================================================

View File

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