ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-26 09:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
mpa 2014-04-17 12:59:38 +04:00
parent a0b00a029a
commit 4748f26964
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/GEOMGUI/GEOMGUI_Selection.cxx
View File

@ -85,18 +85,30 @@
else \ else \
str = QString(); } 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 #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() GEOMGUI_Selection::GEOMGUI_Selection()
: LightApp_Selection() : LightApp_Selection()
{ {

2
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -1059,7 +1059,7 @@ void GEOM_Displayer::updateActorProperties( GEOM_Actor* actor, bool create )
} }
// - standalone edge color // - 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() ); actor->SetIsolatedEdgeColor( c.redF(), c.greenF(), c.blueF() );
c = propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value<QColor>(); c = propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value<QColor>();

9
src/OBJECT/GEOM_Actor.cxx
View File

@ -309,9 +309,9 @@ setDisplayMode(int theMode)
if ( theMode == (int)eShadingWithEdges ) { if ( theMode == (int)eShadingWithEdges ) {
// Coloring edges // Coloring edges
myIsolatedEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0], myIsolatedEdgeActor->GetProperty()->SetColor(myIsolatedEdgeColor[0],
myEdgesInShadingColor[1], myIsolatedEdgeColor[1],
myEdgesInShadingColor[2]); myIsolatedEdgeColor[2]);
myOneFaceEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0], myOneFaceEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0],
myEdgesInShadingColor[1], myEdgesInShadingColor[1],
myEdgesInShadingColor[2]); 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) void GEOM_Actor::SetIsolatedEdgeColor(double r, double g, double b)
{ {
myIsolatedEdgeColor[0] = r; myIsolatedEdgeColor[1] = g; myIsolatedEdgeColor[2] = 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);
} }
/*! /*!