Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0052610: Inactive "eye" icon after mesh compound creation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_BuildCompoundDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index 3ca0fff25ae06442733a331c70577a4a220863ff..5cd384f153c1d0f67eba82b137e9614e33923793 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-65,10
+65,6
@@
#define SPACING 6
#define MARGIN 11
#define SPACING 6
#define MARGIN 11
-//To disable automatic genericobj management, the following line should be commented.
-//Otherwise, it should be uncommented. Refer to KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_AttributeIOR.cxx
-#define WITHGENERICOBJ
-
//=================================================================================
// name : SMESHGUI_BuildCompoundDlg
// Purpose :
//=================================================================================
// name : SMESHGUI_BuildCompoundDlg
// Purpose :
@@
-337,8
+333,10
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
SMESH::UpdateView();
_PTR(SObject) aSO = SMESH::FindSObject(aCompoundMesh.in());
SMESH::UpdateView();
_PTR(SObject) aSO = SMESH::FindSObject(aCompoundMesh.in());
- if ( SMESH_Actor* anActor = SMESH::CreateActor(aSO->GetStudy(), aSO->GetID().c_str()) )
+ if ( SMESH_Actor* anActor = SMESH::CreateActor(aSO->GetStudy(), aSO->GetID().c_str()) )
{
SMESH::DisplayActor(SMESH::GetActiveWindow(), anActor);
SMESH::DisplayActor(SMESH::GetActiveWindow(), anActor);
+ SMESH::UpdateView();
+ }
}// end IPAL21468
if( LightApp_Application* anApp =
}// end IPAL21468
if( LightApp_Application* anApp =
@@
-347,12
+345,6
@@
bool SMESHGUI_BuildCompoundDlg::ClickOnApply()
SMESHGUI::Modified();
SMESHGUI::Modified();
- // obj has been published in study. Its refcount has been incremented.
- // It is safe to decrement its refcount
- // so that it will be destroyed when the entry in study will be removed
- if (!CORBA::is_nil(aCompoundMesh))
- aCompoundMesh->UnRegister();
-
return true;
}
return false;
return true;
}
return false;