X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FOBJECT%2FSMESH_ScalarBarActor.cxx;h=6ea4849a633e715688e6e72ec7db7be63a3d3938;hb=f79e964b7592c63818f892516f3b4936d7704397;hp=c24369e0fdcbc41bf734bf1fc7c7efa5d322c7d6;hpb=c150e1e4c40479c83b47cfb732f240c5df3b5d62;p=modules%2Fsmesh.git

diff --git a/src/OBJECT/SMESH_ScalarBarActor.cxx b/src/OBJECT/SMESH_ScalarBarActor.cxx
index c24369e0f..6ea4849a6 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-2020  CEA/DEN, EDF R&D, 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++ )
     {
@@ -588,7 +589,8 @@ int SMESH_ScalarBarActor::RenderOpaqueGeometry(vtkViewport *viewport)
       // Customization of the vtkScalarBarActor to show distribution histogram.
       if ( myDistributionColoringType == SMESH_MULTICOLOR_TYPE &&
            GetDistributionVisibility() &&
-           distrVisibility )
+           distrVisibility &&
+           myNbValues[i] > 0 )
       {
         rgb = distColors->GetPointer(3*dcCount); //write into array directly
         rgb[0] = rgba[0];