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
Update copyrights
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Group_i.cxx
diff --git
a/src/SMESH_I/SMESH_Group_i.cxx
b/src/SMESH_I/SMESH_Group_i.cxx
index 84e405e9b4d2d3d579371a329998d20966a48bb7..b9a60ff9089b49bf9c32f0d47321a130f78fe535 100644
(file)
--- a/
src/SMESH_I/SMESH_Group_i.cxx
+++ b/
src/SMESH_I/SMESH_Group_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
9
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
@@
-27,10
+27,10
@@
//
#include "SMESH_Group_i.hxx"
//
#include "SMESH_Group_i.hxx"
-#include "SMDSAbs_ElementType.hxx"
#include "SMESHDS_Group.hxx"
#include "SMESHDS_GroupOnFilter.hxx"
#include "SMESHDS_GroupOnGeom.hxx"
#include "SMESHDS_Group.hxx"
#include "SMESHDS_GroupOnFilter.hxx"
#include "SMESHDS_GroupOnGeom.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESH_Comment.hxx"
#include "SMESH_Filter_i.hxx"
#include "SMESH_Gen_i.hxx"
#include "SMESH_Comment.hxx"
#include "SMESH_Filter_i.hxx"
#include "SMESH_Gen_i.hxx"
@@
-150,9
+150,8
@@
void SMESH_GroupBase_i::SetName( const char* theName )
// Update group name in a study
SMESH_Gen_i* aGen = myMeshServant->GetGen();
// Update group name in a study
SMESH_Gen_i* aGen = myMeshServant->GetGen();
- SALOMEDS::Study_var aStudy = aGen->GetCurrentStudy();
SMESH::SMESH_GroupBase_var aGrp = _this();
SMESH::SMESH_GroupBase_var aGrp = _this();
- SALOMEDS::SObject_var anSO = aGen->ObjectToSObject( a
Study, a
Grp );
+ SALOMEDS::SObject_var anSO = aGen->ObjectToSObject( aGrp );
if ( !anSO->_is_nil() )
{
aGen->SetName( anSO, theName );
if ( !anSO->_is_nil() )
{
aGen->SetName( anSO, theName );
@@
-474,13
+473,13
@@
SMESH::long_array* SMESH_GroupBase_i::GetListOfID()
{
int aSize = aGroupDS->Extent();
aRes->length(aSize);
{
int aSize = aGroupDS->Extent();
aRes->length(aSize);
- for (int i = 0; i < aSize; i++)
- aRes[i] = aGroupDS->GetID(i+1);
+ SMDS_ElemIteratorPtr it = aGroupDS->GetElements();
+ for (int i = 0; it->more(); i++)
+ aRes[i] = it->next()->GetID();
if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;)
std::sort( &aRes[0], &aRes[0]+aSize );
}
if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;)
std::sort( &aRes[0], &aRes[0]+aSize );
}
- MESSAGE("get list of IDs of a vague group");
return aRes._retn();
}
return aRes._retn();
}
@@
-673,7
+672,6
@@
void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color)
aGroupDS->SetColorGroup(color);
TPythonDump()<<SMESH::SMESH_GroupBase_var(_this())<<".SetColorNumber( "<<color<<" )";
}
aGroupDS->SetColorGroup(color);
TPythonDump()<<SMESH::SMESH_GroupBase_var(_this())<<".SetColorNumber( "<<color<<" )";
}
- MESSAGE("set color number of a group");
return ;
}
return ;
}
@@
-840,7
+838,13
@@
void SMESH_GroupOnFilter_i::SetFilter(SMESH::Filter_ptr theFilter)
Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion
}
Modified(); // notify dependent Filter with FT_BelongToMeshGroup criterion
}
- TPythonDump()<< SMESH::SMESH_GroupOnFilter_var(_this()) <<".SetFilter( "<<theFilter<<" )";
+ SMESH::SMESH_GroupOnFilter_var me = _this();
+
+ // mark the group valid after edition
+ GetMeshServant()->GetGen()->HighLightInvalid( me, false );
+
+
+ TPythonDump()<< me <<".SetFilter( "<< theFilter <<" )";
}
//================================================================================
}
//================================================================================