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
0022221: [CEA 819] Error "'NoneType' object is not callable" at Salome closure
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_CopyMeshDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
b/src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
index 6a3b9038b216c755e22149844afa5ed39db6d7a6..0e1f921cceaa87d0bf89feba2907a8aea78f7e8c 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
3
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
@@
-98,10
+98,6
@@
namespace
#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
-
//================================================================================
/*!
//================================================================================
/*!
@@
-312,10
+308,11
@@
bool SMESHGUI_CopyMeshDlg::ClickOnApply()
try
{
SUIT_OverrideCursor aWaitCursor;
try
{
SUIT_OverrideCursor aWaitCursor;
- SMESH::SMESH_IDSource_
var
aPartToCopy;
+ SMESH::SMESH_IDSource_
wrap
aPartToCopy;
if ( myIdSourceCheck->isChecked())
{
aPartToCopy = mySelectedObject;
if ( myIdSourceCheck->isChecked())
{
aPartToCopy = mySelectedObject;
+ aPartToCopy->Register();
}
else
{
}
else
{
@@
-338,13
+335,8
@@
bool SMESHGUI_CopyMeshDlg::ClickOnApply()
if( !newMesh->_is_nil() )
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( newMesh ) )
anEntryList.append( aSObject->GetID().c_str() );
if( !newMesh->_is_nil() )
if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( newMesh ) )
anEntryList.append( aSObject->GetID().c_str() );
-#ifdef WITHGENERICOBJ
- // 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
- newMesh->UnRegister();
-#endif
- } catch (...) {
+ }
+ catch (...) {
}
mySMESHGUI->updateObjBrowser(true);
}
mySMESHGUI->updateObjBrowser(true);