Porting to VTK 6.

[modules/visu.git] / src / VISUGUI / VisuGUI_Module.cxx

diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx
index 074b5a66d4247766c06ef8ada403f9983f9586a8..f514b77206b082dc5dc4c6d89e6f40bd690181a0 100644 (file)
--- a/src/VISUGUI/VisuGUI_Module.cxx
+++ b/src/VISUGUI/VisuGUI_Module.cxx
@@ -1093,7 +1093,7 @@ namespace
                        const char* theSuffix,
                        std::ostringstream& theStr)
   {
-    vtkFloatingPointType aColor[3];
+    double aColor[3];
     vtkRenderer* aRenderer = theViewWindow->getRenderer();
     aRenderer->GetBackground(aColor);
     Storable::DataToStream(theStr,(std::string("myColor") + theSuffix + ".R").c_str(),aColor[0]);
@@ -1119,7 +1119,7 @@ namespace
     Storable::DataToStream(theStr,(std::string("myViewUp") + theSuffix + "[1]").c_str(),aViewUp[1]);
     Storable::DataToStream(theStr,(std::string("myViewUp") + theSuffix + "[2]").c_str(),aViewUp[2]);
 
-    vtkFloatingPointType aParallelScale = aCamera->GetParallelScale();
+    double aParallelScale = aCamera->GetParallelScale();
     Storable::DataToStream(theStr,(std::string("myParallelScale") + theSuffix).c_str(),aParallelScale);
 
     double aScaleFactor[3];
@@ -1134,7 +1134,7 @@ namespace
                      const char* theSuffix,
                      const Storable::TRestoringMap& theMap)
   {
-    vtkFloatingPointType aColor[3];
+    double aColor[3];
     aColor[0] = Storable::FindValue(theMap,std::string("myColor") + theSuffix + ".R").toDouble();
     aColor[1] = Storable::FindValue(theMap,std::string("myColor") + theSuffix + ".G").toDouble();
     aColor[2] = Storable::FindValue(theMap,std::string("myColor") + theSuffix + ".B").toDouble();
@@ -1160,7 +1160,7 @@ namespace
     aViewUp[2] = Storable::FindValue(theMap,std::string("myViewUp") + theSuffix + "[2]").toDouble();
     aCamera->SetViewUp(aViewUp);
 
-    vtkFloatingPointType aParallelScale = Storable::FindValue(theMap,std::string("myParallelScale") + theSuffix).toDouble();
+    double aParallelScale = Storable::FindValue(theMap,std::string("myParallelScale") + theSuffix).toDouble();
     aCamera->SetParallelScale(aParallelScale);
 
     double aScaleFactor[3];
@@ -1181,31 +1181,31 @@ namespace
       std::string aSegmentationMode;
       if(aWidgetCtrl->IsPlanesActive()){
         VISU_PlanesWidget *aPlanesWidget = aWidgetCtrl->GetPlanesWidget();
-        vtkFloatingPointType anOrigin[3];
+        double anOrigin[3];
         aPlanesWidget->GetOrigin(anOrigin);
         Storable::DataToStream(theStr,"myCursorOrigin[0]",anOrigin[0]);
         Storable::DataToStream(theStr,"myCursorOrigin[1]",anOrigin[1]);
         Storable::DataToStream(theStr,"myCursorOrigin[2]",anOrigin[2]);
 
-        vtkFloatingPointType aNormal[3];
+        double aNormal[3];
         aPlanesWidget->GetNormal(aNormal);
         Storable::DataToStream(theStr,"myCursorNormal[0]",aNormal[0]);
         Storable::DataToStream(theStr,"myCursorNormal[1]",aNormal[1]);
         Storable::DataToStream(theStr,"myCursorNormal[2]",aNormal[2]);
 
-        vtkFloatingPointType aDepth = aPlanesWidget->Distance();
+        double aDepth = aPlanesWidget->Distance();
         Storable::DataToStream(theStr,"myCursorDepth",aDepth);
 
         aSegmentationMode = "Planes";
       }else if(aWidgetCtrl->IsSphereActive()){
         VISU_SphereWidget *aSphereWidget = aWidgetCtrl->GetSphereWidget();
-        vtkFloatingPointType aCenter[3];
+        double aCenter[3];
         aSphereWidget->GetCenter(aCenter);
         Storable::DataToStream(theStr,"mySphereCursorCenter[0]",aCenter[0]);
         Storable::DataToStream(theStr,"mySphereCursorCenter[1]",aCenter[1]);
         Storable::DataToStream(theStr,"mySphereCursorCenter[2]",aCenter[2]);
 
-        vtkFloatingPointType aRadius = aSphereWidget->GetRadius();
+        double aRadius = aSphereWidget->GetRadius();
         Storable::DataToStream(theStr,"mySphereCursorRaduis",aRadius);
 
         aSegmentationMode = "Sphere";
@@ -1540,31 +1540,31 @@ namespace
 
         if(aSegmentationMode == "Planes"){
           VISU_PlanesWidget *aPlanesWidget = aWidgetCtrl->GetPlanesWidget();
-          vtkFloatingPointType anOrigin[3];
+          double anOrigin[3];
           anOrigin[0] = Storable::FindValue(aMap,"myCursorOrigin[0]").toDouble();
           anOrigin[1] = Storable::FindValue(aMap,"myCursorOrigin[1]").toDouble();
           anOrigin[2] = Storable::FindValue(aMap,"myCursorOrigin[2]").toDouble();
           aPlanesWidget->SetOrigin(anOrigin);
 
-          vtkFloatingPointType aNormal[3];
+          double aNormal[3];
           aNormal[0] = Storable::FindValue(aMap,"myCursorNormal[0]").toDouble();
           aNormal[1] = Storable::FindValue(aMap,"myCursorNormal[1]").toDouble();
           aNormal[2] = Storable::FindValue(aMap,"myCursorNormal[2]").toDouble();
           aPlanesWidget->SetNormal(aNormal);
 
-          vtkFloatingPointType aDepth = Storable::FindValue(aMap,"myCursorDepth").toDouble();
+          double aDepth = Storable::FindValue(aMap,"myCursorDepth").toDouble();
           aPlanesWidget->SetDistance(aDepth);
 
           aMainWindow->SetPlanesSegementation(true);
         }else if(aSegmentationMode == "Sphere"){
           VISU_SphereWidget *aSphereWidget = aWidgetCtrl->GetSphereWidget();
-          vtkFloatingPointType aCenter[3];
+          double aCenter[3];
           aCenter[0] = Storable::FindValue(aMap,"mySphereCursorCenter[0]").toDouble();
           aCenter[1] = Storable::FindValue(aMap,"mySphereCursorCenter[1]").toDouble();
           aCenter[2] = Storable::FindValue(aMap,"mySphereCursorCenter[2]").toDouble();
           aSphereWidget->SetCenter(aCenter);
 
-          vtkFloatingPointType aRadius = Storable::FindValue(aMap,"mySphereCursorRaduis").toDouble();
+          double aRadius = Storable::FindValue(aMap,"mySphereCursorRaduis").toDouble();
           aSphereWidget->SetRadius(aRadius);
 
           aMainWindow->SetSphereSegementation(true);
@@ -1725,7 +1725,7 @@ void VisuGUI_Module::storeVisualParameters(int savePoint)
                   ip->setParameter( entry, param, QString::number( vActor->GetQuadratic2DRepresentation() ).toLatin1().data() );
                   param = vtkParam + "Opacity";
                   ip->setParameter( entry, param, QString::number( vActor->GetOpacity() ).toLatin1().data() );
-                  vtkFloatingPointType r, g, b;
+                  double r, g, b;
                   vActor->GetColor(r, g, b);
                   QString colorStr  = QString::number( r ); colorStr += gDigitsSep;
                           colorStr += QString::number( g ); colorStr += gDigitsSep;
@@ -1752,7 +1752,7 @@ void VisuGUI_Module::storeVisualParameters(int savePoint)
                       ip->setParameter( entry, param, "Off" );
                     for ( int p = 0; p < nPlanes; p++ ) {
                       vtkPlane* plane = vPrs->GetClippingPlane( p );
-                      vtkFloatingPointType normal[3], origin[3];
+                      double normal[3], origin[3];
                       plane->GetNormal( normal );
                       plane->GetOrigin( origin );
                       std::string planeValue  = QString::number( normal[0] ).toLatin1().data(); planeValue += gDigitsSep;
@@ -1787,7 +1787,7 @@ void VisuGUI_Module::storeVisualParameters(int savePoint)
                   ip->setParameter( entry, param, QString::number( vActor->GetRepresentation() ).toLatin1().data() );
                   param = vtkParam + "Opacity";
                   ip->setParameter( entry, param, QString::number( vActor->GetOpacity() ).toLatin1().data() );
-                  vtkFloatingPointType r, g, b;
+                  double r, g, b;
                   vActor->GetColor(r, g, b);
                   QString colorStr  = QString::number( r ); colorStr += gDigitsSep;
                   colorStr += QString::number( g ); colorStr += gDigitsSep;
@@ -2014,7 +2014,7 @@ void VisuGUI_Module::restoreVisualParameters(int savePoint)
              if ( val != "Off" ) {
                QStringList vals = val.split( gDigitsSep, QString::SkipEmptyParts );
                if ( vals.count() == 6 ) { // format check: 6 float values
-                 vtkFloatingPointType normal[3], origin[3];
+                 double normal[3], origin[3];
                  for (int x = 0; x < 3; x++ ) {
                    normal[x] = vals[x].toFloat();
                    origin[x] = vals[x+3].toFloat();