X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkMIPCreator.cxx;h=9da0c3efe4c389d34a471288a61fea67b953dc42;hb=fc44a74636803d2efca46c6e66562a839e9d52f1;hp=c1bf38d3f63b646b805dc302288c95191ac7ac9f;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkMIPCreator.cxx b/packages/vtk/src/bbvtkMIPCreator.cxx
index c1bf38d..9da0c3e 100644
--- a/packages/vtk/src/bbvtkMIPCreator.cxx
+++ b/packages/vtk/src/bbvtkMIPCreator.cxx
@@ -54,9 +54,6 @@ namespace bbvtk
 	//---------------------------------------------------------------------
    void MIPCreator::bbUserSetDefaultValues()
    {
-
-
-
        std::vector<double> opaValues;
        std::vector<double> denPoints;
        opaValues.push_back(0.0);
@@ -65,28 +62,28 @@ namespace bbvtk
        bbSetInputOpacityValues(opaValues);
        bbSetInputMinColorWindow(0.0);
        bbSetInputMaxColorWindow(255.0);
-
-       opacityTransferFunction = vtkPiecewiseFunction::New();
-       grayTransferFunction = vtkPiecewiseFunction::New();
-
+       opacityTransferFunction 	= vtkPiecewiseFunction::New();
+       grayTransferFunction 	= vtkPiecewiseFunction::New();
 	   mCast	= NULL;
+
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
 	   mMIP		= NULL;
+#else 
+	//
+#endif
+
 	   mMapper	= NULL;
 	   mVolume	= NULL;
-
-
    }
+
 	//---------------------------------------------------------------------
    void MIPCreator::bbUserInitializeProcessing()
    {
-
-
     // Create the pipeline
     mCast = vtkImageShiftScale::New();
     mCast->SetOutputScalarTypeToUnsignedChar();
     mCast->ClampOverflowOn();
-
-
 }
 
 //---------------------------------------------------------------------
@@ -98,11 +95,16 @@ namespace bbvtk
 		   mCast=NULL;
 	   }
 
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
 	   if (mMIP!=NULL)
 	   {
 		   mMIP->Delete();
 		   mMIP=NULL;
 	   }
+#else 
+	//
+#endif
 
 	   if (mMapper!=NULL)
 	   {
@@ -120,62 +122,46 @@ namespace bbvtk
 
    void MIPCreator::Process()
    {
-
-
-
         double ranges[2];
         vtkImageData *image =  bbGetInputIn();
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
         image->Update();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+	// ..
+#endif
         image->GetScalarRange(ranges);
-
 	   scale = 255/(ranges[1]/100);
-
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
        mCast->SetInput( bbGetInputIn() );
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+       mCast->SetInputData( bbGetInputIn() );
+#endif
        mCast->SetScale( scale / 100.0 );
      //mCast->SetShift( -bbGetInputShift() );
-
-
-
-
-
-
-
-
-
      DensityPoints = bbGetInputDensityPoints();
-
      //We assign by default the values of density by regarding at range from the image
      if(DensityPoints.size()==0)
      {
             DensityPoints.push_back(ranges[0]);
             DensityPoints.push_back(ranges[1]);
      }
-
-
      OpacityValues = bbGetInputOpacityValues();
-
      while(DensityPoints.size()>OpacityValues.size())
      {
          OpacityValues.push_back(1.0);
      }
-
-
-
       double factor = scale/ 100.0 ;
-
        double minCF = bbGetInputMinColorWindow();
        double maxCF = bbGetInputMaxColorWindow();
-
        grayTransferFunction->AddSegment( minCF , 0.0 , maxCF , 1.0 );
-
-
-
-
         for(int i =0; i< DensityPoints.size(); i++)
         {
-         cout<<"MIPCreator::Process::dPoint"<<i<<"::"<<DensityPoints.at(i)<<endl;
-         cout<<"MIPCreator::Process::oPoint"<<i<<"::"<<OpacityValues.at(i)<<endl;
-
+	        cout<<"MIPCreator::Process::dPoint"<<i<<"::"<<DensityPoints.at(i)<<endl;
+     	    cout<<"MIPCreator::Process::oPoint"<<i<<"::"<<OpacityValues.at(i)<<endl;
             opacityTransferFunction->AddPoint(DensityPoints.at(i)*factor, OpacityValues.at(i));
         }
 	   //opacityTransferFunction = vtkPiecewiseFunction::New();
@@ -185,43 +171,45 @@ namespace bbvtk
 //	   opacityTransferFunction->AddPoint( 210 ,   50.0/100.0 );
 //	   opacityTransferFunction->AddPoint( 255 ,   90.0/100.0 );
 
-
-
      	   // Create a set of properties for mip
 	   vtkVolumeProperty *mipProperty;
 	   mipProperty = vtkVolumeProperty::New();
 	   mipProperty->SetScalarOpacity( opacityTransferFunction );
 	   mipProperty->SetColor( grayTransferFunction );
-
 //	   mipProperty->SetInterpolationTypeToLinear();
 	   mipProperty->SetInterpolationTypeToNearest();
-
 //	   mipProperty->ShadeOff();
 	   mipProperty->ShadeOn();
-
 //	   mipProperty->SetAmbient(0.9);
 //	   mipProperty->SetDiffuse(0.9);
 //	   mipProperty->SetSpecular(0.9);
 
 
-
-
-
+//EED 2018-07-20 Migration VTK8
+#if (VTK_MAJOR_VERSION <= 7) 
         mMIP = vtkVolumeRayCastMIPFunction::New();
         mMIP->SetMaximizeMethodToScalarValue();
-
         mMapper = vtkVolumeRayCastMapper::New();
         mMapper->SetVolumeRayCastFunction(mMIP);
+#else 
+		mMapper = vtkFixedPointVolumeRayCastMapper::New();
+#endif
+
+		
+		mCast->Update();
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
         mMapper->SetInput(mCast->GetOutput()); // (smoother.GetOutput())
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+        mMapper->SetInputData(mCast->GetOutput()); // (smoother.GetOutput())
+#endif
 
         mVolume = vtkVolume::New();
         mVolume->SetMapper(mMapper);
         mVolume->SetProperty( mipProperty );
-
-
-
         mMapper->Update();
-
       bbSetOutputOut(mVolume);
      //     mVolume->GetProperty()->SetColor( bbGetInputColour()[0],  bbGetInputColour()[1], bbGetInputColour()[2] );
      //     mVolume->GetProperty()->SetOpacity( bbGetInputOpacity() );