ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-08 03:47:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

RNV: Fix compilation error.

Browse Source
This commit is contained in:
inv 2013-09-06 11:55:01 +00:00
parent e7ded34002
commit a1ea5512c3
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -733,7 +733,17 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap
#endif #endif
GeometryGUI::getTexture( study, textureId, aWidth, aHeight ); GeometryGUI::getTexture( study, textureId, aWidth, aHeight );
if ( !aTexture.IsNull() ) { if ( !aTexture.IsNull() ) {
static int TextureId = 0; #if OCC_VERSION_LARGE > 0x06050500 // Porting to OCCT higher 6.5.5 version
Handle(Prs3d_PointAspect) aTextureAspect =
new Prs3d_PointAspect( HasColor() ?
// predefined color, manually set to displayer via GEOM_Displayer::SetColor() function
(Quantity_NameOfColor)GetColor() :
// color from properties
SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::PointColor ) ).value<QColor>() ),
aWidth, aHeight,
aTexture );
#else
int TextureId = 0;
Handle(Prs3d_PointAspect) aTextureAspect = Handle(Prs3d_PointAspect) aTextureAspect =
new Prs3d_PointAspect( HasColor() ? new Prs3d_PointAspect( HasColor() ?
// predefined color, manually set to displayer via GEOM_Displayer::SetColor() function // predefined color, manually set to displayer via GEOM_Displayer::SetColor() function
@ -743,6 +753,7 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap
++TextureId, ++TextureId,
aWidth, aHeight, aWidth, aHeight,
aTexture ); aTexture );
#endif
AISShape->Attributes()->SetPointAspect( aTextureAspect ); AISShape->Attributes()->SetPointAspect( aTextureAspect );
} }
} }