ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-03 19:00:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -408,6 +408,8 @@ void GroupGUI_GroupDlg::setInPlaceObj( GEOM::GEOM_Object_var theObj )
const char* tmpName = "__InPlaceObj__"; const char* tmpName = "__InPlaceObj__";
// remove old InPlaceObj // remove old InPlaceObj
if ( !myInPlaceObj->_is_nil() ) { 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 )) { if (_PTR(SObject) SO = getStudy()->studyDS()->FindObject( tmpName )) {
getStudy()->studyDS()->NewBuilder()->RemoveObjectWithChildren( SO ); getStudy()->studyDS()->NewBuilder()->RemoveObjectWithChildren( SO );
getGeomEngine()->RemoveObject(myInPlaceObj); getGeomEngine()->RemoveObject(myInPlaceObj);
@ -436,6 +438,7 @@ void GroupGUI_GroupDlg::setInPlaceObj( GEOM::GEOM_Object_var theObj )
myMain2InPlaceIndices.Bind( aMainIndex, aPlaceIndex ); myMain2InPlaceIndices.Bind( aMainIndex, aPlaceIndex );
} }
} }
myInPlaceObjSelectWay = subSelectionWay();
} }
//================================================================================= //=================================================================================

3
src/GroupGUI/GroupGUI_GroupDlg.h
View File

@ -99,6 +99,7 @@ private:
GEOM::GEOM_Object_var myMainObj; GEOM::GEOM_Object_var myMainObj;
GEOM::GEOM_Object_var myGroup; GEOM::GEOM_Object_var myGroup;
GEOM::GEOM_Object_var myInPlaceObj; GEOM::GEOM_Object_var myInPlaceObj;
int myInPlaceObjSelectWay;
TColStd_DataMapOfIntegerInteger myMain2InPlaceIndices; TColStd_DataMapOfIntegerInteger myMain2InPlaceIndices;
QPushButton* mySelBtn; QPushButton* mySelBtn;
@ -106,8 +107,6 @@ private:
QPushButton* mySelBtn2; QPushButton* mySelBtn2;
QLineEdit* myShape2Name; QLineEdit* myShape2Name;
QButtonGroup* mySelectionWayGroup; QButtonGroup* mySelectionWayGroup;
//QRadioButton* mySelSubBtn;
//QCheckBox* myPlaceCheckBox;
QPushButton* mySelAllBtn; QPushButton* mySelAllBtn;
QPushButton* myAddBtn; QPushButton* myAddBtn;
QPushButton* myRemBtn; QPushButton* myRemBtn;