Join modifications from branch OCC_debug_for_3_2_0b1

[modules/visu.git] / src / OBJECT / VISU_Actor.cxx

diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index 42591ab305f39bbb0f6c9d6362942850453e9c22..02eaeb3f3782f471a06b616e9c5d486d39a08553 100644 (file)
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -309,13 +309,13 @@ VISU_Actor
 
 void
 VISU_Actor
-::SetShrinkFactor(float theValue)
+::SetShrinkFactor(vtkFloatingPointType theValue)
 {
   myShrinkFilter->SetShrinkFactor(theValue);
   Modified();
 }
 
-float
+vtkFloatingPointType
 VISU_Actor
 ::GetShrinkFactor()
 {
@@ -326,12 +326,12 @@ VISU_Actor
 //----------------------------------------------------------------------------
 void
 VISU_Actor
-::SetOpacity(float theValue)
+::SetOpacity(vtkFloatingPointType theValue)
 {
   GetProperty()->SetOpacity(theValue);
 }
 
-float
+vtkFloatingPointType
 VISU_Actor
 ::GetOpacity()
 { 
@@ -340,12 +340,12 @@ VISU_Actor
 
 void
 VISU_Actor
-::SetLineWidth(float theLineWidth)
+::SetLineWidth(vtkFloatingPointType theLineWidth)
 {
   GetProperty()->SetLineWidth(theLineWidth);
 }
 
-float
+vtkFloatingPointType
 VISU_Actor
 ::GetLineWidth()
 {
@@ -429,7 +429,7 @@ VISU_Actor
   return GetCurrentPL()->GetNodeVTKID(theID);
 }
 
-float*
+vtkFloatingPointType*
 VISU_Actor
 ::GetNodeCoord(int theObjID)
 {
@@ -510,18 +510,18 @@ VISU_Actor
        if(vtkCell* aCell = GetElemCell(anObjId)){
          vtkPoints* aPts = aCell->GetPoints();
          if(int aNbPts = aCell->GetNumberOfPoints()){
-           float aCoord[3] = {0.0, 0.0, 0.0};
+           vtkFloatingPointType aCoord[3] = {0.0, 0.0, 0.0};
            for(int i = 0; i < aNbPts; i++){
-             float *aPntCoord = aPts->GetPoint(i); 
+             vtkFloatingPointType *aPntCoord = aPts->GetPoint(i); 
              aCoord[0] += aPntCoord[0];
              aCoord[1] += aPntCoord[1];
              aCoord[2] += aPntCoord[2];
            }
            // Display coordinates
-           float aWorldCoord[4] = {aCoord[0]/aNbPts, aCoord[1]/aNbPts, aCoord[2]/aNbPts, 1.0};
+           vtkFloatingPointType aWorldCoord[4] = {aCoord[0]/aNbPts, aCoord[1]/aNbPts, aCoord[2]/aNbPts, 1.0};
            aRenderer->SetWorldPoint(aWorldCoord);
            aRenderer->WorldToDisplay();
-           float aSelectionPoint[3];
+           vtkFloatingPointType aSelectionPoint[3];
            aRenderer->GetDisplayPoint(aSelectionPoint);
            myAnnotationActor->SetPosition(aSelectionPoint);
            //
@@ -551,12 +551,12 @@ VISU_Actor
       vtkIdType aVtkId = myPointPicker->GetPointId();
       if(aVtkId >= 0  && mySelector->IsValid(this,aVtkId,true) && hasIO()){
        vtkIdType anObjId = GetNodeObjId( aVtkId );
-       if(float* aCoord = GetNodeCoord(anObjId)){
+       if(vtkFloatingPointType* aCoord = GetNodeCoord(anObjId)){
          // Display coordinates
-         float aWorldCoord[4] = {aCoord[0], aCoord[1], aCoord[2], 1.0};
+         vtkFloatingPointType aWorldCoord[4] = {aCoord[0], aCoord[1], aCoord[2], 1.0};
          aRenderer->SetWorldPoint(aWorldCoord);
          aRenderer->WorldToDisplay();
-         float aSelectionPoint[3];
+         vtkFloatingPointType aSelectionPoint[3];
          aRenderer->GetDisplayPoint(aSelectionPoint);
          myAnnotationActor->SetPosition(aSelectionPoint);
          //