X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_ScalarBarActor.cxx;h=42b79d992acaf3fa9dc0b72ff77a29778f4c301d;hp=8096b1609fbc22ee5829b729af09cd414f5f4c56;hb=HEAD;hpb=204a3246f4d94d4375bdac7391bec2b3ab49e0d9 diff --git a/src/OBJECT/SMESH_ScalarBarActor.cxx b/src/OBJECT/SMESH_ScalarBarActor.cxx index 8096b1609..d9321d9ed 100644 --- a/src/OBJECT/SMESH_ScalarBarActor.cxx +++ b/src/OBJECT/SMESH_ScalarBarActor.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -41,11 +41,11 @@ #define SHRINK_COEF 0.08; -vtkStandardNewMacro(SMESH_ScalarBarActor); +vtkStandardNewMacro(SMESH_ScalarBarActor) -vtkCxxSetObjectMacro(SMESH_ScalarBarActor,LookupTable,vtkScalarsToColors); -vtkCxxSetObjectMacro(SMESH_ScalarBarActor,LabelTextProperty,vtkTextProperty); -vtkCxxSetObjectMacro(SMESH_ScalarBarActor,TitleTextProperty,vtkTextProperty); +vtkCxxSetObjectMacro(SMESH_ScalarBarActor,LookupTable,vtkScalarsToColors) +vtkCxxSetObjectMacro(SMESH_ScalarBarActor,LabelTextProperty,vtkTextProperty) +vtkCxxSetObjectMacro(SMESH_ScalarBarActor,TitleTextProperty,vtkTextProperty) //---------------------------------------------------------------------------- // Instantiate object with 64 maximum colors; 5 labels; %%-#6.3g label @@ -251,7 +251,7 @@ int SMESH_ScalarBarActor::RenderOpaqueGeometry(vtkViewport *viewport) viewport->GetVTKWindow()->GetMTime() > this->BuildTime)) { // if the viewport has changed we may - or may not need - // to rebuild, it depends on if the projected coords chage + // to rebuild, it depends on if the projected coords change int *barOrigin; barOrigin = this->PositionCoordinate->GetComputedViewportValue(viewport); size[0] = @@ -557,7 +557,8 @@ int SMESH_ScalarBarActor::RenderOpaqueGeometry(vtkViewport *viewport) } //polygons & cell colors - unsigned char *rgba, *rgb; + unsigned char *rgb; + const unsigned char *rgba; vtkIdType ptIds[4], dcCount=0; for ( i = 0; i < numColors; i++ ) {