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
PAL15174 (Dump study works wrong for Concatenate)
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Gen_i.cxx
diff --git
a/src/SMESH_I/SMESH_Gen_i.cxx
b/src/SMESH_I/SMESH_Gen_i.cxx
index b1a879f93c8ada92a545eed691c47c8dc0fcc7a9..6461586bdacbc7898c41b6f7ee499a19f067f030 100644
(file)
--- a/
src/SMESH_I/SMESH_Gen_i.cxx
+++ b/
src/SMESH_I/SMESH_Gen_i.cxx
@@
-1170,12
+1170,11
@@
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Concatenate(const SMESH::mesh_array& theMeshe
typedef map< pair<string, SMESH::ElementType>, TListOfNewGroups > TGroupsMap;
typedef std::set<SMESHDS_GroupBase*> TGroups;
typedef map< pair<string, SMESH::ElementType>, TListOfNewGroups > TGroupsMap;
typedef std::set<SMESHDS_GroupBase*> TGroups;
+ TPythonDump aPythonDump; // prevent dump of called methods
+
// create mesh
SMESH::SMESH_Mesh_var aNewMesh = CreateEmptyMesh();
// create mesh
SMESH::SMESH_Mesh_var aNewMesh = CreateEmptyMesh();
- // to update Python script
- TPythonDump aPythonDump;
-
if ( !aNewMesh->_is_nil() ) {
SMESH_Mesh_i* aNewImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( aNewMesh ).in() );
if ( aNewImpl ) {
if ( !aNewMesh->_is_nil() ) {
SMESH_Mesh_i* aNewImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( aNewMesh ).in() );
if ( aNewImpl ) {
@@
-1326,7
+1325,6
@@
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Concatenate(const SMESH::mesh_array& theMeshe
}
// Update Python script
}
// Update Python script
- RemoveLastFromPythonScript( GetCurrentStudyID() );
aPythonDump << aNewMesh << " = " << this << ".Concatenate(";
aPythonDump << "[";
for ( int i = 0; i < theMeshesArray.length(); i++) {
aPythonDump << aNewMesh << " = " << this << ".Concatenate(";
aPythonDump << "[";
for ( int i = 0; i < theMeshesArray.length(); i++) {
@@
-1335,8
+1333,8
@@
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::Concatenate(const SMESH::mesh_array& theMeshe
}
aPythonDump << "], ";
aPythonDump << theUniteIdenticalGroups << ", "
}
aPythonDump << "], ";
aPythonDump << theUniteIdenticalGroups << ", "
- << theMergeNodesAndElements << ", "
- << theMergeTolerance << ")";
+ << theMergeNodesAndElements << ", "
+ << theMergeTolerance << ")";
return aNewMesh._retn();
}
return aNewMesh._retn();
}