IPAL9284: Presentation on Group

diff --git a/src/VISU_I/VISU_Mesh_i.cc b/src/VISU_I/VISU_Mesh_i.cc
index 27b69a654d6ad5ccac9a8c60d5a413c0214aa422..72a86645d5ef0b47a10805f85e2bf4f0f2744ab3 100644 (file)
--- a/src/VISU_I/VISU_Mesh_i.cc
+++ b/src/VISU_I/VISU_Mesh_i.cc
@@ -1,23 +1,23 @@
 //  VISU OBJECT : interactive object for VISU entities implementation
 //
 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 //
 //
 //  File   : VISU_PrsObject_i.cxx
@@ -49,8 +49,8 @@ const string VISU::Mesh_i::myComment = "MESH";
 const char* VISU::Mesh_i::GetComment() const { return myComment.c_str();}
 
 VISU::Mesh_i::
-Mesh_i(Result_i* theResult) : 
-  PrsObject_i(theResult->GetStudyDocument()), 
+Mesh_i(Result_i* theResult) :
+  PrsObject_i(theResult->GetStudyDocument()),
   Prs3d_i(theResult,false),
   myMeshPL(VISU_MeshPL::New())
 {
@@ -59,9 +59,9 @@ Mesh_i(Result_i* theResult) :
 
 
 VISU::Mesh_i::
-Mesh_i(Result_i* theResult, 
-       SALOMEDS::SObject_ptr theSObject) : 
-  PrsObject_i(theResult->GetStudyDocument()), 
+Mesh_i(Result_i* theResult,
+       SALOMEDS::SObject_ptr theSObject) :
+  PrsObject_i(theResult->GetStudyDocument()),
   Prs3d_i(theResult,theSObject),
   myMeshPL(VISU_MeshPL::New())
 {
@@ -74,13 +74,16 @@ void VISU::Mesh_i::RemoveFromStudy(){
 }
 
 
-void VISU::Mesh_i::SameAs(const Mesh_i* theOrigin){
+void VISU::Mesh_i::SameAs (const Mesh_i* theOrigin)
+{
   return; // "SameAs" command for mesh is not valid in current architecture
 }
 
 
 
-int VISU::Mesh_i::IsPossible(Result_i* theResult, const char* theMeshName, Entity theEntity, const char* theFamilyName){
+int VISU::Mesh_i::IsPossible (Result_i* theResult, const char* theMeshName,
+                             Entity theEntity, const char* theFamilyName)
+{
   try{
     MESSAGE("Mesh_i::IsPossible - theMeshName = '"<<theMeshName<<"'; theEntity = "<<theEntity<<"; theFamilyName = '"<<theFamilyName<<"'");
     float aSize = INCMEMORY*
@@ -96,15 +99,20 @@ int VISU::Mesh_i::IsPossible(Result_i* theResult, const char* theMeshName, Entit
   return 0;
 }
 
-VISU::Storable* VISU::Mesh_i::Create(const char* theMeshName, Entity theEntity, const char* theFamilyName){
+VISU::Storable* VISU::Mesh_i::Create (const char* theMeshName,
+                                     Entity theEntity,
+                                     const char* theFamilyName)
+{
   myMeshName = theMeshName;
-  myEntity = VISU::TEntity(theEntity);
+  //jfa IPAL9284:myEntity = VISU::TEntity(theEntity);
+  myEntity = int(theEntity);//jfa IPAL9284
   mySubMeshName = theFamilyName;
   return Build(false);
 }
 
 
-int VISU::Mesh_i::IsPossible(Result_i* theResult, const char* theMeshName, const char* theGroupName){
+int VISU::Mesh_i::IsPossible (Result_i* theResult, const char* theMeshName, const char* theGroupName)
+{
   try{
     MESSAGE("Mesh_i::IsPossible - theMeshName = '"<<theMeshName<<"'; theGroupName = '"<<theGroupName<<"'");
     float aSize = INCMEMORY*
@@ -121,9 +129,12 @@ int VISU::Mesh_i::IsPossible(Result_i* theResult, const char* theMeshName, const
 }
 
 
-VISU::Storable* VISU::Mesh_i::Create(const char* theMeshName, const char* theGroupName){
+VISU::Storable* VISU::Mesh_i::Create (const char* theMeshName,
+                                     const char* theGroupName)
+{
   myMeshName = theMeshName;
-  myEntity = VISU::TEntity(-1);
+  //jfa IPAL9284:myEntity = VISU::TEntity(-1);
+  myEntity = -1;//jfa IPAL9284
   mySubMeshName = theGroupName;
   return Build(false);
 }
@@ -134,7 +145,8 @@ VISU::Storable* VISU::Mesh_i::Restore(const Storable::TRestoringMap& theMap)
   Prs3d_i::Restore(theMap);
 
   myMeshName = VISU::Storable::FindValue(theMap,"myMeshName").latin1();
-  myEntity = (VISU::TEntity)VISU::Storable::FindValue(theMap,"myEntity").toInt();
+  //jfa IPAL9284:myEntity = (VISU::TEntity)VISU::Storable::FindValue(theMap,"myEntity").toInt();
+  myEntity = VISU::Storable::FindValue(theMap,"myEntity").toInt();//jfa IPAL9284
   mySubMeshName = VISU::Storable::FindValue(theMap,"mySubMeshName").latin1();
 
   myPresentType = VISU::PresentationType(VISU::Storable::FindValue(theMap,"myPresentType").toInt());
@@ -183,42 +195,47 @@ VISU::Mesh_i::~Mesh_i(){
 }
 
 
-VISU::Storable* VISU::Mesh_i::Build(int theRestoring){
+VISU::Storable* VISU::Mesh_i::Build (int theRestoring)
+{
   SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder();
   aStudyBuilder->NewCommand();  // There is a transaction
-  try{
-    if(myResult->GetInput() == NULL) 
+  try {
+    if (myResult->GetInput() == NULL)
       throw std::runtime_error("Mesh_i::Build - myResult->GetInput() == NULL !!!");
-    if(!theRestoring){
+    if (!theRestoring) {
       myPresentType = VISU::SHADED;
       myName = GenerateName().latin1();
       myCellColor.R = 0.0;  myCellColor.G = myCellColor.B = 1.0;
       myNodeColor.R = myNodeColor.G = 1.0;  myNodeColor.B = 1.0;
       myLinkColor.R = myLinkColor.G = myLinkColor.B = 83/255.;
     }
-    if(int(myEntity) >= 0) 
-      if(mySubMeshName == "") 
-       myType = VISU::TENTITY; 
-      else 
+    //jfa IPAL9284:if (int(myEntity) >= 0)
+    if (myEntity >= 0) //jfa IPAL9284
+      if (mySubMeshName == "")
+       myType = VISU::TENTITY;
+      else
        myType = VISU::TFAMILY;
-    else 
+    else
       myType = VISU::TGROUP;
     if(MYDEBUG) MESSAGE("Mesh_i::Build - myType = "<<myType);
     QString aComment;
-    
+
     VISU_Convertor::TOutput *anOutput;
     switch(myType){
-    case VISU::TENTITY : 
-      anOutput = myResult->GetInput()->GetMeshOnEntity(myMeshName,myEntity);
+    case VISU::TENTITY :
+      //jfa IPAL9284:anOutput = myResult->GetInput()->GetMeshOnEntity(myMeshName,myEntity);
+      anOutput = myResult->GetInput()->GetMeshOnEntity(myMeshName,(VISU::TEntity)myEntity);//jfa IPAL9284
       aComment.sprintf("myComment=ENTITY;myType=%d;myMeshName=%s;myId=%d",
                       VISU::TENTITY,myMeshName.c_str(),myEntity);
       break;
-    case VISU::TFAMILY : 
-      anOutput = myResult->GetInput()->GetMeshOnEntity(myMeshName,myEntity,mySubMeshName);
+    case VISU::TFAMILY :
+      //jfa IPAL9284:anOutput = myResult->GetInput()->GetMeshOnEntity(myMeshName,myEntity,mySubMeshName);
+      anOutput = myResult->GetInput()->GetMeshOnEntity
+        (myMeshName,(VISU::TEntity)myEntity,mySubMeshName);//jfa IPAL9284
       aComment.sprintf("myComment=FAMILY;myType=%d;myMeshName=%s;myEntityId=%d;myName=%s",
                       VISU::TFAMILY,myMeshName.c_str(),myEntity,mySubMeshName.c_str());
       break;
-    case VISU::TGROUP : 
+    case VISU::TGROUP :
       anOutput = myResult->GetInput()->GetMeshOnGroup(myMeshName,mySubMeshName);
       aComment.sprintf("myComment=GROUP;myType=%d;myMeshName=%s;myName=%s",
                       VISU::TGROUP,myMeshName.c_str(),mySubMeshName.c_str());
@@ -237,7 +254,7 @@ VISU::Storable* VISU::Mesh_i::Build(int theRestoring){
       SALOMEDS::GenericAttribute_var anAttr = aStudyBuilder->FindOrCreateAttribute(mySObject,"AttributeIOR");
       SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr);
       CORBA::String_var aString = GetID();
-      anIOR->SetValue(aString); 
+      anIOR->SetValue(aString);
     }
   }catch(std::exception& exc){
     INFOS("Follow exception was occured :\n"<<exc.what());
@@ -245,13 +262,13 @@ VISU::Storable* VISU::Mesh_i::Build(int theRestoring){
   }catch(...){
     INFOS("Unknown exception was occured!");
     return NULL;
-  } 
+  }
   aStudyBuilder->CommitCommand();
   return this;
 }
 
 
-VISU_Actor* VISU::Mesh_i::CreateActor(const Handle(SALOME_InteractiveObject)& theIO) 
+VISU_Actor* VISU::Mesh_i::CreateActor(const Handle(SALOME_InteractiveObject)& theIO)
 {
   VISU_MeshAct* anActor = VISU_MeshAct::New();
   try{
@@ -263,7 +280,7 @@ VISU_Actor* VISU::Mesh_i::CreateActor(const Handle(SALOME_InteractiveObject)& th
   }
   return anActor;
 }
- 
+
 
 void VISU::Mesh_i::UpdateActor(VISU_Actor* theActor) {
   if(VISU_MeshAct* anActor = dynamic_cast<VISU_MeshAct*>(theActor)){

diff --git a/src/VISU_I/VISU_Mesh_i.hh b/src/VISU_I/VISU_Mesh_i.hh
index a9e164aeb95071347ee8d674a228e358cb31cc50..70e4e6ae06983ec228e1f7069a32e7721529082e 100644 (file)
--- a/src/VISU_I/VISU_Mesh_i.hh
+++ b/src/VISU_I/VISU_Mesh_i.hh
@@ -1,23 +1,23 @@
 //  VISU OBJECT : interactive object for VISU entities implementation
 //
 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  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. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 //
 //
 //  File   : VISU_PrsObject_i.hxx
@@ -42,7 +42,7 @@ namespace VISU{
     explicit
     Mesh_i(Result_i* theResult);
     explicit
-    Mesh_i(Result_i* theResult, 
+    Mesh_i(Result_i* theResult,
           SALOMEDS::SObject_ptr theSObject);
     virtual void SameAs(const Mesh_i* theOrigin);
     virtual ~Mesh_i();
@@ -71,7 +71,8 @@ namespace VISU{
     VISU_MeshPL* myMeshPL;
 
     string myMeshName;
-    TEntity myEntity;
+    //jfa IPAL9284:TEntity myEntity;
+    int myEntity;//jfa IPAL9284
     string mySubMeshName;
     VISU::VISUType myType;
 
@@ -81,14 +82,14 @@ namespace VISU{
   public:
     static int IsPossible(Result_i* theResult, const char* theMeshName, Entity theEntity, const char* theFamilyName = "");
     virtual Storable* Create(const char* theMeshName, Entity theEntity, const char* theFamilyName = "");
-    
+
     static int IsPossible(Result_i* theResult, const char* theMeshName, const char* theGroupName);
     virtual Storable* Create(const char* theMeshName, const char* theGroupName);
 
     const std::string& GetMeshName() const { return myMeshName;}
     VISU::Entity GetEntity() const { return VISU::Entity(myEntity);}
     const string& GetSubMeshName() const { return mySubMeshName;}
-    
+
     virtual void ToStream(std::ostringstream& theStr);
 
     virtual const char* GetComment() const;