Clean code

[bbtk.git] / packages / vtk / src / bbvtkFlip.cxx

diff --git a/packages/vtk/src/bbvtkFlip.cxx b/packages/vtk/src/bbvtkFlip.cxx
index d37aa6fb2c8a9e759174bc23d8e19c56c10af017..8ec173cf705ed77ca42c8608d625389b9cb9db6e 100644 (file)
--- a/packages/vtk/src/bbvtkFlip.cxx
+++ b/packages/vtk/src/bbvtkFlip.cxx
@@ -100,20 +100,36 @@ void Flip::Process()
        
                mImageOut = vtkImageData::New();  // Alloc depends on  bbGetInputIn().size()  
                mImageOut->Initialize();
-               mImageOut->SetScalarType(  bbGetInputIn()->GetScalarType() );
                mImageOut->SetSpacing(   bbGetInputIn()->GetSpacing()  );
                mImageOut->SetDimensions(   bbGetInputIn()->GetDimensions()  );
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
+               mImageOut->SetScalarType(  bbGetInputIn()->GetScalarType() );
                mImageOut->SetNumberOfScalarComponents( bbGetInputIn()->GetNumberOfScalarComponents() );
                mImageOut->AllocateScalars();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+               mImageOut->AllocateScalars(bbGetInputIn()->GetScalarType() , bbGetInputIn()->GetNumberOfScalarComponents());
+#endif
        
                int inputdims[3];
                //   int outputdims[3];
                bbGetInputIn()->GetDimensions (inputdims);
+
+//EED 2017-01-01 Migration VTK7
+#if (VTK_MAJOR_VERSION <= 5) 
                bbGetInputIn()->Update();
+#endif
+#if (VTK_MAJOR_VERSION >= 6) 
+               // ..
+#endif
+
                int nbScalComp  = bbGetInputIn()->GetNumberOfScalarComponents();
                int scalarSize  = bbGetInputIn()->GetScalarSize();
                int lineSize    = inputdims[0]*scalarSize*nbScalComp;      
                int planeSize   = inputdims[1]*lineSize;
+                int volumeSize  = inputdims[2]*planeSize;
                char *pixelsIn  = (char *)bbGetInputIn()->GetScalarPointer();
                char *pixelsOut = (char *)mImageOut->GetScalarPointer();
        
@@ -123,7 +139,12 @@ void Flip::Process()
                char *debPlanOut;
                int i,j,k;
                
-               if ( (bbGetInputAxis()=="X") || (bbGetInputAxis()=="x") )
+               if ( (bbGetInputAxis()=="O") || (bbGetInputAxis()=="o") )
+               {  
+                       pixelsIn = (char *)bbGetInputIn()->GetScalarPointer(0,0,0);
+                       pixelsOut = (char *)mImageOut->GetScalarPointer(0,0,0);
+                       memcpy(pixelsOut,  pixelsIn, volumeSize );
+               } else if ( (bbGetInputAxis()=="X") || (bbGetInputAxis()=="x") )
                {  
 
                        for(k=0; k<inputdims[2]; k++)  // iterate  planes