From: mpa <mpa@opencascade.com>
Date: Thu, 17 Apr 2014 08:59:38 +0000 (+0400)
Subject: INT PAL 0052383: TC7.4.0: color is not changed in VTK scene
X-Git-Tag: V7_4_0rc1~18^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4748f269646142b9a6d7d842238d5c82656db7e3;p=modules%2Fgeom.git

INT PAL 0052383: TC7.4.0: color is not changed in VTK scene
---

diff --git a/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx
index 4f8a71c7d..3e6f31a31 100644
--- a/src/GEOMGUI/GEOMGUI_Selection.cxx
+++ b/src/GEOMGUI/GEOMGUI_Selection.cxx
@@ -85,18 +85,30 @@
     else \
       str = QString(); }
 
-#define VTK_DISPLAY_MODE_TO_STRING( str, dm ) { \
-    if ( dm == 0 ) \
-      str = QString( "Wireframe" ); \
-    else if ( dm == 1 )    \
-      str = QString( "Shading" ); \
-    else if ( dm == 3 )    \
-      str = QString( "ShadingWithEdges" ); \
-    else \
-      str = QString(); }
-
 #define USE_VISUAL_PROP_MAP
 
+#ifdef USE_VISUAL_PROP_MAP
+  #define VTK_DISPLAY_MODE_TO_STRING( str, dm ) { \
+      if ( dm == 0 ) \
+        str = QString( "Wireframe" ); \
+      else if ( dm == 1 )    \
+        str = QString( "Shading" ); \
+      else if ( dm == 2 )    \
+        str = QString( "ShadingWithEdges" ); \
+      else \
+        str = QString(); }
+#else
+  #define VTK_DISPLAY_MODE_TO_STRING( str, dm ) { \
+      if ( dm == 0 ) \
+        str = QString( "Wireframe" ); \
+      else if ( dm == 1 )    \
+        str = QString( "Shading" ); \
+      else if ( dm == 3 )    \
+        str = QString( "ShadingWithEdges" ); \
+      else \
+        str = QString(); }
+#endif
+
 GEOMGUI_Selection::GEOMGUI_Selection()
 : LightApp_Selection()
 {
diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index 16131193c..595efd5bf 100644
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -1059,7 +1059,7 @@ void GEOM_Displayer::updateActorProperties( GEOM_Actor* actor, bool create )
     }
 
     // - standalone edge color
-    c = propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value<QColor>();
+    c = propMap.value( GEOM::propertyName( GEOM::LineColor ) ).value<QColor>();
     actor->SetIsolatedEdgeColor( c.redF(), c.greenF(), c.blueF() );
 
     c = propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value<QColor>();
diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx
index 3d8ce93bf..92860af3e 100644
--- a/src/OBJECT/GEOM_Actor.cxx
+++ b/src/OBJECT/GEOM_Actor.cxx
@@ -309,9 +309,9 @@ setDisplayMode(int theMode)
 
   if ( theMode == (int)eShadingWithEdges ) {
     // Coloring edges
-    myIsolatedEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0],
-                                                 myEdgesInShadingColor[1],
-                                                 myEdgesInShadingColor[2]);
+    myIsolatedEdgeActor->GetProperty()->SetColor(myIsolatedEdgeColor[0],
+                                                 myIsolatedEdgeColor[1],
+                                                 myIsolatedEdgeColor[2]);
     myOneFaceEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0],
                                                 myEdgesInShadingColor[1],
                                                 myEdgesInShadingColor[2]);
@@ -757,8 +757,7 @@ void GEOM_Actor::SetPointColor(double r,  double g,  double b)
 void GEOM_Actor::SetIsolatedEdgeColor(double r, double g,  double b)
 {
   myIsolatedEdgeColor[0] = r; myIsolatedEdgeColor[1] = g; myIsolatedEdgeColor[2] = b;
-  if ( myDisplayMode != (int)eShadingWithEdges )
-    myIsolatedEdgeActor->GetProperty()->SetColor(r, g, b);
+  myIsolatedEdgeActor->GetProperty()->SetColor(r, g, b);
 }
 
 /*!