DCQ : Merge with Ecole Ete a6.

[modules/visu.git] / src / VISU_I / VISU_Mesh_i.cc

diff --git a/src/VISU_I/VISU_Mesh_i.cc b/src/VISU_I/VISU_Mesh_i.cc
index e52fa832f8563436787da1559becdda8b6021101..c556d1739c6429d4c7016662f9283174a636950b 100644 (file)
--- a/src/VISU_I/VISU_Mesh_i.cc
+++ b/src/VISU_I/VISU_Mesh_i.cc
@@ -71,11 +71,11 @@ void VISU::Mesh_i::SameAs(const Mesh_i* theOrigin){
 
 int VISU::Mesh_i::IsPossible(Result_i* theResult, const char* theMeshName, Entity theEntity, const char* theFamilyName){
   try{
-    INFOS("Mesh_i::IsPossible - theMeshName = '"<<theMeshName<<"'; theEntity = "<<theEntity<<"; theFamilyName = '"<<theFamilyName<<"'");
+    MESSAGE("Mesh_i::IsPossible - theMeshName = '"<<theMeshName<<"'; theEntity = "<<theEntity<<"; theFamilyName = '"<<theFamilyName<<"'");
     float aSize = INCMEMORY*
       theResult->GetInput()->GetMeshOnEntitySize(theMeshName,(VISU::TEntity)theEntity,theFamilyName);
     bool aResult = VISU_PipeLine::CheckAvailableMemory(aSize);
-    INFOS("Mesh_i::IsPossible - CheckAvailableMemory = "<<float(aSize)<<"; aResult = "<<aResult);
+    MESSAGE("Mesh_i::IsPossible - CheckAvailableMemory = "<<float(aSize)<<"; aResult = "<<aResult);
     return aResult;
   }catch(std::runtime_error& exc){
     INFOS("Follow exception was accured :\n"<<exc.what());
@@ -95,7 +95,7 @@ VISU::Storable* VISU::Mesh_i::Create(const char* theMeshName, Entity theEntity,
 
 int VISU::Mesh_i::IsPossible(Result_i* theResult, const char* theMeshName, const char* theGroupName){
   try{
-    INFOS("Mesh_i::IsPossible - theMeshName = '"<<theMeshName<<"'; theGroupName = '"<<theGroupName<<"'");
+    MESSAGE("Mesh_i::IsPossible - theMeshName = '"<<theMeshName<<"'; theGroupName = '"<<theGroupName<<"'");
     float aSize = INCMEMORY*
       theResult->GetInput()->GetMeshOnGroupSize(theMeshName,theGroupName);
     bool aResult = VISU_PipeLine::CheckAvailableMemory(aSize);
@@ -119,7 +119,6 @@ VISU::Storable* VISU::Mesh_i::Create(const char* theMeshName, const char* theGro
 
 
 VISU::Storable* VISU::Mesh_i::Restore(const Storable::TRestoringMap& theMap)
-     throw(std::logic_error&)
 {
   Prs3d_i::Restore(theMap);
 
@@ -242,26 +241,25 @@ VISU::Storable* VISU::Mesh_i::Build(int theRestoring){
 
 
 VISU_Actor* VISU::Mesh_i::CreateActor(const Handle(SALOME_InteractiveObject)& theIO) 
-  throw (std::runtime_error&)
 {
   VISU_MeshAct* anActor = VISU_MeshAct::New();
   try{
     VISU::Prs3d_i::CreateActor(anActor,theIO);
     UpdateActor(anActor);
-  }catch(std::runtime_error& exc){
+  }catch (...) {
     anActor->Delete();
-    throw exc;
+    throw ;
   }
   return anActor;
 }
  
 
-void VISU::Mesh_i::UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&){
+void VISU::Mesh_i::UpdateActor(VISU_Actor* theActor) {
   if(VISU_MeshAct* anActor = dynamic_cast<VISU_MeshAct*>(theActor)){
     if(MYDEBUG) MESSAGE("Mesh_i::UpdateActor");
     VISU::Prs3d_i::UpdateActor(anActor);
     anActor->SetRepresentation(myPresentType);
-    anActor->GetProperty()->SetColor(myCellColor.R, myCellColor.G, myCellColor.B);
+    anActor->GetSurfaceProperty()->SetColor(myCellColor.R, myCellColor.G, myCellColor.B);
     anActor->GetEdgeProperty()->SetColor(myLinkColor.R, myLinkColor.G, myLinkColor.B);
     anActor->GetNodeProperty()->SetColor(myNodeColor.R, myNodeColor.G, myNodeColor.B);
   }