// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
#include "SMESHDS_Group.hxx"
#include "SMESHDS_GroupOnGeom.hxx"
#include "SMDSAbs_ElementType.hxx"
+
+#include "SMESH_Filter_i.hxx"
+#include "SMESH_PythonDump.hxx"
+
#include "utilities.h"
+using namespace SMESH;
+
//=============================================================================
/*!
*
myMeshServant( theMeshServant ),
myLocalID( theLocalID )
{
- thePOA->activate_object( this );
+ // PAL7962: san -- To ensure correct mapping of servant and correct reference counting in GenericObj_i,
+ // servant activation is performed by SMESH_Mesh_i::createGroup()
+ // thePOA->activate_object( this );
}
SMESH_Group_i::SMESH_Group_i( PortableServer::POA_ptr thePOA, SMESH_Mesh_i* theMeshServant, const int theLocalID )
-: SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
+ : SALOME::GenericObj_i( thePOA ),
+ SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
{
+ MESSAGE("SMESH_Group_i; this = "<<this );
}
SMESH_GroupOnGeom_i::SMESH_GroupOnGeom_i( PortableServer::POA_ptr thePOA, SMESH_Mesh_i* theMeshServant, const int theLocalID )
-: SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
+ : SALOME::GenericObj_i( thePOA ),
+ SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID )
{
+ MESSAGE("SMESH_GroupOnGeom_i; this = "<<this );
}
//=============================================================================
SMESH_GroupBase_i::~SMESH_GroupBase_i()
{
- MESSAGE("~SMESH_GroupBase_i;" );
+ MESSAGE("~SMESH_GroupBase_i; this = "<<this );
if ( myMeshServant )
myMeshServant->removeGroup(myLocalID);
}
void SMESH_GroupBase_i::SetName( const char* theName )
{
+ // Update Python script
+ TPythonDump() << _this() << ".SetName( '" << theName << "' )";
+
+ // Perform renaming
::SMESH_Group* aGroup = GetSmeshGroup();
if (aGroup) {
aGroup->SetName(theName);
void SMESH_Group_i::Clear()
{
+ // Update Python script
+ TPythonDump() << _this() << ".Clear()";
+
+ // Clear the group
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
aGroupDS->Clear();
CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs )
{
+ // Update Python script
+ TPythonDump() << "nbAdd = " << _this() << ".Add( " << theIDs << " )";
+
+ // Add elements to the group
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
if (aGroupDS) {
int nbAdd = 0;
*/
//=============================================================================
+CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs )
+{
+ // Update Python script
+ TPythonDump() << "nbDel = " << _this() << ".Remove( " << theIDs << " )";
+
+ // Remove elements from the group
+ SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
+ if (aGroupDS) {
+ int nbDel = 0;
+ for (int i = 0; i < theIDs.length(); i++) {
+ int anID = (int) theIDs[i];
+ if (aGroupDS->Remove(anID))
+ nbDel++;
+ }
+ return nbDel;
+ }
+ MESSAGE("attempt to remove elements from a vague group");
+ return 0;
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+
+typedef bool (SMESHDS_Group::*TFunChangeGroup)(const int);
+
+CORBA::Long
+ChangeByPredicate( SMESH::Predicate_i* thePredicate,
+ SMESHDS_GroupBase* theGroupBase,
+ TFunChangeGroup theFun)
+{
+ CORBA::Long aNb = 0;
+ if(SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>(theGroupBase)){
+ SMESH::Controls::Filter::TIdSequence aSequence;
+ const SMDS_Mesh* aMesh = theGroupBase->GetMesh();
+ SMESH::Filter_i::GetElementsId(thePredicate,aMesh,aSequence);
+
+ CORBA::Long i = 0, iEnd = aSequence.size();
+ for(; i < iEnd; i++)
+ if((aGroupDS->*theFun)(aSequence[i]))
+ aNb++;
+ return aNb;
+ }
+ return aNb;
+}
+
+CORBA::Long
+SMESH_Group_i::
+AddByPredicate( SMESH::Predicate_ptr thePredicate )
+{
+ if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){
+ TPythonDump()<<_this()<<".AddByPredicate("<<aPredicate<<")";
+ return ChangeByPredicate(aPredicate,GetGroupDS(),&SMESHDS_Group::Add);
+ }
+ return 0;
+}
+
+CORBA::Long
+SMESH_Group_i::
+RemoveByPredicate( SMESH::Predicate_ptr thePredicate )
+{
+ if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){
+ TPythonDump()<<_this()<<".RemoveByPredicate("<<aPredicate<<")";
+ return ChangeByPredicate(aPredicate,GetGroupDS(),&SMESHDS_Group::Remove);
+ }
+ return 0;
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+
CORBA::Long SMESH_GroupBase_i::GetID( CORBA::Long theIndex )
{
SMESHDS_GroupBase* aGroupDS = GetGroupDS();
return aRes._retn();
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
-CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs )
-{
- SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( GetGroupDS() );
- if (aGroupDS) {
- int nbDel = 0;
- for (int i = 0; i < theIDs.length(); i++) {
- int anID = (int) theIDs[i];
- if (aGroupDS->Remove(anID))
- nbDel++;
- }
- return nbDel;
- }
- MESSAGE("attempt to remove elements from a vague group");
- return 0;
-}
-
//=============================================================================
/*!
*
return aGeomObj._retn();
}
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+SALOMEDS::Color SMESH_GroupBase_i::GetColor()
+{
+ SMESHDS_GroupBase* aGroupDS = GetGroupDS();
+ if (aGroupDS)
+ {
+ Quantity_Color aQColor = aGroupDS->GetColor();
+ SALOMEDS::Color aColor;
+ aColor.R = aQColor.Red();
+ aColor.G = aQColor.Green();
+ aColor.B = aQColor.Blue();
+
+ return aColor;
+ }
+ MESSAGE("get color of a group");
+ return SALOMEDS::Color();
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+void SMESH_GroupBase_i::SetColor(const SALOMEDS::Color& color)
+{
+ SMESHDS_GroupBase* aGroupDS = GetGroupDS();
+ if (aGroupDS)
+ {
+ Quantity_Color aQColor( color.R, color.G, color.B, Quantity_TOC_RGB );
+ return aGroupDS->SetColor(aQColor);
+ }
+ MESSAGE("set color of a group");
+ return ;
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+CORBA::Long SMESH_GroupBase_i::GetColorNumber()
+{
+ SMESHDS_GroupBase* aGroupDS = GetGroupDS();
+ if (aGroupDS)
+ return aGroupDS->GetColorGroup();
+ MESSAGE("get color number of a group");
+ return 0;
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color)
+{
+ SMESHDS_GroupBase* aGroupDS = GetGroupDS();
+ if (aGroupDS)
+ return aGroupDS->SetColorGroup(color);
+ MESSAGE("set color number of a group");
+ return ;
+}
