Bug IPAL18040 - 4.x: color of the displayed edge group doesn't correspond to set...

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index f4cd58ae60287fb45fc8320c0c11a62adb32a4db..ba766e20a9565c186252eb55877e1e2fd6ac63b3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -541,7 +541,14 @@ using namespace std;
 
       _PTR(SObject) aGroupSObject = SMESH::FindSObject(aGroupObject);
       if(SMESH_Actor *anActor = SMESH::FindActorByEntry(aGroupSObject->GetID().c_str()))
 
       _PTR(SObject) aGroupSObject = SMESH::FindSObject(aGroupObject);
       if(SMESH_Actor *anActor = SMESH::FindActorByEntry(aGroupSObject->GetID().c_str()))

-       anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B );
+      {
+       if( aGroupObject->GetType() == SMESH::NODE )
+         anActor->SetNodeColor( aColor.R, aColor.G, aColor.B );
+       else if( aGroupObject->GetType() == SMESH::EDGE )
+         anActor->SetEdgeColor( aColor.R, aColor.G, aColor.B );
+       else
+         anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B );
+      }

     }
 
     SMESH::RepaintCurrentView();
     }
 
     SMESH::RepaintCurrentView();

diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
index 15ada5033a7035168a5a02d2e807987eaeb363b3..d8144f320dd16aacb844c71be3fa2fd5afd21519 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
@@ -587,7 +587,12 @@ namespace SMESH {
            aColor.B = (float)b / 255.0;
            aGroup->SetColor( aColor );
          }
            aColor.B = (float)b / 255.0;
            aGroup->SetColor( aColor );
          }

-         anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B );
+         if( aGroup->GetType() == SMESH::NODE )
+           anActor->SetNodeColor( aColor.R, aColor.G, aColor.B );
+         else if( aGroup->GetType() == SMESH::EDGE )
+           anActor->SetEdgeColor( aColor.R, aColor.G, aColor.B );
+         else
+           anActor->SetSufaceColor( aColor.R, aColor.G, aColor.B );

        }
       }
     }
        }
       }
     }