ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 17:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0052938: Visibility of object is wrong when closing "Create group" dilaog

Browse Source
This commit is contained in:
mpa 2015-11-06 13:15:49 +03:00
parent 072d2d2cd9
commit 449aed5c8e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -88,7 +88,8 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg (Mode mode, GeometryGUI* theGeometryGUI, QW
myBusy(false),
myIsShapeType(false),
myIsHiddenMain(false),
myWasHiddenMain(true)
myWasHiddenMain(true),
myIsAccept(false)
{
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
@ -235,10 +236,10 @@ GroupGUI_GroupDlg::~GroupGUI_GroupDlg()
GEOM_Displayer* aDisplayer = getDisplayer();
SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
bool isHideObjects = resMgr->booleanValue( "Geometry", "hide_input_object", true);
if (myWasHiddenMain) {
if (myWasHiddenMain || ( isHideObjects && myIsAccept ) ) {
myIsHiddenMain = true;
}
else if (!isHideObjects) {
else {
aDisplayer->Display(myMainObj);
myIsHiddenMain = false;
}
@ -395,7 +396,8 @@ bool GroupGUI_GroupDlg::ClickOnApply()
setIsDisplayResult( false );
}
if (!onAccept(myMode == CreateGroup, true, isApplyAndClose()))
myIsAccept = onAccept(myMode == CreateGroup, true, isApplyAndClose());
if (!myIsAccept)
return false;
if(!isApplyAndClose()) {

1
src/GroupGUI/GroupGUI_GroupDlg.h
View File

@ -115,6 +115,7 @@ private:
TColStd_DataMapOfIntegerInteger myMain2InPlaceIndices;
QList<int> myGroupIdList;
int myDmMode;
bool myIsAccept;
QPushButton* mySelBtn;
QLineEdit* myMainName;