From 9df276244bd91e7f12c63de9a640dd1cf8007320 Mon Sep 17 00:00:00 2001
From: ouv <ouv@opencascade.com>
Date: Wed, 27 May 2009 12:05:48 +0000
Subject: [PATCH] Issue 0019818: EDF 703 SMESH VISU : Display Mesh Groups names
 in viewer (as a caption)

---
 src/OBJECT/SMESH_Actor.cxx   | 11 ++++++++++-
 src/OBJECT/SMESH_Object.cxx  |  9 +++++++++
 src/OBJECT/SMESH_ObjectDef.h |  2 ++
 src/SMESHGUI/SMESHGUI.cxx    | 19 ++++++++++++++-----
 4 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index 9291df37c..875146e23 100644
--- a/src/OBJECT/SMESH_Actor.cxx
+++ b/src/OBJECT/SMESH_Actor.cxx
@@ -1458,7 +1458,10 @@ vtkFloatingPointType SMESH_ActorDef::GetOpacity(){
 
 void SMESH_ActorDef::SetSufaceColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b){
   mySurfaceProp->SetColor(r,g,b);
-  myNameActor->SetBackgroundColor(r,g,b);
+  if( SMESH_GroupObj* aGroupObj = dynamic_cast<SMESH_GroupObj*>( myVisualObj.get() ) )
+    if( aGroupObj->GetElementType() == SMDSAbs_Face ||
+	aGroupObj->GetElementType() == SMDSAbs_Volume )
+      myNameActor->SetBackgroundColor(r,g,b);
   Modified();
 }
 
@@ -1480,6 +1483,9 @@ void SMESH_ActorDef::SetEdgeColor(vtkFloatingPointType r,vtkFloatingPointType g,
   myEdgeProp->SetColor(r,g,b);
   my1DProp->SetColor(r,g,b);
   my1DExtProp->SetColor(1.0-r,1.0-g,1.0-b);
+  if( SMESH_GroupObj* aGroupObj = dynamic_cast<SMESH_GroupObj*>( myVisualObj.get() ) )
+    if( aGroupObj->GetElementType() == SMDSAbs_Edge )
+      myNameActor->SetBackgroundColor(r,g,b);
   Modified();
 }
 
@@ -1490,6 +1496,9 @@ void SMESH_ActorDef::GetEdgeColor(vtkFloatingPointType& r,vtkFloatingPointType&
 void SMESH_ActorDef::SetNodeColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b){ 
   myNodeProp->SetColor(r,g,b);
   myNodeExtProp->SetColor(1.0-r,1.0-g,1.0-b);
+  if( SMESH_GroupObj* aGroupObj = dynamic_cast<SMESH_GroupObj*>( myVisualObj.get() ) )
+    if( aGroupObj->GetElementType() == SMDSAbs_Node )
+      myNameActor->SetBackgroundColor(r,g,b);
   Modified();
 }
 
diff --git a/src/OBJECT/SMESH_Object.cxx b/src/OBJECT/SMESH_Object.cxx
index 305447549..c286fcc7e 100644
--- a/src/OBJECT/SMESH_Object.cxx
+++ b/src/OBJECT/SMESH_Object.cxx
@@ -748,6 +748,15 @@ bool SMESH_GroupObj::IsNodePrs() const
   return myGroupServer->GetType() == SMESH::NODE;
 }
 
+//=================================================================================
+// function : GetElementType
+// purpose  : Return type of elements of group
+//=================================================================================
+SMDSAbs_ElementType SMESH_GroupObj::GetElementType() const
+{
+  return SMDSAbs_ElementType(myGroupServer->GetType());
+}
+
 //=================================================================================
 // function : getNodesFromElems
 // purpose  : Retrieve nodes from elements
diff --git a/src/OBJECT/SMESH_ObjectDef.h b/src/OBJECT/SMESH_ObjectDef.h
index e472a2121..094504f33 100644
--- a/src/OBJECT/SMESH_ObjectDef.h
+++ b/src/OBJECT/SMESH_ObjectDef.h
@@ -168,6 +168,8 @@ public:
   virtual int               GetEntities( const SMDSAbs_ElementType, TEntityList& ) const;
   virtual bool              IsNodePrs() const;
 
+  virtual SMDSAbs_ElementType GetElementType() const;
+
 private:
 
   SMESH::SMESH_GroupBase_var    myGroupServer;
diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 04dd45a2a..dcbe51e7f 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -727,11 +727,20 @@
 		SMESH::SMESH_GroupBase_var aGroupObject = SMESH::IObjectToInterface<SMESH::SMESH_GroupBase>(IObject);
 		if( !aGroupObject->_is_nil() )
 		{
-		  SALOMEDS::Color aColor;
-		  aColor.R = (float)color.red() / 255.0;
-		  aColor.G = (float)color.green() / 255.0;
-		  aColor.B = (float)color.blue() / 255.0;
-		  aGroupObject->SetColor( aColor );
+		  SMESH::ElementType anElementType = aGroupObject->GetType();
+		  QColor aColor;
+		  switch( anElementType )
+		  {
+		    case SMESH::NODE: aColor = nodecolor; break;
+		    case SMESH::EDGE: aColor = edgecolor; break;
+		    default: aColor = color; break;
+		  }
+
+		  SALOMEDS::Color aGroupColor;
+		  aGroupColor.R = (float)aColor.red() / 255.0;
+		  aGroupColor.G = (float)aColor.green() / 255.0;
+		  aGroupColor.B = (float)aColor.blue() / 255.0;
+		  aGroupObject->SetColor( aGroupColor );
 		}
 
 		delete aDlg;
-- 
2.39.2