Join modifications from branch OCC_debug_for_3_2_0b1

[modules/visu.git] / src / VISU_I / VISU_GaussPoints_i.cc

diff --git a/src/VISU_I/VISU_GaussPoints_i.cc b/src/VISU_I/VISU_GaussPoints_i.cc
index 93da92ac33f85fb5c43216f9cd0df2be2f7c2676..cb73301bef5313f5af5611088807c7e20d9fad5d 100644 (file)
--- a/src/VISU_I/VISU_GaussPoints_i.cc
+++ b/src/VISU_I/VISU_GaussPoints_i.cc
@@ -154,16 +154,16 @@ VISU::GaussPoints_i
   int aBicolor = aResourceMgr->integerValue( "VISU", "scalar_bar_bicolor", GetBiColor() );
   SetBiColor( aBicolor == 0 );
 
-  float aSpacing = aResourceMgr->doubleValue( "VISU", "scalar_bar_spacing", GetSpacing() );
+  vtkFloatingPointType aSpacing = aResourceMgr->doubleValue( "VISU", "scalar_bar_spacing", GetSpacing() );
   SetSpacing( aSpacing );
 
-  float aScaleFactor = aResourceMgr->doubleValue( "VISU", "deformed_shape_scale_factor", GetScaleFactor() );
+  vtkFloatingPointType aScaleFactor = aResourceMgr->doubleValue( "VISU", "deformed_shape_scale_factor", GetScaleFactor() );
   SetScaleFactor( aScaleFactor );
 
   int aPrimitiveType = aResourceMgr->integerValue( "VISU", "point_sprite_primitive_type", GetPrimitiveType() );
   SetPrimitiveType( aPrimitiveType );
 
-  float aClamp = aResourceMgr->doubleValue( "VISU", "point_sprite_clamp", GetClamp() );
+  vtkFloatingPointType aClamp = aResourceMgr->doubleValue( "VISU", "point_sprite_clamp", GetClamp() );
   SetClamp( aClamp );
 
   int aMinSize = aResourceMgr->integerValue( "VISU", "point_sprite_min_size", ( int )( GetMinSize() * 100.0 ) );
@@ -178,7 +178,7 @@ VISU::GaussPoints_i
   int aMagnification = aResourceMgr->integerValue( "VISU", "point_sprite_magnification", ( int )( GetMagnification() * 100.0 ) );
   SetMagnification( aMagnification / 100.0 );
 
-  float anIncrement = aResourceMgr->doubleValue( "VISU", "point_sprite_increment", GetMagnificationIncrement() );
+  vtkFloatingPointType anIncrement = aResourceMgr->doubleValue( "VISU", "point_sprite_increment", GetMagnificationIncrement() );
   SetMagnificationIncrement( anIncrement );
 
   bool isColored = aResourceMgr->booleanValue( "VISU", "point_sprite_results", GetIsColored() );
@@ -187,7 +187,7 @@ VISU::GaussPoints_i
   QColor aColor = aResourceMgr->colorValue( "VISU", "point_sprite_color", GetColor() );
   SetColor( aColor );
 
-  float anAlphaThreshold = aResourceMgr->doubleValue( "VISU", "point_sprite_alpha_threshold", GetAlphaThreshold() );
+  vtkFloatingPointType anAlphaThreshold = aResourceMgr->doubleValue( "VISU", "point_sprite_alpha_threshold", GetAlphaThreshold() );
   SetAlphaThreshold( anAlphaThreshold );
 
   int aResolution = aResourceMgr->integerValue( "VISU", "geom_sphere_resolution", GetResolution() );
@@ -322,12 +322,12 @@ VISU::GaussPoints_i
 
 void
 VISU::GaussPoints_i
-::SetScaleFactor( float theScaleFactor )
+::SetScaleFactor( vtkFloatingPointType theScaleFactor )
 {
   myGaussPointsPL->SetScale( theScaleFactor );
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetScaleFactor()
 {
@@ -376,12 +376,12 @@ VISU::GaussPoints_i
 
 void
 VISU::GaussPoints_i
-::SetAlphaThreshold( float theAlphaThreshold )
+::SetAlphaThreshold( vtkFloatingPointType theAlphaThreshold )
 {
   myGaussPointsPL->SetAlphaThreshold( theAlphaThreshold );
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetAlphaThreshold()
 {
@@ -416,7 +416,7 @@ VISU::GaussPoints_i
   return myGaussPointsPL->GetPrimitiveType();
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetMaximumSupportedSize()
 {
@@ -425,12 +425,12 @@ VISU::GaussPoints_i
 
 void
 VISU::GaussPoints_i
-::SetClamp(float theClamp)
+::SetClamp(vtkFloatingPointType theClamp)
 {
   myGaussPointsPL->SetClamp( theClamp );
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetClamp()
 {
@@ -439,12 +439,12 @@ VISU::GaussPoints_i
 
 void
 VISU::GaussPoints_i
-::SetGeomSize( float theGeomSize )
+::SetGeomSize( vtkFloatingPointType theGeomSize )
 {
   myGaussPointsPL->SetSize( theGeomSize );
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetGeomSize()
 {
@@ -453,12 +453,12 @@ VISU::GaussPoints_i
 
 void
 VISU::GaussPoints_i
-::SetMinSize( float theMinSize )
+::SetMinSize( vtkFloatingPointType theMinSize )
 {
   myGaussPointsPL->SetMinSize( theMinSize );
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetMinSize()
 {
@@ -467,12 +467,12 @@ VISU::GaussPoints_i
 
 void
 VISU::GaussPoints_i
-::SetMaxSize( float theMaxSize )
+::SetMaxSize( vtkFloatingPointType theMaxSize )
 {
   myGaussPointsPL->SetMaxSize( theMaxSize );
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetMaxSize()
 {
@@ -481,12 +481,12 @@ VISU::GaussPoints_i
 
 void
 VISU::GaussPoints_i
-::SetMagnification( float theMagnification )
+::SetMagnification( vtkFloatingPointType theMagnification )
 {
   myGaussPointsPL->SetMagnification( theMagnification );
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetMagnification()
 {
@@ -495,12 +495,12 @@ VISU::GaussPoints_i
 
 void
 VISU::GaussPoints_i
-::SetMagnificationIncrement( float theIncrement )
+::SetMagnificationIncrement( vtkFloatingPointType theIncrement )
 {
   myGaussPointsPL->SetMagnificationIncrement( theIncrement );
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetMagnificationIncrement()
 {
@@ -639,14 +639,14 @@ VISU::GaussPoints_i
 
   vtkTextProperty* aTitleProp = theScalarBar->GetTitleTextProperty();
   aTitleProp->SetFontFamily(myTitFontType);
-  aTitleProp->SetColor(myTitleColor);
+  aTitleProp->SetColor(myTitleColor[0],myTitleColor[1],myTitleColor[2]);
   (myIsBoldTitle)? aTitleProp->BoldOn() : aTitleProp->BoldOff();
   (myIsItalicTitle)? aTitleProp->ItalicOn() : aTitleProp->ItalicOff();
   (myIsShadowTitle)? aTitleProp->ShadowOn() : aTitleProp->ShadowOff();
   
   vtkTextProperty* aLabelProp = theScalarBar->GetLabelTextProperty();
   aLabelProp->SetFontFamily(myLblFontType);
-  aLabelProp->SetColor(myLabelColor);
+  aLabelProp->SetColor(myLabelColor[0],myLabelColor[1],myLabelColor[2]);
   (myIsBoldLabel)? aLabelProp->BoldOn() : aLabelProp->BoldOff();
   (myIsItalicLabel)? aLabelProp->ItalicOn() : aLabelProp->ItalicOff();
   (myIsShadowLabel)? aLabelProp->ShadowOn() : aLabelProp->ShadowOff();
@@ -666,7 +666,7 @@ VISU::GaussPoints_i
       anActor->SetBarVisibility(true);
       myPipeLine->GetMapper()->SetScalarVisibility(1);
 
-      float aRange[2];
+      vtkFloatingPointType aRange[2];
       myScalarMapPL->GetSourceRange(aRange);
       aScalarBarCtrl->SetRangeLocal(aRange);
       
@@ -687,7 +687,7 @@ VISU::GaussPoints_i
       }
       
       if(aScalarBarMode == VISU_ScalarBarCtrl::eGlobal){
-       float aRangeGlobal[2];
+       vtkFloatingPointType aRangeGlobal[2];
        //
        aRangeGlobal[0] = aTMinMax.first;
        aRangeGlobal[1] = aTMinMax.second;
@@ -813,12 +813,12 @@ VISU::GaussPoints_i
 
 void
 VISU::GaussPoints_i
-::SetSpacing(const float theSpacing)
+::SetSpacing(const vtkFloatingPointType theSpacing)
 {
   mySpacing = theSpacing;
 }
 
-float
+vtkFloatingPointType
 VISU::GaussPoints_i
 ::GetSpacing() const 
 {